summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2021-11-08 20:14:49 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2021-11-08 20:14:49 +0000
commit1245708ba77b66ae4ab88434757ca4d9c965ae53 (patch)
tree69afc6fc339758698d8ebd462efb0673bcdacc9e
parentc24b019c627ce159a258ac853c9f909627acbbd8 (diff)
downloadredmine-1245708ba77b66ae4ab88434757ca4d9c965ae53.tar.gz
redmine-1245708ba77b66ae4ab88434757ca4d9c965ae53.zip
Fix typo in class 'icon-expended' (#36149).
Patch by Bernhard Rohloff. git-svn-id: http://svn.redmine.org/redmine/trunk@21275 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/calendars/show.html.erb2
-rw-r--r--app/views/gantts/show.html.erb2
-rw-r--r--app/views/issues/_list.html.erb2
-rw-r--r--app/views/projects/_list.html.erb2
-rw-r--r--app/views/queries/_query_form.html.erb2
-rw-r--r--app/views/roles/permissions.html.erb2
-rw-r--r--app/views/timelog/_list.html.erb2
-rw-r--r--app/views/trackers/fields.html.erb4
-rw-r--r--app/views/versions/_sidebar.html.erb4
-rw-r--r--app/views/workflows/permissions.html.erb4
-rw-r--r--lib/redmine/helpers/gantt.rb2
-rw-r--r--lib/redmine/wiki_formatting/macros.rb2
-rw-r--r--public/javascripts/application.js14
-rw-r--r--public/javascripts/gantt.js4
-rw-r--r--public/stylesheets/application.css2
-rw-r--r--test/unit/lib/redmine/wiki_formatting/macros_test.rb6
16 files changed, 28 insertions, 28 deletions
diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index cf870116f..76513f50e 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -8,7 +8,7 @@
<div id="query_form_with_buttons" class="hide-when-print">
<div id="query_form_content">
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
- <legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expended" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
+ <legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expanded" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div>
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 9082d0375..e3bfa02ae 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -14,7 +14,7 @@
<div id="query_form_with_buttons" class="hide-when-print">
<div id="query_form_content">
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
- <legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expended" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
+ <legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expanded" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div>
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 4a7163fdd..2dd09d692 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -24,7 +24,7 @@
<% reset_cycle %>
<tr class="group open">
<td colspan="<%= query.inline_columns.size + 2 %>">
- <span class="expander icon icon-expended" onclick="toggleRowGroup(this);">&nbsp;</span>
+ <span class="expander icon icon-expanded" onclick="toggleRowGroup(this);">&nbsp;</span>
<span class="name"><%= group_name %></span> <span class="badge badge-count count"><%= group_count %></span> <span class="totals"><%= group_totals %></span>
<%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
"toggleAllRowGroups(this)", :class => 'toggle-all') %>
diff --git a/app/views/projects/_list.html.erb b/app/views/projects/_list.html.erb
index 3c90921ec..0abbc59e0 100644
--- a/app/views/projects/_list.html.erb
+++ b/app/views/projects/_list.html.erb
@@ -14,7 +14,7 @@
<% reset_cycle %>
<tr class="group open">
<td colspan="<%= @query.inline_columns.size %>">
- <span class="expander icon icon-expended" onclick="toggleRowGroup(this);">&nbsp;</span>
+ <span class="expander icon icon-expanded" onclick="toggleRowGroup(this);">&nbsp;</span>
<span class="name"><%= group_name %></span>
<% if group_count %>
<span class="count"><%= group_count %></span>
diff --git a/app/views/queries/_query_form.html.erb b/app/views/queries/_query_form.html.erb
index 734e96d7b..9f1f9ea7e 100644
--- a/app/views/queries/_query_form.html.erb
+++ b/app/views/queries/_query_form.html.erb
@@ -5,7 +5,7 @@
<div id="query_form_with_buttons" class="hide-when-print">
<div id="query_form_content">
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
- <legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expended" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
+ <legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expanded" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div>
diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb
index 9f1c9dae2..d91dd933d 100644
--- a/app/views/roles/permissions.html.erb
+++ b/app/views/roles/permissions.html.erb
@@ -49,7 +49,7 @@
<% unless mod.blank? %>
<tr class="group open">
<td>
- <span class="expander icon icon-expended" onclick="toggleRowGroup(this);">&nbsp;</span>
+ <span class="expander icon icon-expanded" onclick="toggleRowGroup(this);">&nbsp;</span>
<%= l_or_humanize(mod, :prefix => 'project_module_') %>
</td>
<% @roles.each do |role| %>
diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb
index 582d1208c..62e221f59 100644
--- a/app/views/timelog/_list.html.erb
+++ b/app/views/timelog/_list.html.erb
@@ -20,7 +20,7 @@
<% reset_cycle %>
<tr class="group open">
<td colspan="<%= @query.inline_columns.size + 2 %>">
- <span class="expander icon icon-expended" onclick="toggleRowGroup(this);">&nbsp;</span>
+ <span class="expander icon icon-expanded" onclick="toggleRowGroup(this);">&nbsp;</span>
<span class="name"><%= group_name %></span>
<% if group_count %>
<span class="badge badge-count count"><%= group_count %></span>
diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb
index 4a27ef2e4..a9fe49351 100644
--- a/app/views/trackers/fields.html.erb
+++ b/app/views/trackers/fields.html.erb
@@ -20,7 +20,7 @@
<tbody>
<tr class="group open">
<td colspan="<%= @trackers.size + 1 %>">
- <span class="expander icon icon-expended" onclick="toggleRowGroup(this);">&nbsp;</span>
+ <span class="expander icon icon-expanded" onclick="toggleRowGroup(this);">&nbsp;</span>
<%= l(:field_core_fields) %>
</td>
</tr>
@@ -44,7 +44,7 @@
<% if @custom_fields.any? %>
<tr class="group open">
<td colspan="<%= @trackers.size + 1 %>">
- <span class="expander icon icon-expended" onclick="toggleRowGroup(this);">&nbsp;</span>
+ <span class="expander icon icon-expanded" onclick="toggleRowGroup(this);">&nbsp;</span>
<%= l(:label_custom_field_plural) %>
</td>
</tr>
diff --git a/app/views/versions/_sidebar.html.erb b/app/views/versions/_sidebar.html.erb
index 6b34b34b8..0eb517c24 100644
--- a/app/views/versions/_sidebar.html.erb
+++ b/app/views/versions/_sidebar.html.erb
@@ -43,7 +43,7 @@
<% if @completed_versions.present? %>
<p>
<%= 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' %>
<ul id = "completed-versions" style = "display:none;">
<% @completed_versions.each do |version| %>
@@ -51,4 +51,4 @@
<% end %>
</ul>
</p>
-<% end %> \ No newline at end of file
+<% end %>
diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb
index 806d557dc..c366a7838 100644
--- a/app/views/workflows/permissions.html.erb
+++ b/app/views/workflows/permissions.html.erb
@@ -54,7 +54,7 @@
<tbody>
<tr class="group open">
<td colspan="<%= @statuses.size + 1 %>">
- <span class="expander icon icon-expended" onclick="toggleRowGroup(this);">&nbsp;</span>
+ <span class="expander icon icon-expanded" onclick="toggleRowGroup(this);">&nbsp;</span>
<%= l(:field_core_fields) %>
</td>
</tr>
@@ -74,7 +74,7 @@
<% if @custom_fields.any? %>
<tr class="group open">
<td colspan="<%= @statuses.size + 1 %>">
- <span class="expander icon icon-expended" onclick="toggleRowGroup(this);">&nbsp;</span>
+ <span class="expander icon icon-expanded" onclick="toggleRowGroup(this);">&nbsp;</span>
<%= l(:label_custom_field_plural) %>
</td>
</tr>
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index 6b40bc844..0d5803c3d 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -784,7 +784,7 @@ module Redmine
}
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]
diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index e5f196306..d1a9e81ca 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -250,7 +250,7 @@ module Redmine
link_to_function(
hide_label, js,
:id => "#{html_id}-hide",
- :class => 'icon icon-expended collapsible',
+ :class => 'icon icon-expanded collapsible',
:style => 'display:none;'
)
out <<
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 7feb3a293..4d7ff583a 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -31,7 +31,7 @@ function toggleRowGroup(el) {
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 @@ function collapseAllRowGroups(el) {
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 @@ function expandAllRowGroups(el) {
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 toggleAllRowGroups(el) {
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 @@ function scmEntryClick(id, url) {
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 @@ function scmEntryClick(id, url) {
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;
diff --git a/public/javascripts/gantt.js b/public/javascripts/gantt.js
index e3db1f796..04e745def 100644
--- a/public/javascripts/gantt.js
+++ b/public/javascripts/gantt.js
@@ -241,12 +241,12 @@ ganttEntryClick = function(e){
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);
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 791ef4c23..78be5865e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1588,7 +1588,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
.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); }
diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
index 4242814d1..a7940cae8 100644
--- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
@@ -225,7 +225,7 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
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 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
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 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
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