Index: app/views/calendars/show.html.erb =================================================================== --- app/views/calendars/show.html.erb (Revision 21271) +++ app/views/calendars/show.html.erb (Arbeitskopie) @@ -8,7 +8,7 @@
"> - "><%= l(:label_filter_plural) %> + "><%= l(:label_filter_plural) %>
"> <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
Index: app/views/gantts/show.html.erb =================================================================== --- app/views/gantts/show.html.erb (Revision 21271) +++ app/views/gantts/show.html.erb (Arbeitskopie) @@ -14,7 +14,7 @@
"> - "><%= l(:label_filter_plural) %> + "><%= l(:label_filter_plural) %>
"> <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
Index: app/views/issues/_list.html.erb =================================================================== --- app/views/issues/_list.html.erb (Revision 21271) +++ app/views/issues/_list.html.erb (Arbeitskopie) @@ -24,7 +24,7 @@ <% reset_cycle %> -   +   <%= group_name %> <%= group_count %> <%= group_totals %> <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %> Index: app/views/projects/_list.html.erb =================================================================== --- app/views/projects/_list.html.erb (Revision 21271) +++ app/views/projects/_list.html.erb (Arbeitskopie) @@ -14,7 +14,7 @@ <% reset_cycle %> -   +   <%= group_name %> <% if group_count %> <%= group_count %> Index: app/views/queries/_query_form.html.erb =================================================================== --- app/views/queries/_query_form.html.erb (Revision 21271) +++ app/views/queries/_query_form.html.erb (Arbeitskopie) @@ -5,7 +5,7 @@
"> - "><%= l(:label_filter_plural) %> + "><%= l(:label_filter_plural) %>
"> <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
Index: app/views/roles/permissions.html.erb =================================================================== --- app/views/roles/permissions.html.erb (Revision 21271) +++ app/views/roles/permissions.html.erb (Arbeitskopie) @@ -49,7 +49,7 @@ <% unless mod.blank? %> -   +   <%= l_or_humanize(mod, :prefix => 'project_module_') %> <% @roles.each do |role| %> Index: app/views/timelog/_list.html.erb =================================================================== --- app/views/timelog/_list.html.erb (Revision 21271) +++ app/views/timelog/_list.html.erb (Arbeitskopie) @@ -20,7 +20,7 @@ <% reset_cycle %> -   +   <%= group_name %> <% if group_count %> <%= group_count %> Index: app/views/trackers/fields.html.erb =================================================================== --- app/views/trackers/fields.html.erb (Revision 21271) +++ app/views/trackers/fields.html.erb (Arbeitskopie) @@ -20,7 +20,7 @@ -   +   <%= l(:field_core_fields) %> @@ -44,7 +44,7 @@ <% if @custom_fields.any? %> -   +   <%= l(:label_custom_field_plural) %> Index: app/views/versions/_sidebar.html.erb =================================================================== --- app/views/versions/_sidebar.html.erb (Revision 21271) +++ app/views/versions/_sidebar.html.erb (Arbeitskopie) @@ -43,7 +43,7 @@ <% if @completed_versions.present? %>

<%= link_to_function l(:label_completed_versions), - '$("#toggle-completed-versions").toggleClass("icon-collapsed icon-expended"); $("#completed-versions").toggle()', + '$("#toggle-completed-versions").toggleClass("icon-collapsed icon-expanded"); $("#completed-versions").toggle()', :id => 'toggle-completed-versions', :class => 'icon icon-collapsed collapsible' %>

-<% end %> \ No newline at end of file +<% end %> Index: app/views/workflows/permissions.html.erb =================================================================== --- app/views/workflows/permissions.html.erb (Revision 21271) +++ app/views/workflows/permissions.html.erb (Arbeitskopie) @@ -54,7 +54,7 @@ -   +   <%= l(:field_core_fields) %> @@ -74,7 +74,7 @@ <% if @custom_fields.any? %> -   +   <%= l(:label_custom_field_plural) %> Index: lib/redmine/helpers/gantt.rb =================================================================== --- lib/redmine/helpers/gantt.rb (Revision 21271) +++ lib/redmine/helpers/gantt.rb (Arbeitskopie) @@ -784,7 +784,7 @@ } end if has_children - content = view.content_tag(:span, nil, :class => 'icon icon-expended expander') + content + content = view.content_tag(:span, nil, :class => 'icon icon-expanded expander') + content tag_options[:class] += ' open' else if params[:indent] Index: lib/redmine/wiki_formatting/macros.rb =================================================================== --- lib/redmine/wiki_formatting/macros.rb (Revision 21271) +++ lib/redmine/wiki_formatting/macros.rb (Arbeitskopie) @@ -250,7 +250,7 @@ link_to_function( hide_label, js, :id => "#{html_id}-hide", - :class => 'icon icon-expended collapsible', + :class => 'icon icon-expanded collapsible', :style => 'display:none;' ) out << Index: public/javascripts/application.js =================================================================== --- public/javascripts/application.js (Revision 21271) +++ public/javascripts/application.js (Arbeitskopie) @@ -31,7 +31,7 @@ var tr = $(el).parents('tr').first(); var n = tr.next(); tr.toggleClass('open'); - $(el).toggleClass('icon-expended icon-collapsed'); + $(el).toggleClass('icon-expanded icon-collapsed'); while (n.length && !n.hasClass('group')) { n.toggle(); n = n.next('tr'); @@ -43,7 +43,7 @@ tbody.children('tr').each(function(index) { if ($(this).hasClass('group')) { $(this).removeClass('open'); - $(this).find('.expander').switchClass('icon-expended', 'icon-collapsed'); + $(this).find('.expander').switchClass('icon-expanded', 'icon-collapsed'); } else { $(this).hide(); } @@ -55,7 +55,7 @@ tbody.children('tr').each(function(index) { if ($(this).hasClass('group')) { $(this).addClass('open'); - $(this).find('.expander').switchClass('icon-collapsed', 'icon-expended'); + $(this).find('.expander').switchClass('icon-collapsed', 'icon-expanded'); } else { $(this).show(); } @@ -74,7 +74,7 @@ function toggleFieldset(el) { var fieldset = $(el).parents('fieldset').first(); fieldset.toggleClass('collapsed'); - fieldset.children('legend').toggleClass('icon-expended icon-collapsed'); + fieldset.children('legend').toggleClass('icon-expanded icon-collapsed'); fieldset.children('div').toggle(); } @@ -550,12 +550,12 @@ var el = $('#'+id); if (el.hasClass('open')) { collapseScmEntry(id); - el.find('.expander').switchClass('icon-expended', 'icon-collapsed'); + el.find('.expander').switchClass('icon-expanded', 'icon-collapsed'); el.addClass('collapsed'); return false; } else if (el.hasClass('loaded')) { expandScmEntry(id); - el.find('.expander').switchClass('icon-collapsed', 'icon-expended'); + el.find('.expander').switchClass('icon-collapsed', 'icon-expanded'); el.removeClass('collapsed'); return false; } @@ -568,7 +568,7 @@ success: function(data) { el.after(data); el.addClass('open').addClass('loaded').removeClass('loading'); - el.find('.expander').switchClass('icon-collapsed', 'icon-expended'); + el.find('.expander').switchClass('icon-collapsed', 'icon-expanded'); } }); return true; Index: public/javascripts/gantt.js =================================================================== --- public/javascripts/gantt.js (Revision 21271) +++ public/javascripts/gantt.js (Arbeitskopie) @@ -241,12 +241,12 @@ var iconChange = null; if(subject.hasClass('open')) iconChange = function(element){ - $(element).find('.expander').switchClass('icon-expended', 'icon-collapsed'); + $(element).find('.expander').switchClass('icon-expanded', 'icon-collapsed'); $(element).removeClass('open'); }; else iconChange = function(element){ - $(element).find('.expander').switchClass('icon-collapsed', 'icon-expended'); + $(element).find('.expander').switchClass('icon-collapsed', 'icon-expanded'); $(element).addClass('open'); }; iconChange(subject); Index: public/stylesheets/application.css =================================================================== --- public/stylesheets/application.css (Revision 21271) +++ public/stylesheets/application.css (Arbeitskopie) @@ -1588,7 +1588,7 @@ .icon-shared { background-image: url(../images/link.png); } .icon-actions { background-image: url(../images/3_bullets.png); } .icon-sort-handle { background-image: url(../images/reorder.png); } -.icon-expended { background-image: url(../images/arrow_down.png); } +.icon-expanded { background-image: url(../images/arrow_down.png); } .icon-collapsed { background-image: url(../images/arrow_right.png); } .icon-bookmark { background-image: url(../images/tag_blue_delete.png); } .icon-bookmark-off { background-image: url(../images/tag_blue_add.png); } Index: test/unit/lib/redmine/wiki_formatting/macros_test.rb =================================================================== --- test/unit/lib/redmine/wiki_formatting/macros_test.rb (Revision 21271) +++ test/unit/lib/redmine/wiki_formatting/macros_test.rb (Arbeitskopie) @@ -225,7 +225,7 @@ assert_select_in result, 'div.collapsed-text' assert_select_in result, 'strong', :text => 'Collapsed' assert_select_in result, 'a.collapsible.icon-collapsed', :text => 'Show' - assert_select_in result, 'a.collapsible.icon-expended', :text => 'Hide' + assert_select_in result, 'a.collapsible.icon-expanded', :text => 'Hide' end end @@ -236,7 +236,7 @@ assert_select_in result, 'div.collapsed-text' assert_select_in result, 'strong', :text => 'Collapsed' assert_select_in result, 'a.collapsible.icon-collapsed', :text => 'Example' - assert_select_in result, 'a.collapsible.icon-expended', :text => 'Example' + assert_select_in result, 'a.collapsible.icon-expanded', :text => 'Example' end def test_macro_collapse_with_two_args @@ -246,7 +246,7 @@ assert_select_in result, 'div.collapsed-text' assert_select_in result, 'strong', :text => 'Collapsed' assert_select_in result, 'a.collapsible.icon-collapsed', :text => 'Show example' - assert_select_in result, 'a.collapsible.icon-expended', :text => 'Hide example' + assert_select_in result, 'a.collapsible.icon-expanded', :text => 'Hide example' end def test_macro_collapse_should_not_break_toc