Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity

Fix typo in class 'icon-expended' (#36149).

Browse Source 
Patch by Bernhard Rohloff.

git-svn-id: http://svn.redmine.org/redmine/trunk@21275 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2021-11-08 20:14:49 +00:00
parent c24b019c62
commit 1245708ba7
16 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/calendars/show.html.erb
View File

@@ -8,7 +8,7 @@
<div id="query_form_with_buttons" class="hide-when-print"> <div id="query_form_with_buttons" class="hide-when-print">
<div id="query_form_content"> <div id="query_form_content">
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>"> <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;" %>"> <div style="<%= @query.new_record? ? "" : "display: none;" %>">
<%= render :partial => 'queries/filters', :locals => {:query => @query} %> <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div> </div>

2
app/views/gantts/show.html.erb
View File

@@ -14,7 +14,7 @@
<div id="query_form_with_buttons" class="hide-when-print"> <div id="query_form_with_buttons" class="hide-when-print">
<div id="query_form_content"> <div id="query_form_content">
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>"> <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;" %>"> <div style="<%= @query.new_record? ? "" : "display: none;" %>">
<%= render :partial => 'queries/filters', :locals => {:query => @query} %> <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div> </div>

2
app/views/issues/_list.html.erb
View File

@@ -24,7 +24,7 @@
<% reset_cycle %> <% reset_cycle %>
<tr class="group open"> <tr class="group open">
<td colspan="<%= query.inline_columns.size + 2 %>"> <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> <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)}", <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
"toggleAllRowGroups(this)", :class => 'toggle-all') %> "toggleAllRowGroups(this)", :class => 'toggle-all') %>

2
app/views/projects/_list.html.erb
View File

@@ -14,7 +14,7 @@
<% reset_cycle %> <% reset_cycle %>
<tr class="group open"> <tr class="group open">
<td colspan="<%= @query.inline_columns.size %>"> <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> <span class="name"><%= group_name %></span>
<% if group_count %> <% if group_count %>
<span class="count"><%= group_count %></span> <span class="count"><%= group_count %></span>

2
app/views/queries/_query_form.html.erb
View File

@@ -5,7 +5,7 @@
<div id="query_form_with_buttons" class="hide-when-print"> <div id="query_form_with_buttons" class="hide-when-print">
<div id="query_form_content"> <div id="query_form_content">
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>"> <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;" %>"> <div style="<%= @query.new_record? ? "" : "display: none;" %>">
<%= render :partial => 'queries/filters', :locals => {:query => @query} %> <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div> </div>

2
app/views/roles/permissions.html.erb
View File

@@ -49,7 +49,7 @@
<% unless mod.blank? %> <% unless mod.blank? %>
<tr class="group open"> <tr class="group open">
<td> <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_') %> <%= l_or_humanize(mod, :prefix => 'project_module_') %>
</td> </td>
<% @roles.each do |role| %> <% @roles.each do |role| %>

2
app/views/timelog/_list.html.erb
View File

@@ -20,7 +20,7 @@
<% reset_cycle %> <% reset_cycle %>
<tr class="group open"> <tr class="group open">
<td colspan="<%= @query.inline_columns.size + 2 %>"> <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="name"><%= group_name %></span>
<% if group_count %> <% if group_count %>
<span class="badge badge-count count"><%= group_count %></span> <span class="badge badge-count count"><%= group_count %></span>

4
app/views/trackers/fields.html.erb
View File

@@ -20,7 +20,7 @@
<tbody> <tbody>
<tr class="group open"> <tr class="group open">
<td colspan="<%= @trackers.size + 1 %>"> <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) %> <%= l(:field_core_fields) %>
</td> </td>
</tr> </tr>
@@ -44,7 +44,7 @@
<% if @custom_fields.any? %> <% if @custom_fields.any? %>
<tr class="group open"> <tr class="group open">
<td colspan="<%= @trackers.size + 1 %>"> <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) %> <%= l(:label_custom_field_plural) %>
</td> </td>
</tr> </tr>

2
app/views/versions/_sidebar.html.erb
View File

@@ -43,7 +43,7 @@
<% if @completed_versions.present? %> <% if @completed_versions.present? %>
<p> <p>
<%= link_to_function l(:label_completed_versions), <%= 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' %> :id => 'toggle-completed-versions', :class => 'icon icon-collapsed collapsible' %>
<ul id = "completed-versions" style = "display:none;"> <ul id = "completed-versions" style = "display:none;">
<% @completed_versions.each do |version| %> <% @completed_versions.each do |version| %>

4
app/views/workflows/permissions.html.erb
View File

@@ -54,7 +54,7 @@
<tbody> <tbody>
<tr class="group open"> <tr class="group open">
<td colspan="<%= @statuses.size + 1 %>"> <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) %> <%= l(:field_core_fields) %>
</td> </td>
</tr> </tr>
@@ -74,7 +74,7 @@
<% if @custom_fields.any? %> <% if @custom_fields.any? %>
<tr class="group open"> <tr class="group open">
<td colspan="<%= @statuses.size + 1 %>"> <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) %> <%= l(:label_custom_field_plural) %>
</td> </td>
</tr> </tr>

2
lib/redmine/helpers/gantt.rb
View File

@@ -784,7 +784,7 @@ module Redmine
} }
end end
if has_children 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' tag_options[:class] += ' open'
else else
if params[:indent] if params[:indent]

2
lib/redmine/wiki_formatting/macros.rb
View File

@@ -250,7 +250,7 @@ module Redmine
link_to_function( link_to_function(
hide_label, js, hide_label, js,
:id => "#{html_id}-hide", :id => "#{html_id}-hide",
:class => 'icon icon-expended collapsible', :class => 'icon icon-expanded collapsible',
:style => 'display:none;' :style => 'display:none;'
) )
out << out <<

14
public/javascripts/application.js
View File

@@ -31,7 +31,7 @@ function toggleRowGroup(el) {
var tr = $(el).parents('tr').first(); var tr = $(el).parents('tr').first();
var n = tr.next(); var n = tr.next();
tr.toggleClass('open'); tr.toggleClass('open');
$(el).toggleClass('icon-expended icon-collapsed'); $(el).toggleClass('icon-expanded icon-collapsed');
while (n.length && !n.hasClass('group')) { while (n.length && !n.hasClass('group')) {
n.toggle(); n.toggle();
n = n.next('tr'); n = n.next('tr');
@@ -43,7 +43,7 @@ function collapseAllRowGroups(el) {
tbody.children('tr').each(function(index) { tbody.children('tr').each(function(index) {
if ($(this).hasClass('group')) { if ($(this).hasClass('group')) {
$(this).removeClass('open'); $(this).removeClass('open');
$(this).find('.expander').switchClass('icon-expended', 'icon-collapsed'); $(this).find('.expander').switchClass('icon-expanded', 'icon-collapsed');
} else { } else {
$(this).hide(); $(this).hide();
} }
@@ -55,7 +55,7 @@ function expandAllRowGroups(el) {
tbody.children('tr').each(function(index) { tbody.children('tr').each(function(index) {
if ($(this).hasClass('group')) { if ($(this).hasClass('group')) {
$(this).addClass('open'); $(this).addClass('open');
$(this).find('.expander').switchClass('icon-collapsed', 'icon-expended'); $(this).find('.expander').switchClass('icon-collapsed', 'icon-expanded');
} else { } else {
$(this).show(); $(this).show();
} }
@@ -74,7 +74,7 @@ function toggleAllRowGroups(el) {
function toggleFieldset(el) { function toggleFieldset(el) {
var fieldset = $(el).parents('fieldset').first(); var fieldset = $(el).parents('fieldset').first();
fieldset.toggleClass('collapsed'); fieldset.toggleClass('collapsed');
fieldset.children('legend').toggleClass('icon-expended icon-collapsed'); fieldset.children('legend').toggleClass('icon-expanded icon-collapsed');
fieldset.children('div').toggle(); fieldset.children('div').toggle();
} }
@@ -550,12 +550,12 @@ function scmEntryClick(id, url) {
var el = $('#'+id); var el = $('#'+id);
if (el.hasClass('open')) { if (el.hasClass('open')) {
collapseScmEntry(id); collapseScmEntry(id);
el.find('.expander').switchClass('icon-expended', 'icon-collapsed'); el.find('.expander').switchClass('icon-expanded', 'icon-collapsed');
el.addClass('collapsed'); el.addClass('collapsed');
return false; return false;
} else if (el.hasClass('loaded')) { } else if (el.hasClass('loaded')) {
expandScmEntry(id); expandScmEntry(id);
el.find('.expander').switchClass('icon-collapsed', 'icon-expended'); el.find('.expander').switchClass('icon-collapsed', 'icon-expanded');
el.removeClass('collapsed'); el.removeClass('collapsed');
return false; return false;
} }
@@ -568,7 +568,7 @@ function scmEntryClick(id, url) {
success: function(data) { success: function(data) {
el.after(data); el.after(data);
el.addClass('open').addClass('loaded').removeClass('loading'); 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; return true;

4
public/javascripts/gantt.js
View File

@@ -241,12 +241,12 @@ ganttEntryClick = function(e){
var iconChange = null; var iconChange = null;
if(subject.hasClass('open')) if(subject.hasClass('open'))
iconChange = function(element){ iconChange = function(element){
$(element).find('.expander').switchClass('icon-expended', 'icon-collapsed'); $(element).find('.expander').switchClass('icon-expanded', 'icon-collapsed');
$(element).removeClass('open'); $(element).removeClass('open');
}; };
else else
iconChange = function(element){ iconChange = function(element){
$(element).find('.expander').switchClass('icon-collapsed', 'icon-expended'); $(element).find('.expander').switchClass('icon-collapsed', 'icon-expanded');
$(element).addClass('open'); $(element).addClass('open');
}; };
iconChange(subject); iconChange(subject);

2
public/stylesheets/application.css
View File

@@ -1588,7 +1588,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
.icon-shared { background-image: url(../images/link.png); } .icon-shared { background-image: url(../images/link.png); }
.icon-actions { background-image: url(../images/3_bullets.png); } .icon-actions { background-image: url(../images/3_bullets.png); }
.icon-sort-handle { background-image: url(../images/reorder.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-collapsed { background-image: url(../images/arrow_right.png); }
.icon-bookmark { background-image: url(../images/tag_blue_delete.png); } .icon-bookmark { background-image: url(../images/tag_blue_delete.png); }
.icon-bookmark-off { background-image: url(../images/tag_blue_add.png); } .icon-bookmark-off { background-image: url(../images/tag_blue_add.png); }

6
test/unit/lib/redmine/wiki_formatting/macros_test.rb
View File

@@ -225,7 +225,7 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
assert_select_in result, 'div.collapsed-text' assert_select_in result, 'div.collapsed-text'
assert_select_in result, 'strong', :text => 'Collapsed' assert_select_in result, 'strong', :text => 'Collapsed'
assert_select_in result, 'a.collapsible.icon-collapsed', :text => 'Show' 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
end end
@@ -236,7 +236,7 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
assert_select_in result, 'div.collapsed-text' assert_select_in result, 'div.collapsed-text'
assert_select_in result, 'strong', :text => 'Collapsed' assert_select_in result, 'strong', :text => 'Collapsed'
assert_select_in result, 'a.collapsible.icon-collapsed', :text => 'Example' 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 end
def test_macro_collapse_with_two_args 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, 'div.collapsed-text'
assert_select_in result, 'strong', :text => 'Collapsed' 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-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 end
def test_macro_collapse_should_not_break_toc def test_macro_collapse_should_not_break_toc