Changeset 6259

Timestamp:

Mar 25, 2013, 1:58:50 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #1729 and #1730. Fixed for the extension manager except the frame with the tree outline.

Location:

trunk/www/admin/extensions

Files:

• details.js (added)
• details.jsp (modified) (12 diffs)
• scan_results.js (added)
• scan_results.jsp (modified) (3 diffs)
• wizard.js (added)
• wizard.jsp (modified) (4 diffs)

trunk/www/admin/extensions/details.jsp

@@ -125 +125 @@
 %>
 <base:page title="" type="iframe">
-  <base:head scripts="newjoust.js,table.js,dragdrop.js" styles="newjoust.css,table.css,toolbar.css">
-  <script>
-
-  function enableExtension(enable)
-  {
-    var iconName = enable ? 'Extension' : 'ExtensionDisabled';
-    window.parent.frames['tree'].setIcon('<%=extensionId%>', iconName);
-    var url = 'index.jsp?ID=<%=ID%>&cmd=EnableExtension';
-    url += '&extensionId=<%=extensionId%>';
-    url += '&enable='+enable;
-    location.href = url;
-  }
-
-  function enableExtensionPoint(enable)
-  {
-    var iconName = enable ? 'ExtensionPoint' : 'ExtensionPointDisabled';
-    window.parent.frames['tree'].setIcon('<%=extensionPointId%>', iconName);
-    var url = 'index.jsp?ID=<%=ID%>&cmd=EnableExtensionPoint';
-    url += '&extensionPointId=<%=extensionPointId%>';
-    url += '&enable='+enable;
-    location.href = url;
-  }
-  
-  function enableFile(enable)
-  {
-    window.parent.frames['tree'].setChildIcons('<%=HTML.javaScriptEncode(file != null ? file.getName() : "")%>', enable);
-    var url = 'index.jsp?ID=<%=ID%>&cmd=EnableFile';
-    url += '&fileuri=<%=HTML.urlEncode(fileuri)%>';
-    url += '&enable='+enable;
-    location.href = url;
-  }
-  
-  function showFile(fileuri)
-  {
-    window.parent.frames['tree'].selectFile(fileuri);
-  }
-
-  function editPlugin(pluginId)
-  {
-    Main.viewOrEditItem('<%=ID%>', 'PLUGINDEFINITION', pluginId, true);
-  }
-  
-  function manualScan()
-  {
-    Main.openPopup('index.jsp?ID=<%=ID%>&cmd=ManualScan', 'ManualScan', 750, 500);
-  }
-  
-  function scanResults()
-  {
-    Main.openPopup('index.jsp?ID=<%=ID%>&cmd=ScanResults', 'ScanResults', 600, 400);
-  }
-
-  function toggleStacktrace(evt, id)
-  {
-    Main.showHide('stacktrace.' + id);
-  }
-  
-  </script>
-  </base:head>
-    <base:body>
+  <base:head scripts="newjoust.js,table.js,dragdrop.js,~details.js" styles="newjoust.css,table.css,toolbar.css" />
+  <base:body>
 
     <div class="absolutefull auto-init" data-auto-init="drag-support">
 
     <tbl:toolbar subclass="bottomborder">
+    <tbl:button
+      id="btnInstall"
+      title="Install/uninstall&hellip;"
+      image="new_wizard.png"
+      tooltip="Install and uninstall extensions and plug-ins"
+      disabled="<%=!writePermission%>"
+    />
     <%
     if (ext != null)
@@ -197 +146 @@
       %>
       <tbl:button 
-        onclick="<%="enableExtension(" + (isEnabled ? "0" : "1") + ")"%>" 
+        id="btnToggleExtension"
+        data-extension-id="<%=extensionId%>"
+        data-is-enabled="<%=isEnabled ? "1" : "0"%>"
         title="<%=isEnabled ? "Disable" : "Enable" %>" 
         image="<%=allow ? "joust/extension.png" : "joust/extensiondisabled.png" %>"
-        tooltip="Disable this extension"
+        tooltip="Disable/enable this extension"
         disabled="<%=!allow%>"
       />
       <tbl:button
         image="help.png"
-        onclick="<%="Main.openHelp('" + ID +"', 'extensions.details.extension')"%>"
+        subclass="auto-init"
+        data-auto-init="help"
+        data-help-id="extensions.details.extension"
         title="Help&hellip;"
         tooltip="Get help about this page"
@@ -218 +171 @@
       %>
       <tbl:button 
-        onclick="<%="enableExtensionPoint(" + (isEnabled ? "0" : "1") + ")"%>" 
+        id="btnToggleExtensionPoint"
+        data-extension-point-id="<%=extensionPointId%>"
+        data-is-enabled="<%=isEnabled ? "1" : "0"%>"
         title="<%=isEnabled ? "Disable" : "Enable" %>" 
         image="<%=allow ? "joust/extensionpoint.png" : "joust/extensionpointdisabled.png" %>"
@@ -226 +181 @@
       <tbl:button
         image="help.png"
-        onclick="<%="Main.openHelp('" + ID +"', 'extensions.details.extensionspoint')"%>"
+        subclass="auto-init"
+        data-auto-init="help"
+        data-help-id="extensions.details.extensionspoint"
         title="Help&hellip;"
         tooltip="Get help about this page"
@@ -237 +194 @@
       boolean allow = writePermission && !hasRegistrationError;
       %>
-      <tbl:button 
-        onclick="enableFile(1)" 
+      <tbl:button
+        id="btnEnableFile" 
+        data-file-name="<%=HTML.encodeTags(file.getName())%>"
+        data-file-uri="<%=HTML.encodeTags(fileuri)%>"
+        data-enable="1"
         title="Enable all" 
         image="<%=allow ? "joust/extension.png" : "joust/extensiondisabled.png" %>"
@@ -245 +205 @@
       />
       <tbl:button 
-        onclick="enableFile(0)" 
+        id="btnDisableFile" 
+        data-file-name="<%=HTML.encodeTags(file.getName())%>"
+        data-file-uri="<%=HTML.encodeTags(fileuri)%>"
+        data-enable="0"
         title="Disable all" 
         image="<%=allow ? "joust/extension.png" : "joust/extensiondisabled.png" %>"
@@ -257 +220 @@
       %>
       <tbl:button
-        onclick="manualScan()"
-        title="Install/uninstall&hellip;"
-        image="new_wizard.png"
-        tooltip="Install and uninstall extensions and plug-ins"
-        disabled="<%=!writePermission%>"
-      />
-      <tbl:button
         image="help.png"
-        onclick="<%="Main.openHelp('" + ID +"', 'extensions.details.main')"%>"
+        subclass="auto-init"
+        data-auto-init="help"
+        data-help-id="extensions.details.main"
         title="Help&hellip;"
         tooltip="Get help about this page"
@@ -292 +250 @@
             <td>
             <div class="messagecontainer error">
-              <base:icon image="error.png" 
-                onclick="<%="toggleStacktrace(event, '" + ext.getId() + "')"%>" 
-                style="float: left;"
+              <base:icon image="error.png"
+                subclass="auto-init link"
+                data-auto-init="toggle-stacktrace"
+                data-stacktrace-id="<%="stacktrace." + ext.getId()%>"
+                style="float: left; margin-right: 5px;"
                 tooltip="Error - click to show full stack trace"
               /><%=error.getMessage() %>
@@ -318 +278 @@
           <th>File</th>
           <td>
-            <a href="javascript:showFile('<%=HTML.javaScriptEncode(extFile.getName())%>')"
+            <a class="auto-init" data-auto-init="show-file" data-file-uri="<%=HTML.encodeTags(extFile.getName()) %>"
             ><%=extFile.getName()%></a> 
             (<%=extFile.checkModified() ? "Modified" : "Up to date" %>;
@@ -383 +343 @@
             <div class="messagecontainer error">
               <base:icon image="error.png" 
-                onclick="<%="toggleStacktrace(event, '" + ep.getId() + "')"%>" 
-                style="float: left;"
+                subclass="auto-init link"
+                data-auto-init="toggle-stacktrace"
+                data-stacktrace-id="<%="stacktrace." + ep.getId()%>"
+                style="float: left; margin-right: 5px;"
                 tooltip="Error - click to show full stack trace"
               /><%=error.getMessage() %>
@@ -412 +374 @@
             {
               %>
-              <a href="javascript:showFile('<%=HTML.javaScriptEncode(epFile.getName())%>')"
+              <a class="auto-init" data-auto-init="show-file" data-file-uri="<%=HTML.encodeTags(epFile.getName()) %>"
               ><%=epFile.getName()%></a> 
               (<%=epFile.checkModified() ? "Modified" : "Up to date" %>;
@@ -555 +517 @@
           <td>
             <table><tr><td>
-            <base:button image="bullet.png" 
-              onclick="scanResults()" 
+            <base:button 
+              id="btnScanResults"
+              image="bullet.png" 
               title="More details&hellip;"
               tooltip="Display detailed information about the last scan"

trunk/www/admin/extensions/scan_results.jsp

@@ -59 +59 @@
 %>
   <base:page type="popup" title="Last installation results">
-  <base:head>
-  <script>
-  function showDetails(detailsId)
-  {
-    Main.showHide('details.' + detailsId);
-    var icon = document.getElementById('icon.'+detailsId).firstChild;
-    if (icon)
-    {
-      if (icon.src.indexOf('right') > 0)
-      {
-        icon.src = icon.src.replace('right', 'down');
-      }
-      else
-      {
-        icon.src = icon.src.replace('down', 'right');
-      } 
-    }
-  }
-  </script>
-  </base:head>
+  <base:head scripts="~scan_results.js" />
   <base:body>
   <h1>Last installation results</h1>
@@ -115 +96 @@
         <base:icon 
           id="<%="icon." + detailsId %>" 
+          subclass="auto-init"
+          data-auto-init="details"
+          data-details-id="<%=detailsId%>"
           image="move_right.png" 
-          onclick="<%="showDetails('" + detailsId + "')" %>" 
           visible="<%=hasMessages%>"
         />
@@ -157 +140 @@
   
   <base:buttongroup subclass="dialogbuttons">
-    <base:button onclick="window.close();" title="Close" />
+    <base:button id="close" title="Close" />
   </base:buttongroup>
 

trunk/www/admin/extensions/wizard.jsp

@@ -59 +59 @@
   %>
   <base:page type="popup" title="Extensions and plug-ins installation wizard">
-  <base:head scripts="table.js" styles="table.css">
-    <script>
-    
-    // Submit the form
-    function startManualScan()
-    {
-      var frm = document.forms['scan'];
-      frm.cmd.value = 'DoManualScan';
-      frm.submit();
-    }
-    
-    function installOnClick(name)
-    {
-      var frm = document.forms['scan'];
-      if (frm[name+'.install'].checked)
-      {
-        if (frm[name+'.uninstall']) frm[name+'.uninstall'].checked = false;
-      }
-    }
-
-    function uninstallOnClick(name)
-    {
-      var frm = document.forms['scan'];
-      if (frm[name+'.uninstall'].checked)
-      {
-        if (frm[name+'.install']) frm[name+'.install'].checked = false;
-      }
-    }
-    </script>
-  </base:head>
+  <base:head scripts="table.js,~wizard.js" styles="table.css" />
   <base:body>
   <h1>Extensions and plug-ins installation wizard <base:help helpid="extensions.install-wizard" /></h1>
-  
-  
   <div class="content">
   <tbl:table id="scan" subclass="fulltable" action="index.jsp" >
@@ -166 +135 @@
             {
               %>
-              <input type="checkbox" name="<%=name%>.install" value="1" <%=checkInstall ? "checked" : "" %>
-                onclick="installOnClick('<%=name%>')">
+              <input type="checkbox" class="auto-init" data-auto-init="install" 
+                name="<%=name%>.install" value="1" <%=checkInstall ? "checked" : "" %>
+                >
               <%
             }
@@ -177 +147 @@
             {
               %>
-              <input type="checkbox" name="<%=name%>.uninstall" value="1" <%=checkUninstall ? "checked" : "" %>
-                onclick="uninstallOnClick('<%=name%>')">
+              <input type="checkbox" class="auto-init" data-auto-init="uninstall"
+                name="<%=name%>.uninstall" value="1" <%=checkUninstall ? "checked" : "" %>
+                >
               <%
             }
@@ -214 +185 @@
 
   <base:buttongroup subclass="dialogbuttons">
-    <base:button onclick="startManualScan();" title="Next" />
-    <base:button onclick="window.close();" title="Cancel" />
+    <base:button id="startScan" title="Next" />
+    <base:button id="close" title="Cancel" />
   </base:buttongroup>