Patch by Bernhard Rohloff. git-svn-id: http://svn.redmine.org/redmine/trunk@21275 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/5.0.0
@@ -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> |
@@ -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> |
@@ -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);"> </span> | |||
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </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') %> |
@@ -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);"> </span> | |||
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span> | |||
<span class="name"><%= group_name %></span> | |||
<% if group_count %> | |||
<span class="count"><%= group_count %></span> |
@@ -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> |
@@ -49,7 +49,7 @@ | |||
<% unless mod.blank? %> | |||
<tr class="group open"> | |||
<td> | |||
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span> | |||
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span> | |||
<%= l_or_humanize(mod, :prefix => 'project_module_') %> | |||
</td> | |||
<% @roles.each do |role| %> |
@@ -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);"> </span> | |||
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span> | |||
<span class="name"><%= group_name %></span> | |||
<% if group_count %> | |||
<span class="badge badge-count count"><%= group_count %></span> |
@@ -20,7 +20,7 @@ | |||
<tbody> | |||
<tr class="group open"> | |||
<td colspan="<%= @trackers.size + 1 %>"> | |||
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span> | |||
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </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);"> </span> | |||
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span> | |||
<%= l(:label_custom_field_plural) %> | |||
</td> | |||
</tr> |
@@ -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 %> | |||
<% end %> |
@@ -54,7 +54,7 @@ | |||
<tbody> | |||
<tr class="group open"> | |||
<td colspan="<%= @statuses.size + 1 %>"> | |||
<span class="expander icon icon-expended" onclick="toggleRowGroup(this);"> </span> | |||
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </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);"> </span> | |||
<span class="expander icon icon-expanded" onclick="toggleRowGroup(this);"> </span> | |||
<%= l(:label_custom_field_plural) %> | |||
</td> | |||
</tr> |
@@ -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] |
@@ -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 << |
@@ -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; |
@@ -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); |
@@ -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); } |
@@ -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 |