Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-14 17:26:06 +01:00
Code Issues Packages Projects Releases Activity

Use the regular "icon icon-*" classes for collapsible fields (#31433).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18204 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-05-27 21:24:24 +00:00
parent 5b29b2b5d1
commit 580e2f669a
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,14 +5,14 @@
<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);"><%= l(:label_filter_plural) %></legend> <legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expended" : "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>
</fieldset> </fieldset>
<fieldset id="options" class="collapsible collapsed"> <fieldset id="options" class="collapsible collapsed">
<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend> <legend onclick="toggleFieldset(this);" class="icon icon-collapsed"><%= l(:label_options) %></legend>
<div style="display: none;"> <div style="display: none;">
<table> <table>
<tr> <tr>

4
app/views/versions/index.html.erb
View File

@@ -89,8 +89,8 @@
<% 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("collapsed"); $("#completed-versions").toggle()', '$("#toggle-completed-versions").toggleClass("icon-collapsed icon-expended"); $("#completed-versions").toggle()',
:id => 'toggle-completed-versions', :class => 'collapsible collapsed' %> :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| %>
<li><%= link_to_version version %></li> <li><%= link_to_version version %></li>

1
public/javascripts/application.js
View File

@@ -72,6 +72,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('div').toggle(); fieldset.children('div').toggle();
} }

8
public/stylesheets/application.css
View File

@@ -132,8 +132,7 @@ a.user.locked, a.user.locked:link, a.user.locked:visited {color: #999;}
#admin-menu a {line-height:1.7em;} #admin-menu a {line-height:1.7em;}
#admin-menu a.selected {padding-left: 20px !important; background-position: 2px 40%;} #admin-menu a.selected {padding-left: 20px !important; background-position: 2px 40%;}
a.collapsible {padding-left: 12px; background: url(../images/arrow_down.png) no-repeat 0px 50%;} a.collapsible {padding-left: 12px; }
a.collapsible.collapsed {background-image: url(../images/arrow_right.png);}
a#toggle-completed-versions {color:#999;} a#toggle-completed-versions {color:#999;}
@@ -519,8 +518,7 @@ div.issue.overdue .due-date .value { color: #c22; }
#trackers_description dd {margin: 0; padding: 0 0 1em 0;} #trackers_description dd {margin: 0; padding: 0 0 1em 0;}
fieldset.collapsible {border-width: 1px 0 0 0;} fieldset.collapsible {border-width: 1px 0 0 0;}
fieldset.collapsible>legend { padding-left: 18px; background: url(../images/arrow_down.png) no-repeat 4px 40%; cursor:pointer; } fieldset.collapsible>legend { cursor:pointer; padding-left: 18px; background-position: 4px;}
fieldset.collapsible.collapsed>legend { background-image: url(../images/arrow_right.png); }
fieldset#date-range p { margin: 2px 0 2px 0; } fieldset#date-range p { margin: 2px 0 2px 0; }
fieldset#filters table { border-collapse: collapse; } fieldset#filters table { border-collapse: collapse; }
@@ -1501,6 +1499,8 @@ 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-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); }