diff --git a/plugins/redmine_glossary/app/controllers/glossary_controller.rb b/plugins/redmine_glossary/app/controllers/glossary_controller.rb index 645286c..96abca3 100755 --- a/plugins/redmine_glossary/app/controllers/glossary_controller.rb +++ b/plugins/redmine_glossary/app/controllers/glossary_controller.rb @@ -355,9 +355,10 @@ class GlossaryController < ApplicationController if (terms and params[:latest_days] and !params[:latest_days].empty?) limitsec = Time.now.to_i - params[:latest_days].to_i * 60 * 60 * 24 limittm = Time.at(limitsec) - terms.delete_if {|prm| - (prm.datetime < limittm) - } +# terms.delete_if {|prm| (prm.datetime < limittm)} + recent_terms = [] + terms.collect{|prm| recent_terms << prm if prm.datetime >= limittm} + recent_terms else terms end diff --git a/plugins/redmine_glossary/app/helpers/glossary_helper.rb b/plugins/redmine_glossary/app/helpers/glossary_helper.rb index feb7e5c..9e8b98f 100755 --- a/plugins/redmine_glossary/app/helpers/glossary_helper.rb +++ b/plugins/redmine_glossary/app/helpers/glossary_helper.rb @@ -34,9 +34,8 @@ module GlossaryHelper def collect_visible_params(prmary) ary = [] - prmary {|prm| - ary << prm if param_visible?(prm) - } + prmary.collect{|prm| ary << prm if param_visible?(prm)} + ary end def default_show_params; Term.default_show_params; end @@ -45,7 +44,8 @@ module GlossaryHelper def params_select(form, name, prms) - options = prms.collect{|prm| [label_param(prm), prm]} + vprms = collect_visible_params(prms) + options = vprms.collect{|prm| [label_param(prm), prm]} form.select(name, options, :include_blank=>true) end diff --git a/plugins/redmine_glossary/app/helpers/glossary_styles_helper.rb b/plugins/redmine_glossary/app/helpers/glossary_styles_helper.rb index fc9f322..7b1b50a 100755 --- a/plugins/redmine_glossary/app/helpers/glossary_styles_helper.rb +++ b/plugins/redmine_glossary/app/helpers/glossary_styles_helper.rb @@ -22,7 +22,7 @@ module GlossaryStylesHelper def search_index_table(ary, sepcnt, proj, search_index_type = nil) return "" if (!ary.is_a?(Array) or sepcnt <= 0) - str = '' + str = '
' cnt = 0 for ch in ary str += '' if ((cnt != 0) and (cnt % sepcnt) == 0 ) diff --git a/plugins/redmine_glossary/app/views/glossary/_show_all_in_category.html.erb b/plugins/redmine_glossary/app/views/glossary/_show_all_in_category.html.erb index e767cd7..7c542ca 100755 --- a/plugins/redmine_glossary/app/views/glossary/_show_all_in_category.html.erb +++ b/plugins/redmine_glossary/app/views/glossary/_show_all_in_category.html.erb @@ -5,6 +5,5 @@ <%= render(:partial => "glossary/show_one", :object => term) %> -
<% end %>
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 3129d41..22ad993 100755 --- a/plugins/redmine_glossary/app/views/glossary/_show_one.html.erb +++ b/plugins/redmine_glossary/app/views/glossary/_show_one.html.erb @@ -1,12 +1,16 @@ <% term = show_one %> +<% if !@show_params.empty? %>
<% for prm in @show_params %> <% end %>
<%=h label_param(prm) %>:<%= term.value(prm) %>
+<% end %> <% unless (term.description.empty?) %> +<% if !@show_params.empty? %> <%=l(:field_description)%>: +<% end %>
<%= textilizable term, :description, :attachments => term.attachments %>
diff --git a/plugins/redmine_glossary/app/views/glossary/_sidebar.html.erb b/plugins/redmine_glossary/app/views/glossary/_sidebar.html.erb index 1cb7217..51a2d38 100755 --- a/plugins/redmine_glossary/app/views/glossary/_sidebar.html.erb +++ b/plugins/redmine_glossary/app/views/glossary/_sidebar.html.erb @@ -15,16 +15,16 @@ <%= link_to_if_authorized(l(:label_move_all_terms), {:controller => 'glossary', :action => 'move_all', :project_id => @project}, :class => 'icon icon-move') %>
<% end %> - <%= link_to(l(:label_glossary_import_csv), {:controller => 'glossary', :action => 'import_csv', :project_id => @project}) %> + <%= link_to(l(:label_glossary_import_csv), {:controller => 'glossary', :action => 'import_csv', :project_id => @project}, :id => 'glossary_import_csv') %>
<% end %> <% if User.current.allowed_to?(:manage_term_categories, @project, :global => true) %>

<%= l(:label_term_category) %>

- <%= link_to l(:label_term_category_new), {:controller => 'glossary', :action => 'add_term_category', :project_id => @project}, :class => 'icon icon-add' %> + <%= link_to(l(:label_term_category_new), {:controller => 'glossary', :action => 'add_term_category', :project_id => @project}, :class => 'icon icon-add') %>
- <%= link_to l(:label_manage_term_category), { :controller => 'term_categories', :action => 'index', :project_id => @project } %> + <%= link_to(l(:label_manage_term_category), { :controller => 'term_categories', :action => 'index', :project_id => @project }, :id => 'glossary_term_categories') %>
<% end %> diff --git a/plugins/redmine_glossary/app/views/glossary/index.html.erb b/plugins/redmine_glossary/app/views/glossary/index.html.erb index ea2eb09..de8fcb9 100755 --- a/plugins/redmine_glossary/app/views/glossary/index.html.erb +++ b/plugins/redmine_glossary/app/views/glossary/index.html.erb @@ -9,7 +9,7 @@ if params[:search_index_ch] subtitlle = "- #{params[:search_index_ch]} -" end %> -

<%= t('glossary_title') %> <%= subtitlle %>

+

<%= t('glossary_title') %> <%= subtitlle %>


<% if User.current.allowed_to?(:view_terms, @project, :global => true) %> @@ -22,7 +22,7 @@ end %> <% if @glossary_style.grouping? %> <% list_number = 1 %> <% @terms.each do |gterms| %> -

<%= "#{list_number}. #{gterms.name}" %>

+

<%= "#{list_number}. #{gterms.name}" %>

<% list_number += 1 %> <%= render(:partial => tempname, :object => gterms.ary) %> <% end %> diff --git a/plugins/redmine_glossary/app/views/glossary_styles/_form.html.erb b/plugins/redmine_glossary/app/views/glossary_styles/_form.html.erb index 9c8132b..62175a7 100755 --- a/plugins/redmine_glossary/app/views/glossary_styles/_form.html.erb +++ b/plugins/redmine_glossary/app/views/glossary_styles/_form.html.erb @@ -6,9 +6,6 @@ form = form_for @glossary_style, :url => urlopts do |f| %> - -
- <%=h l(:label_project) %> <%= options = [] @@ -37,6 +34,11 @@ <% end %> + + + +
+ <%= submit_tag l(:label_view) %> <%= submit_tag l(:button_clear), :name => 'clear' %> diff --git a/plugins/redmine_glossary/app/views/glossary_styles/_search.html.erb b/plugins/redmine_glossary/app/views/glossary_styles/_search.html.erb index bda23a7..d50fbd1 100755 --- a/plugins/redmine_glossary/app/views/glossary_styles/_search.html.erb +++ b/plugins/redmine_glossary/app/views/glossary_styles/_search.html.erb @@ -6,9 +6,9 @@