r4852 - in trunk/cumin: python/cumin resources

Author: croberts
Date: 2011-06-24 13:58:48 +0000 (Fri, 24 Jun 2011)
New Revision: 4852

Modified:
   trunk/cumin/python/cumin/main.strings
   trunk/cumin/resources/app.css
   trunk/cumin/resources/app.js
Log:
One more fix for BZ https://bugzilla.redhat.com/show_bug.cgi?id=703630 For the messaging
overview page, the fullpage icons needed to go back to their original places.

Modified: trunk/cumin/python/cumin/main.strings
===================================================================
--- trunk/cumin/python/cumin/main.strings	2011-06-24 12:42:17 UTC (rev 4851)
+++ trunk/cumin/python/cumin/main.strings	2011-06-24 13:58:48 UTC (rev 4852)
@@ -4,14 +4,14 @@
     <tbody>
       <tr>
         <td>
-<div class="fullpageable">
+<div class="fullpageable oldfpiconlocation">
           <h2><img src="{resource_prefix}/queue-20.png"
alt="" /> Deepest Message Queues</h2>
 
           <div class="iblock">{queues}</div>
 </div>
         </td>
         <td>
-<div class="fullpageable">
+<div class="fullpageable oldfpiconlocation">
           <h2><img src="{resource_prefix}/job-20.png" alt=""
/> Longest Running Grid Submissions</h2>
           <div class="iblock">{submissions}</div>
 </div>
@@ -19,7 +19,7 @@
       </tr>
       <tr>
         <td>
-<div class="fullpageable">
+<div class="fullpageable oldfpiconlocation">
           <h2><img src="{resource_prefix}/system-20.png"
alt=""/> Busiest Systems</h2>
 
           <div class="iblock">{systems}</div>

Modified: trunk/cumin/resources/app.css
===================================================================
--- trunk/cumin/resources/app.css	2011-06-24 12:42:17 UTC (rev 4851)
+++ trunk/cumin/resources/app.css	2011-06-24 13:58:48 UTC (rev 4852)
@@ -496,8 +496,8 @@
     top: 0px;
     z-index: 201;
 }
-
-p.fullpageIcon {
+p.fullpageIcon,
+p.fullpageIconOldLocation {
     background-color: white;
     border-top: 2px solid #685B8A;
     border-left: 1px solid  #685B8A;
@@ -515,14 +515,22 @@
     right: 60px;
     display: none;
 }
+p.fullpageIconOldLocation {
+    top: -2px;
+    right: 14px;
+}
 div.fullpageable:hover div.fullpageTitle, 
 div.fullpageable:hover p.fullpageIcon,
 div.fullpaged div.fullpageTitle, 
-div.fullpaged p.fullpageIcon {
+div.fullpaged p.fullpageIcon,
+div.fullpaged p.fullpageIconOldLocation,
+div.fullpageable:hover p.fullpageIconOldLocation
+ {
     display: block;
 }
 
-div.fullpaged p.fullpageIcon {
+div.fullpaged p.fullpageIcon,
+div.fullpaged p.fullpageIconOldLocation {
     border-top: 1px solid #cbb4ff;
     border-left: 1px solid  #cbb4ff;
     border-bottom: 2px solid  #685B8A;

Modified: trunk/cumin/resources/app.js
===================================================================
--- trunk/cumin/resources/app.js	2011-06-24 12:42:17 UTC (rev 4851)
+++ trunk/cumin/resources/app.js	2011-06-24 13:58:48 UTC (rev 4852)
@@ -236,7 +236,12 @@
             if (element.getParent().getElement(".fullpageIcon"))
                 return; // already fullpaged
 
-            var icon = new Element('p', {'class': 'fullpageIcon',

+            var fpIconClass = 'fullpageIcon';
+            if (element.get('class').indexOf("oldfpiconlocation") !=
-1) {
+            	fpIconClass = 'fullpageIconOldLocation';
+            }
+            
+            var icon = new Element('p', {'class': fpIconClass, 
                  'title': 'Full Page', 
                  'events': {'click': function () {fullpage(this)}}});