diff --git a/plugins/redmine_wiki_lists/app/views/issues/_list.html.erb b/plugins/redmine_wiki_lists/app/views/issues/_embedded_list.html.erb similarity index 87% rename from plugins/redmine_wiki_lists/app/views/issues/_list.html.erb rename to plugins/redmine_wiki_lists/app/views/issues/_embedded_list.html.erb index 1b9c17e..c4ae3e9 100644 --- a/plugins/redmine_wiki_lists/app/views/issues/_list.html.erb +++ b/plugins/redmine_wiki_lists/app/views/issues/_embedded_list.html.erb @@ -47,8 +47,14 @@ <% end -%> -<% if query.id %> -<%= l(:label_view) %> <%= link_to(l(:label_gantt_chart), project_gantt_path({:query_id => query.id})) %> (<%= link_to(query.name, project_issues_path({:query_id => query.id})) %>). -<% end %> + +<% if query.options.any? %> +<%= render_query_totals(@query) %> +<% end -%> + +<% if query.id %> +
<%= l(:label_view) %> <%= link_to(l(:label_gantt_chart), project_gantt_path({:query_id => query.id})) %> (<%= link_to(query.name, project_issues_path({:query_id => query.id})) %>)
+<% end %> + <% end -%> diff --git a/plugins/redmine_wiki_lists/lib/redmine_wiki_lists/ref_issues.rb b/plugins/redmine_wiki_lists/lib/redmine_wiki_lists/ref_issues.rb index babb6fa..e8853d4 100755 --- a/plugins/redmine_wiki_lists/lib/redmine_wiki_lists/ref_issues.rb +++ b/plugins/redmine_wiki_lists/lib/redmine_wiki_lists/ref_issues.rb @@ -206,7 +206,7 @@ TEXT else disp = context_menu.to_s # >= redmine 3.4.0 end - disp << render(partial: 'issues/list', locals: {issues: @issues, query: @query}) + disp << render(partial: 'issues/embedded_list', locals: {issues: @issues, query: @query}) end end diff --git a/public/themes/circlepro/stylesheets/application.css b/public/themes/circlepro/stylesheets/application.css index f868e12..6bcde58 100644 --- a/public/themes/circlepro/stylesheets/application.css +++ b/public/themes/circlepro/stylesheets/application.css @@ -691,6 +691,12 @@ div.wiki ul.toc li { line-height: 1em; margin-top: .3em; } +div.wiki .query-totals, +div.wiki .query-issue-links { + font-size: 16px; + text-align: right; + margin: -1em 0 1.25em; +} #preview fieldset { width: auto; min-width: auto;