Defect #36149 ยป fix_icon_expended_spelling.diff
| app/views/calendars/show.html.erb (Arbeitskopie) | ||
|---|---|---|
| 8 | 8 |
<div id="query_form_with_buttons" class="hide-when-print"> |
| 9 | 9 |
<div id="query_form_content"> |
| 10 | 10 |
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>"> |
| 11 |
<legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expended" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
|
|
| 11 |
<legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expanded" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
|
|
| 12 | 12 |
<div style="<%= @query.new_record? ? "" : "display: none;" %>"> |
| 13 | 13 |
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
|
| 14 | 14 |
</div> |
| app/views/gantts/show.html.erb (Arbeitskopie) | ||
|---|---|---|
| 14 | 14 |
<div id="query_form_with_buttons" class="hide-when-print"> |
| 15 | 15 |
<div id="query_form_content"> |
| 16 | 16 |
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>"> |
| 17 |
<legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expended" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
|
|
| 17 |
<legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expanded" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
|
|
| 18 | 18 |
<div style="<%= @query.new_record? ? "" : "display: none;" %>"> |
| 19 | 19 |
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
|
| 20 | 20 |
</div> |
| app/views/issues/_list.html.erb (Arbeitskopie) | ||
|---|---|---|
| 24 | 24 |
<% reset_cycle %> |
| 25 | 25 |
<tr class="group open"> |
| 26 | 26 |
<td colspan="<%= query.inline_columns.size + 2 %>"> |
| 27 |
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span>
|
|
| 27 |
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span>
|
|
| 28 | 28 |
<span class="name"><%= group_name %></span> <span class="badge badge-count count"><%= group_count %></span> <span class="totals"><%= group_totals %></span> |
| 29 | 29 |
<%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
|
| 30 | 30 |
"toggleAllRowGroups(this)", :class => 'toggle-all') %> |
| app/views/projects/_list.html.erb (Arbeitskopie) | ||
|---|---|---|
| 14 | 14 |
<% reset_cycle %> |
| 15 | 15 |
<tr class="group open"> |
| 16 | 16 |
<td colspan="<%= @query.inline_columns.size %>"> |
| 17 |
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span>
|
|
| 17 |
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span>
|
|
| 18 | 18 |
<span class="name"><%= group_name %></span> |
| 19 | 19 |
<% if group_count %> |
| 20 | 20 |
<span class="count"><%= group_count %></span> |
| app/views/queries/_query_form.html.erb (Arbeitskopie) | ||
|---|---|---|
| 5 | 5 |
<div id="query_form_with_buttons" class="hide-when-print"> |
| 6 | 6 |
<div id="query_form_content"> |
| 7 | 7 |
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>"> |
| 8 |
<legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expended" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
|
|
| 8 |
<legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expanded" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
|
|
| 9 | 9 |
<div style="<%= @query.new_record? ? "" : "display: none;" %>"> |
| 10 | 10 |
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
|
| 11 | 11 |
</div> |
| app/views/roles/permissions.html.erb (Arbeitskopie) | ||
|---|---|---|
| 49 | 49 |
<% unless mod.blank? %> |
| 50 | 50 |
<tr class="group open"> |
| 51 | 51 |
<td> |
| 52 |
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span>
|
|
| 52 |
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span>
|
|
| 53 | 53 |
<%= l_or_humanize(mod, :prefix => 'project_module_') %> |
| 54 | 54 |
</td> |
| 55 | 55 |
<% @roles.each do |role| %> |
| app/views/timelog/_list.html.erb (Arbeitskopie) | ||
|---|---|---|
| 20 | 20 |
<% reset_cycle %> |
| 21 | 21 |
<tr class="group open"> |
| 22 | 22 |
<td colspan="<%= @query.inline_columns.size + 2 %>"> |
| 23 |
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span>
|
|
| 23 |
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span>
|
|
| 24 | 24 |
<span class="name"><%= group_name %></span> |
| 25 | 25 |
<% if group_count %> |
| 26 | 26 |
<span class="badge badge-count count"><%= group_count %></span> |
| app/views/trackers/fields.html.erb (Arbeitskopie) | ||
|---|---|---|
| 20 | 20 |
<tbody> |
| 21 | 21 |
<tr class="group open"> |
| 22 | 22 |
<td colspan="<%= @trackers.size + 1 %>"> |
| 23 |
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span>
|
|
| 23 |
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span>
|
|
| 24 | 24 |
<%= l(:field_core_fields) %> |
| 25 | 25 |
</td> |
| 26 | 26 |
</tr> |
| ... | ... | |
| 44 | 44 |
<% if @custom_fields.any? %> |
| 45 | 45 |
<tr class="group open"> |
| 46 | 46 |
<td colspan="<%= @trackers.size + 1 %>"> |
| 47 |
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span>
|
|
| 47 |
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span>
|
|
| 48 | 48 |
<%= l(:label_custom_field_plural) %> |
| 49 | 49 |
</td> |
| 50 | 50 |
</tr> |
| app/views/versions/_sidebar.html.erb (Arbeitskopie) | ||
|---|---|---|
| 43 | 43 |
<% if @completed_versions.present? %> |
| 44 | 44 |
<p> |
| 45 | 45 |
<%= link_to_function l(:label_completed_versions), |
| 46 |
'$("#toggle-completed-versions").toggleClass("icon-collapsed icon-expended"); $("#completed-versions").toggle()',
|
|
| 46 |
'$("#toggle-completed-versions").toggleClass("icon-collapsed icon-expanded"); $("#completed-versions").toggle()',
|
|
| 47 | 47 |
:id => 'toggle-completed-versions', :class => 'icon icon-collapsed collapsible' %> |
| 48 | 48 |
<ul id = "completed-versions" style = "display:none;"> |
| 49 | 49 |
<% @completed_versions.each do |version| %> |
| ... | ... | |
| 51 | 51 |
<% end %> |
| 52 | 52 |
</ul> |
| 53 | 53 |
</p> |
| 54 |
<% end %> |
|
| 54 |
<% end %> |
|
| app/views/workflows/permissions.html.erb (Arbeitskopie) | ||
|---|---|---|
| 54 | 54 |
<tbody> |
| 55 | 55 |
<tr class="group open"> |
| 56 | 56 |
<td colspan="<%= @statuses.size + 1 %>"> |
| 57 |
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span>
|
|
| 57 |
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span>
|
|
| 58 | 58 |
<%= l(:field_core_fields) %> |
| 59 | 59 |
</td> |
| 60 | 60 |
</tr> |
| ... | ... | |
| 74 | 74 |
<% if @custom_fields.any? %> |
| 75 | 75 |
<tr class="group open"> |
| 76 | 76 |
<td colspan="<%= @statuses.size + 1 %>"> |
| 77 |
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span>
|
|
| 77 |
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span>
|
|
| 78 | 78 |
<%= l(:label_custom_field_plural) %> |
| 79 | 79 |
</td> |
| 80 | 80 |
</tr> |
| lib/redmine/helpers/gantt.rb (Arbeitskopie) | ||
|---|---|---|
| 784 | 784 |
} |
| 785 | 785 |
end |
| 786 | 786 |
if has_children |
| 787 |
content = view.content_tag(:span, nil, :class => 'icon icon-expended expander') + content
|
|
| 787 |
content = view.content_tag(:span, nil, :class => 'icon icon-expanded expander') + content
|
|
| 788 | 788 |
tag_options[:class] += ' open' |
| 789 | 789 |
else |
| 790 | 790 |
if params[:indent] |
| lib/redmine/wiki_formatting/macros.rb (Arbeitskopie) | ||
|---|---|---|
| 250 | 250 |
link_to_function( |
| 251 | 251 |
hide_label, js, |
| 252 | 252 |
:id => "#{html_id}-hide",
|
| 253 |
:class => 'icon icon-expended collapsible',
|
|
| 253 |
:class => 'icon icon-expanded collapsible',
|
|
| 254 | 254 |
:style => 'display:none;' |
| 255 | 255 |
) |
| 256 | 256 |
out << |
| public/javascripts/application.js (Arbeitskopie) | ||
|---|---|---|
| 31 | 31 |
var tr = $(el).parents('tr').first();
|
| 32 | 32 |
var n = tr.next(); |
| 33 | 33 |
tr.toggleClass('open');
|
| 34 |
$(el).toggleClass('icon-expended icon-collapsed');
|
|
| 34 |
$(el).toggleClass('icon-expanded icon-collapsed');
|
|
| 35 | 35 |
while (n.length && !n.hasClass('group')) {
|
| 36 | 36 |
n.toggle(); |
| 37 | 37 |
n = n.next('tr');
|
| ... | ... | |
| 43 | 43 |
tbody.children('tr').each(function(index) {
|
| 44 | 44 |
if ($(this).hasClass('group')) {
|
| 45 | 45 |
$(this).removeClass('open');
|
| 46 |
$(this).find('.expander').switchClass('icon-expended', 'icon-collapsed');
|
|
| 46 |
$(this).find('.expander').switchClass('icon-expanded', 'icon-collapsed');
|
|
| 47 | 47 |
} else {
|
| 48 | 48 |
$(this).hide(); |
| 49 | 49 |
} |
| ... | ... | |
| 55 | 55 |
tbody.children('tr').each(function(index) {
|
| 56 | 56 |
if ($(this).hasClass('group')) {
|
| 57 | 57 |
$(this).addClass('open');
|
| 58 |
$(this).find('.expander').switchClass('icon-collapsed', 'icon-expended');
|
|
| 58 |
$(this).find('.expander').switchClass('icon-collapsed', 'icon-expanded');
|
|
| 59 | 59 |
} else {
|
| 60 | 60 |
$(this).show(); |
| 61 | 61 |
} |
| ... | ... | |
| 74 | 74 |
function toggleFieldset(el) {
|
| 75 | 75 |
var fieldset = $(el).parents('fieldset').first();
|
| 76 | 76 |
fieldset.toggleClass('collapsed');
|
| 77 |
fieldset.children('legend').toggleClass('icon-expended icon-collapsed');
|
|
| 77 |
fieldset.children('legend').toggleClass('icon-expanded icon-collapsed');
|
|
| 78 | 78 |
fieldset.children('div').toggle();
|
| 79 | 79 |
} |
| 80 | 80 | |
| ... | ... | |
| 550 | 550 |
var el = $('#'+id);
|
| 551 | 551 |
if (el.hasClass('open')) {
|
| 552 | 552 |
collapseScmEntry(id); |
| 553 |
el.find('.expander').switchClass('icon-expended', 'icon-collapsed');
|
|
| 553 |
el.find('.expander').switchClass('icon-expanded', 'icon-collapsed');
|
|
| 554 | 554 |
el.addClass('collapsed');
|
| 555 | 555 |
return false; |
| 556 | 556 |
} else if (el.hasClass('loaded')) {
|
| 557 | 557 |
expandScmEntry(id); |
| 558 |
el.find('.expander').switchClass('icon-collapsed', 'icon-expended');
|
|
| 558 |
el.find('.expander').switchClass('icon-collapsed', 'icon-expanded');
|
|
| 559 | 559 |
el.removeClass('collapsed');
|
| 560 | 560 |
return false; |
| 561 | 561 |
} |
| ... | ... | |
| 568 | 568 |
success: function(data) {
|
| 569 | 569 |
el.after(data); |
| 570 | 570 |
el.addClass('open').addClass('loaded').removeClass('loading');
|
| 571 |
el.find('.expander').switchClass('icon-collapsed', 'icon-expended');
|
|
| 571 |
el.find('.expander').switchClass('icon-collapsed', 'icon-expanded');
|
|
| 572 | 572 |
} |
| 573 | 573 |
}); |
| 574 | 574 |
return true; |
| public/javascripts/gantt.js (Arbeitskopie) | ||
|---|---|---|
| 241 | 241 |
var iconChange = null; |
| 242 | 242 |
if(subject.hasClass('open'))
|
| 243 | 243 |
iconChange = function(element){
|
| 244 |
$(element).find('.expander').switchClass('icon-expended', 'icon-collapsed');
|
|
| 244 |
$(element).find('.expander').switchClass('icon-expanded', 'icon-collapsed');
|
|
| 245 | 245 |
$(element).removeClass('open');
|
| 246 | 246 |
}; |
| 247 | 247 |
else |
| 248 | 248 |
iconChange = function(element){
|
| 249 |
$(element).find('.expander').switchClass('icon-collapsed', 'icon-expended');
|
|
| 249 |
$(element).find('.expander').switchClass('icon-collapsed', 'icon-expanded');
|
|
| 250 | 250 |
$(element).addClass('open');
|
| 251 | 251 |
}; |
| 252 | 252 |
iconChange(subject); |
| public/stylesheets/application.css (Arbeitskopie) | ||
|---|---|---|
| 1588 | 1588 |
.icon-shared { background-image: url(../images/link.png); }
|
| 1589 | 1589 |
.icon-actions { background-image: url(../images/3_bullets.png); }
|
| 1590 | 1590 |
.icon-sort-handle { background-image: url(../images/reorder.png); }
|
| 1591 |
.icon-expended { background-image: url(../images/arrow_down.png); }
|
|
| 1591 |
.icon-expanded { background-image: url(../images/arrow_down.png); }
|
|
| 1592 | 1592 |
.icon-collapsed { background-image: url(../images/arrow_right.png); }
|
| 1593 | 1593 |
.icon-bookmark { background-image: url(../images/tag_blue_delete.png); }
|
| 1594 | 1594 |
.icon-bookmark-off { background-image: url(../images/tag_blue_add.png); }
|
| test/unit/lib/redmine/wiki_formatting/macros_test.rb (Arbeitskopie) | ||
|---|---|---|
| 225 | 225 |
assert_select_in result, 'div.collapsed-text' |
| 226 | 226 |
assert_select_in result, 'strong', :text => 'Collapsed' |
| 227 | 227 |
assert_select_in result, 'a.collapsible.icon-collapsed', :text => 'Show' |
| 228 |
assert_select_in result, 'a.collapsible.icon-expended', :text => 'Hide'
|
|
| 228 |
assert_select_in result, 'a.collapsible.icon-expanded', :text => 'Hide'
|
|
| 229 | 229 |
end |
| 230 | 230 |
end |
| 231 | 231 | |
| ... | ... | |
| 236 | 236 |
assert_select_in result, 'div.collapsed-text' |
| 237 | 237 |
assert_select_in result, 'strong', :text => 'Collapsed' |
| 238 | 238 |
assert_select_in result, 'a.collapsible.icon-collapsed', :text => 'Example' |
| 239 |
assert_select_in result, 'a.collapsible.icon-expended', :text => 'Example'
|
|
| 239 |
assert_select_in result, 'a.collapsible.icon-expanded', :text => 'Example'
|
|
| 240 | 240 |
end |
| 241 | 241 | |
| 242 | 242 |
def test_macro_collapse_with_two_args |
| ... | ... | |
| 246 | 246 |
assert_select_in result, 'div.collapsed-text' |
| 247 | 247 |
assert_select_in result, 'strong', :text => 'Collapsed' |
| 248 | 248 |
assert_select_in result, 'a.collapsible.icon-collapsed', :text => 'Show example' |
| 249 |
assert_select_in result, 'a.collapsible.icon-expended', :text => 'Hide example'
|
|
| 249 |
assert_select_in result, 'a.collapsible.icon-expanded', :text => 'Hide example'
|
|
| 250 | 250 |
end |
| 251 | 251 | |
| 252 | 252 |
def test_macro_collapse_should_not_break_toc |