[Rt-commit] rt branch, 4.2/fixup-version-history, updated. rt-4.1.17-7-g4760125

[Thomas Sibley]

The branch, 4.2/fixup-version-history has been updated
       via  476012566a751de9f6c63195c6998977bd7238c1 (commit)
       via  92dab4774712c94ca1d350cfe9a3261b943d833a (commit)
      from  1426745f80e4dd663a53b3422c71bce46c85d469 (commit)

Summary of changes:
 share/html/Admin/Tools/Configuration.html |  3 ++-
 share/static/css/base/admin.css           | 16 ++++++++++++++++
 share/static/css/base/collection.css      | 13 -------------
 share/static/js/util.js                   | 14 +++-----------
 4 files changed, 21 insertions(+), 25 deletions(-)

- Log -----------------------------------------------------------------
commit 92dab4774712c94ca1d350cfe9a3261b943d833a
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Aug 30 14:35:06 2013 -0700

    Implement upgrade history rollups in more CSS and less JS
    
    For a cleaner implementation all around.  Still kinda ugly, but it's
    fine.

diff --git a/share/html/Admin/Tools/Configuration.html b/share/html/Admin/Tools/Configuration.html
index ef903c0..bca7adf 100644
--- a/share/html/Admin/Tools/Configuration.html
+++ b/share/html/Admin/Tools/Configuration.html
@@ -349,7 +349,8 @@ UPGRADE: foreach my $upgrade ( @{$upgrade_history->{$package}} ){
 </%perl>
     <tr class="oddline">
     <td class="upgrade-history-parent" id="parent-upgrade-history-<% $parent_id %>">
-    <span class="widget"><a href="#" onclick="return toggleClassElement('<% 'upgrade-history-' . $parent_id %>');"></a></span></td>
+      <span class="widget"><a href="#" onclick="toggle_upgrade_history(this, '.upgrade-history-' + <% $parent_id | n,j %>); return false";"></a></span>
+    </td>
 %       } else {
 <tr class="<% $tr_class %>">
 <td class="collection-as-table"></td>
diff --git a/share/static/css/base/collection.css b/share/static/css/base/collection.css
index f82ec2c..e20ca5c 100644
--- a/share/static/css/base/collection.css
+++ b/share/static/css/base/collection.css
@@ -16,14 +16,17 @@ table.collection td:first-child, table.collection th:first-child {
 }
 
 .upgrade-history-parent .widget a {
-  display: inline-block;
+  display: block;
   margin: 0;
   width: 20px;
-  background-image: url('../../../static/images/css/rollup-arrow.gif');
-  background-repeat: no-repeat;
+
+  background: url(../../../static/images/css/rollup-arrow.gif) no-repeat;
   background-position: center 0;
-  position: static;
-  top: 0.5em;
-  left: 1.2em;
+
   padding: 7px 0 0 0;
+  overflow: hidden;
+}
+
+.upgrade-history-parent .widget a.rolled-up {
+    background-image: url(../../../static/images/css/rolldown-arrow.gif);
 }
diff --git a/share/static/js/util.js b/share/static/js/util.js
index 40c4b37..ad47526 100644
--- a/share/static/js/util.js
+++ b/share/static/js/util.js
@@ -30,17 +30,9 @@ function switchVisibility(id1, id2) {
     return false;
 }
 
-/* Show/hide with class */
-
-function toggleClassElement(className) {
-    jQuery("." + className).toggle();
-    if ( jQuery("." + className).is(":hidden") ){
-        jQuery("#parent-" + className).find("a").css("background-image", "url('../../../static/images/css/rolldown-arrow.gif')");
-    }
-    else{
-        jQuery("#parent-" + className).find("a").css("background-image", "url('../../../static/images/css/rollup-arrow.gif')");
-    }
-    return false;
+function toggle_upgrade_history(widget, selector) {
+    jQuery(selector).toggle();
+    jQuery(widget).toggleClass("rolled-up");
 }
 
 /* Classes */

commit 476012566a751de9f6c63195c6998977bd7238c1
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Aug 30 14:37:25 2013 -0700

    Upgrade history CSS has nothing to do with collections and everything to do with admins

diff --git a/share/static/css/base/admin.css b/share/static/css/base/admin.css
index 39b479d3..b43610c 100644
--- a/share/static/css/base/admin.css
+++ b/share/static/css/base/admin.css
@@ -56,3 +56,19 @@ ul.list-menu ul li {
 h2 + .admin-hint {
     margin-top: -1em;
 }
+
+.upgrade-history-parent .widget a {
+  display: block;
+  margin: 0;
+  width: 20px;
+
+  background: url(../../../static/images/css/rollup-arrow.gif) no-repeat;
+  background-position: center 0;
+
+  padding: 7px 0 0 0;
+  overflow: hidden;
+}
+
+.upgrade-history-parent .widget a.rolled-up {
+    background-image: url(../../../static/images/css/rolldown-arrow.gif);
+}
diff --git a/share/static/css/base/collection.css b/share/static/css/base/collection.css
index e20ca5c..d690192 100644
--- a/share/static/css/base/collection.css
+++ b/share/static/css/base/collection.css
@@ -14,19 +14,3 @@ table.collection td:first-child, table.collection th:first-child {
 .collection-as-table .user a:visited {
     color: inherit;
 }
-
-.upgrade-history-parent .widget a {
-  display: block;
-  margin: 0;
-  width: 20px;
-
-  background: url(../../../static/images/css/rollup-arrow.gif) no-repeat;
-  background-position: center 0;
-
-  padding: 7px 0 0 0;
-  overflow: hidden;
-}
-
-.upgrade-history-parent .widget a.rolled-up {
-    background-image: url(../../../static/images/css/rolldown-arrow.gif);
-}

-----------------------------------------------------------------------