Use "icon icon-*" classes for expandable elements (#31433).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18209 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 9 insertions, 2 deletions

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 7829964f5..5dfd260fc 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -32,6 +32,7 @@ function toggleRowGroup(el) {
   var tr = $(el).parents('tr').first();
   var n = tr.next();
   tr.toggleClass('open');
+  $(el).toggleClass('icon-expended icon-collapsed');
   while (n.length && !n.hasClass('group')) {
     n.toggle();
     n = n.next('tr');
@@ -43,6 +44,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');
     } else {
       $(this).hide();
     }
@@ -54,6 +56,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');
     } else {
       $(this).show();
     }
@@ -477,10 +480,12 @@ function scmEntryClick(id, url) {
     var el = $('#'+id);
     if (el.hasClass('open')) {
         collapseScmEntry(id);
+        el.find('.expander').switchClass('icon-expended', 'icon-collapsed');
         el.addClass('collapsed');
         return false;
     } else if (el.hasClass('loaded')) {
         expandScmEntry(id);
+        el.find('.expander').switchClass('icon-collapsed', 'icon-expended');
         el.removeClass('collapsed');
         return false;
     }
@@ -493,6 +498,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');
       }
     });
     return true;
diff --git a/public/javascripts/gantt.js b/public/javascripts/gantt.js
index 02a1666ea..ebaaa2b46 100644
--- a/public/javascripts/gantt.js
+++ b/public/javascripts/gantt.js
@@ -240,10 +240,12 @@ ganttEntryClick = function(e){
   var iconChange = null;
   if(subject.hasClass('open'))
     iconChange = function(element){
+      $(element).find('.expander').switchClass('icon-expended', 'icon-collapsed');
       $(element).removeClass('open');
     };
   else
     iconChange = function(element){
+      $(element).find('.expander').switchClass('icon-collapsed', 'icon-expended');
       $(element).addClass('open');
     };
   iconChange(subject);
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 96e783df9..1ebab7f0a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -288,8 +288,7 @@ tr.entry td.age { text-align: right; }
 tr.entry.file td.filename a { margin-left: 16px; }
 tr.entry.file td.filename_no_report a { margin-left: 16px; }
 
-tr span.expander, .gantt_subjects div > span.expander {background: url(../images/arrow_right.png) no-repeat 2px 50%; padding-left: 8px; margin-left: 0; cursor: pointer;}
-tr.open span.expander, .gantt_subjects div.open > span.expander {background-image: url(../images/arrow_down.png);}
+tr span.expander, .gantt_subjects div > span.expander {background-position: 2px 50%; padding-left: 8px; margin-left: 0; cursor: pointer;}
 .gantt_subjects div > span.expander {padding-left: 12px;}
 .gantt_subjects div > span .icon-gravatar {float: none;}