[Erp5-report] r18959 - in /erp5admin/trunk/content/erp5admin: erp5admin.xul erp5admin_async.js

[nobody at svn.erp5.org]

Author: bartek
Date: Fri Feb  1 00:33:00 2008
New Revision: 18959

URL: http://svn.erp5.org?rev=18959&view=rev
Log:
the security tab now can optionally stay in one place and monitor security for the sameobject, or follow you when you browse the site showing security for current context

Modified:
    erp5admin/trunk/content/erp5admin/erp5admin.xul
    erp5admin/trunk/content/erp5admin/erp5admin_async.js

Modified: erp5admin/trunk/content/erp5admin/erp5admin.xul
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin.xul?rev=18959&r1=18958&r2=18959&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin.xul (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin.xul Fri Feb  1 00:33:00 2008
@@ -117,6 +117,9 @@
 
     <window id="main-window" context="dashboardPopup">
         <vbox id="erp5admin-dashboard" class="chromeclass-extrachrome" hidden="true" persist="height,width">
+            <checkbox label="Stay here (monitor security for this object)" oncommand="erp5admin_toggleStayHere(this)" id="erp5admin-stayhere" checked="true"/>
+            <vbox id="erp5admin-dashboard-browse">
+            </vbox>
         </vbox>
         <splitter id="erp5admin-dashboard-splitter" class="chromeclass-extrachrome" hidden="true"/>
     </window>

Modified: erp5admin/trunk/content/erp5admin/erp5admin_async.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin_async.js?rev=18959&r1=18958&r2=18959&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin_async.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin_async.js Fri Feb  1 00:33:00 2008
@@ -177,16 +177,28 @@
 function erp5admin_openInDashboard(title, url)
 {
     dashboard = document.getElementById("erp5admin-dashboard")
-    if(dashboard.childNodes.length == 0){
+    dashboard_browse = document.getElementById("erp5admin-dashboard-browse")
+    if(dashboard_browse.childNodes.length == 0){
         var browser   = document.createElement("browser");
         browser.setAttribute("flex", "1");
-        dashboard.appendChild(browser);
+        dashboard_browse.appendChild(browser);
     }else{
-        browser = dashboard.childNodes[0]
-    }
-    browser.setAttribute("src", url);
+        browser = dashboard_browse.childNodes[0]
+    }
     try {
-        browser.reload();
+        if(dashboard.hidden){
+            browser.setAttribute("src", url);
+            browser.reload()
+        }else{
+            if(dashboard.stayhere == true){
+                browser.reload();
+            }else{
+                browser.loadURI(url); 
+            }
+        }
+        // or
+        // browser.setAttribute("src", url);
+        // browser.reload()
     }catch(e){
         // pass
     }
@@ -211,3 +223,15 @@
     dashboard.width = 0;
     document.getElementById("erp5admin-dashboard-splitter").hidden = true;
 }
+
+function erp5admin_toggleStayHere(checkbox){
+    dashboard.stayhere = checkbox.checked;
+    if(!checkbox.checked){
+        checkbox.label = "   ATTENTION: if you uncheck this and go to a script's management tab it may be executed!!!";
+        window.setTimeout(erp5admin_clearStayhereWarning, 3000);
+    }
+}
+
+function erp5admin_clearStayhereWarning(){
+    document.getElementById("erp5admin-stayhere").label = "Stay here (monitor security for this object)";
+}