From d491f8c5fc451e465d17fb685466fc4314d2e3e4 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Wed, 30 Jan 2019 18:39:57 +0100
Subject: [PATCH] =?UTF-8?q?Ahora=20s=C3=B3lo=20se=20muestra=20el=20primer?=
 =?UTF-8?q?=20p=C3=A1rrafo=20de=20la=20definici=C3=B3n=20de=20cada=20t?=
 =?UTF-8?q?=C3=A9rmino=20del=20glosario=20en=20la=20vista=20de=20tabla?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/views/glossary/_index_in_category.html.erb        | 4 ++--
 .../app/views/glossary/_show_one.html.erb                 | 8 +++-----
 plugins/redmine_glossary/config/locales/es.yml            | 2 +-
 public/themes/circlepro/stylesheets/application.css       | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/plugins/redmine_glossary/app/views/glossary/_index_in_category.html.erb b/plugins/redmine_glossary/app/views/glossary/_index_in_category.html.erb
index b4defe8..f57bde3 100755
--- a/plugins/redmine_glossary/app/views/glossary/_index_in_category.html.erb
+++ b/plugins/redmine_glossary/app/views/glossary/_index_in_category.html.erb
@@ -11,13 +11,13 @@
 <tbody>
 <% for term in index_in_category -%>	
 <tr class="<%= cycle("odd", "even") %> term">
-<td><%=h term.id       %></td>
+<td><%=h term.id %></td>
 <td><%= term_link(term) %></td>
 <% for prm in @show_params %>
 <td><%=h term.value(prm) %></td>
 <% end %>
 <!--td><%=h truncate(term.description, :length=>50) %></td-->
-<td><%=textilizable term.description %></td>
+<td><% @paragraphs = Nokogiri::HTML.parse(term.description).css('p') %><%=textilizable @paragraphs.first.inner_html + (@paragraphs.size > 1 ? '<p>…</p>' : '') %></td>
 <td align="right" width="40px">
   <% 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 %>
 <table class="term_items">
 <% for prm in @show_params %>
-<tr><th><%=h label_param(prm) %>:</th><td><%= term.value(prm) %></td></tr>
+<% unless term.value(prm).blank? %><tr><th><%=h label_param(prm) %>:</th><td><%= term.value(prm) %></td></tr><% end %>
 <% end %>
 </table>
 <% end %>
 <% unless (term.description.empty?) %>
-<% if !@show_params.empty? %>
-<strong><%=l(:field_description)%></strong>:
-<% end %>
+<% if @show_params.size > 1 %><strong><%= l(:field_description) %></strong>:<% end %>
 <div class="wiki">
 <%= textilizable term, :description, :attachments => term.attachments %>
 </div>
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;
 }