diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 251178a..1414779 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -86,7 +86,7 @@
<% if User.current.logged? || !Setting.login_required? %> - -<%= javascript_tag "$('#scrollup').click(function(){$('html,body').animate({scrollTop:0},600);return false;});" %> +<%= javascript_tag "$('#scrollup').click(function(){$('html,body').animate({scrollTop:0},600);return false;});" %> diff --git a/plugins/redmine_wiki_lists/app/views/issues/_embedded_list.html.erb b/plugins/redmine_wiki_lists/app/views/issues/_embedded_list.html.erb index c4ae3e9..e875b67 100644 --- a/plugins/redmine_wiki_lists/app/views/issues/_embedded_list.html.erb +++ b/plugins/redmine_wiki_lists/app/views/issues/_embedded_list.html.erb @@ -7,7 +7,7 @@ - + <% query.inline_columns.each do |column| %> <% end %> @@ -18,7 +18,8 @@ <% if group_name %> <% reset_cycle %> - + - +
  <%= column.caption %>
+     <%= group_name %> <%= group_count %> <%= group_totals %> <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", @@ -35,7 +36,8 @@ <% query.block_columns.each do |column| if (text = column_content(column, issue)) && text.present? -%>
+   <% if query.block_columns.count > 1 %> <%= column.caption %> <% end %> diff --git a/public/themes/circlepro/stylesheets/application.css b/public/themes/circlepro/stylesheets/application.css index 60e2d6d..e49be50 100644 --- a/public/themes/circlepro/stylesheets/application.css +++ b/public/themes/circlepro/stylesheets/application.css @@ -1820,12 +1820,13 @@ form[class$="glossary_style"] #grouping label { margin: 0; background: #fff url(../images/logo.png) no-repeat 0 -100px; } - - #quick-search { - display: none; - } + div#content { width: 100%; padding: 0; } + + .private_wiki_flag { + display: none !important; + } }