term">
-<%=h term.id %> |
+<%=h term.id %> |
<%= term_link(term) %> |
<% for prm in @show_params %>
<%=h term.value(prm) %> |
<% end %>
-<%=textilizable term.description %> |
+<% @paragraphs = Nokogiri::HTML.parse(term.description).css('p') %><%=textilizable @paragraphs.first.inner_html + (@paragraphs.size > 1 ? ' … ' : '') %> |
<% if term.project_id == @project.id %>
<%= link_to_if_authorized(image_tag('edit.png'), {:action => 'edit', :project_id => @project, :id => term}, :title => l(:button_edit)) %>
diff --git a/plugins/redmine_glossary/app/views/glossary/_show_one.html.erb b/plugins/redmine_glossary/app/views/glossary/_show_one.html.erb
index 22ad993..2caa03f 100755
--- a/plugins/redmine_glossary/app/views/glossary/_show_one.html.erb
+++ b/plugins/redmine_glossary/app/views/glossary/_show_one.html.erb
@@ -1,16 +1,14 @@
<% term = show_one %>
-<% if !@show_params.empty? %>
+<% if @show_params.size > 1 %>
<% for prm in @show_params %>
-<%=h label_param(prm) %>: | <%= term.value(prm) %> |
+<% unless term.value(prm).blank? %><%=h label_param(prm) %>: | <%= term.value(prm) %> | <% end %>
<% end %>
<% end %>
<% unless (term.description.empty?) %>
-<% if !@show_params.empty? %>
-<%=l(:field_description)%>:
-<% end %>
+<% if @show_params.size > 1 %><%= l(:field_description) %>:<% end %>
<%= textilizable term, :description, :attachments => term.attachments %>
diff --git a/plugins/redmine_glossary/config/locales/es.yml b/plugins/redmine_glossary/config/locales/es.yml
index 46bb823..331225e 100755
--- a/plugins/redmine_glossary/config/locales/es.yml
+++ b/plugins/redmine_glossary/config/locales/es.yml
@@ -9,7 +9,7 @@ es:
label:
id: No.
name: Término
- name_en: Inglés
+ name_en: En inglés
category: Categoría
datatype: "Tipo de dato en código"
codename: "Abreviatura en código"
diff --git a/public/themes/circlepro/stylesheets/application.css b/public/themes/circlepro/stylesheets/application.css
index 91d7d6e..f868e12 100644
--- a/public/themes/circlepro/stylesheets/application.css
+++ b/public/themes/circlepro/stylesheets/application.css
@@ -1502,10 +1502,10 @@ table.term_items tr th {
#glossary_style_project_scope {
margin-left: 1em;
}
-.edit_glossary_style #grouping {
+form[class$="glossary_style"] #grouping {
margin-top: 4px;
}
-.edit_glossary_style #grouping label {
+form[class$="glossary_style"] #grouping label {
display: block;
text-transform: capitalize;
}
|