[rhmessaging-commits] rhmessaging commits: r3367 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2009-05-08 09:26:35 -0400 (Fri, 08 May 2009)
New Revision: 3367

Modified:
   mgmt/trunk/cumin/python/cumin/visualizations.py
   mgmt/trunk/cumin/python/cumin/visualizations.strings
Log:
Removed the Please wait popup dialog since displaying the job page will happen immediately and show it's own Please wait animation.

Modified: mgmt/trunk/cumin/python/cumin/visualizations.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/visualizations.py	2009-05-08 12:29:50 UTC (rev 3366)
+++ mgmt/trunk/cumin/python/cumin/visualizations.py	2009-05-08 13:26:35 UTC (rev 3367)
@@ -24,9 +24,6 @@
         self.slot_legend = self.SlotLegend(app, "slot_legend")
         self.add_child(self.slot_legend)
 
-        self.wait = self.PleaseWait(app, "please_wait")
-        self.add_child(self.wait)
-
     def get_args(self, session):
         return self.frame.get_args(session)
 
@@ -57,27 +54,6 @@
     def render_slot_clip_size(self, session, *args):
         return 400
 
-    class PleaseWait(CuminForm):
-        def __init__(self, app, name):
-            super(SlotMap.PleaseWait, self).__init__(app, name)
-
-            self.__cancel = self.Cancel(app, "cancel")
-            self.__cancel.set_tab_index(201)
-            self.add_child(self.__cancel)
-
-        def get_modal(self, session):
-            return False
-
-        class Cancel(FormButton):
-            def render_class(self, session, *args):
-                return "cancel"
-
-            def render_content(self, session, *args):
-                return "Cancel"
-
-            def render_onclick(self, session, *args):
-                return "cancel_wait"
-
     class SlotLegend(Widget):
         def __init__(self, app, name):
             super(SlotMap.SlotLegend, self).__init__(app, name)

Modified: mgmt/trunk/cumin/python/cumin/visualizations.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/visualizations.strings	2009-05-08 12:29:50 UTC (rev 3366)
+++ mgmt/trunk/cumin/python/cumin/visualizations.strings	2009-05-08 13:26:35 UTC (rev 3367)
@@ -693,7 +693,6 @@
             function go_to_job(jid) {
                 var url = show_slot_job_url.replace("XXX", jid+"");
                 window.location.href = url;
-                show_wait();
             }
         }
     }
@@ -1017,7 +1016,6 @@
   {slot_legend}
 </div>
 {slot_info}
-{please_wait}
 <script type="text/javascript">
     var slot_current_id = "{id}";
     var show_slot_job_url = "{slot_job_url}";
@@ -1040,100 +1038,6 @@
     }
 </script>
 
-[PleaseWait.javascript]
-function cancel_wait() {
-    var oGlass = document.getElementById("modal_glass");
-    var oWait = document.getElementById("please_wait");
-    if (oGlass && oGlass) {
-        oGlass.style.display = "none";
-        oWait.style.display = "none";
-    }
-    window.location.href = window.location.href;
-    return false;
-}
-
-function show_wait() {
-    var oGlass = document.getElementById("modal_glass");
-    var oWait = document.getElementById("please_wait");
-
-    if (oWait && oGlass) {
-        oGlass.style.width = document.body.offsetWidth + "px";
-        oGlass.style.height = document.body.offsetHeight + "px";
-        oGlass.style.display = "block";
-        oWait.style.visibility = "hidden";
-        oWait.style.display = "block";
-
-        document.body.appendChild(oGlass); // so it covers the entire page
-        document.body.appendChild(oWait);  // so it can be centered on the page
-
-        var cp = get_center_point();
-        oWait.style.left = (cp.x - (oWait.offsetWidth / 2)) + "px";
-        oWait.style.top = (cp.y - (oWait.offsetHeight / 2)) + "px";
-        oWait.style.visibility = "visible";
-    }
-}
-
-function get_center_point() {
-    var x = 0;
-    var y = 0;
-
-    var scrollx = (document.documentElement.scrollLeft) ? document.documentElement.scrollLeft : document.body.scrollLeft;
-    var scrolly = (document.documentElement.scrollTop) ? document.documentElement.scrollTop : document.body.scrollTop;
-
-    var width = document.body.offsetWidth;
-    var height = document.body.offsetHeight;
-
-    return { x: (width + scrollx) / 2, y: (height + scrolly) / 2 };
-}
-
-
-[PleaseWait.css]
-div#modal_glass {
-    background-color: black;
-    opacity: .2;
-    -moz-opacity:.2;
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    left: 0;
-    top: 0;
-    display: none;
-    z-index: 200;
-}
-
-div#please_wait {
-    position: absolute;
-    display: none;
-    z-index: 201;
-    left: 100px;
-    top: 100px;
-}
-
-div#please_wait form.mform {
-    width: 20em;
-}
-
-div#please_wait form.mform div.body, div#please_wait form.mform div.foot {
-    text-align: center;
-}
-
-[PleaseWait.html]
-<div id="modal_glass" onclick="cancel_wait()"><!-- --></div>
-<div id="please_wait">
-  <form class="mform">
-    <div class="head">
-      <h1>Loading Job</h1>
-    </div>
-    <div class="body">
-      Loading Job. Please wait...
-    </div>
-    <div class="foot">
-      {cancel}
-    </div>
-  </form>
-</div>
-
-
 [SlotInfo.css]
 div.slot_info {
     position: absolute;