Changeset 6311

Timestamp:

Aug 23, 2013, 2:52:14 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1729 and #1730. Most view and list pages in the 'View' menu and some other minor fixes in other places found during the week.

Location:

trunk/www

Files:

• admin/groups/view_group.jsp (modified) (1 diff)
• admin/platforms/variants/list_variants.jsp (modified) (1 diff)
• admin/pluginconfigurations/view_configuration.jsp (modified) (1 diff)
• admin/quantities/list_quantities.jsp (modified) (1 diff)
• biomaterials/events/list_events.jsp (modified) (2 diffs)
• lims/arraydesigns/features/list_features.jsp (modified) (2 diffs)
• my_base/projects/items/list_items.jsp (modified) (1 diff)
• my_base/projects/list_projects.jsp (modified) (1 diff)
• views/derivedbioassays/bioassays.js (added)
• views/derivedbioassays/list_bioassays.jsp (modified) (8 diffs)
• views/derivedbioassays/view_bioassay.jsp (modified) (15 diffs)
• views/experiments/edit_experiment.jsp (modified) (1 diff)
• views/formulas/formulas.js (added)
• views/formulas/list_formulas.jsp (modified) (6 diffs)
• views/formulas/view_formula.jsp (modified) (10 diffs)
• views/items/items.js (added)
• views/items/list_items.jsp (modified) (5 diffs)
• views/jobs/list_jobs.jsp (modified) (6 diffs)
• views/jobs/view_job.jsp (modified) (7 diffs)
• views/permissiontemplates/edit_template.jsp (modified) (3 diffs)
• views/permissiontemplates/list_templates.jsp (modified) (7 diffs)
• views/permissiontemplates/templates.js (added)
• views/permissiontemplates/view_template.jsp (modified) (9 diffs)
• views/physicalbioassays/bioassays.js (added)
• views/physicalbioassays/list_bioassays.jsp (modified) (9 diffs)
• views/physicalbioassays/view_bioassay.jsp (modified) (13 diffs)
• views/rawbioassays/bioassays.js (added)
• views/rawbioassays/index.jsp (modified) (1 diff)
• views/rawbioassays/list_rawbioassays.jsp (modified) (7 diffs)
• views/rawbioassays/rawdata/list_rawdata.jsp (modified) (8 diffs)
• views/rawbioassays/rawdata/rawdata.js (added)
• views/rawbioassays/rawdata/view_rawdata.jsp (modified) (2 diffs)
• views/rawbioassays/view_rawbioassay.jsp (modified) (13 diffs)
• views/reporterlists/list_reporterlists.jsp (modified) (6 diffs)
• views/reporterlists/reporterlists.js (added)
• views/reporterlists/reporters/add_reporters_frameset.jsp (modified) (2 diffs)
• views/reporterlists/reporters/list_reporters.jsp (modified) (7 diffs)
• views/reporterlists/reporters/reporters.js (added)
• views/reporterlists/view_reporterlist.jsp (modified) (9 diffs)
• views/reporters/list_reporters.jsp (modified) (7 diffs)
• views/reporters/reporters.js (added)
• views/reporters/view_reporter.jsp (modified) (6 diffs)
• views/sessions/list_sessions.jsp (modified) (5 diffs)
• views/sessions/sessions.js (added)
• views/sessions/view_session.jsp (modified) (2 diffs)
• views/trashcan/index.jsp (modified) (1 diff)
• views/trashcan/list_trash.jsp (modified) (6 diffs)
• views/trashcan/trash.js (added)
• views/trashcan/view_item.jsp (modified) (8 diffs)

trunk/www/admin/groups/view_group.jsp

@@ -121 +121 @@
             id="btnUsingItems"
             image="used.png" 
-            onclick="showUsingItems()"
             tooltip="This item is used by other items and can't be permanently deleted. Show the items that are using this one"
             visible="<%=isRemoved && isUsed%>" />

trunk/www/admin/platforms/variants/list_variants.jsp

@@ -436 +436 @@
     </tbl:table>
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     </t:tab>

trunk/www/admin/pluginconfigurations/view_configuration.jsp

@@ -159 +159 @@
             id="btnUsingItems"
             image="used.png" 
-            onclick="showUsingItems()"
             tooltip="This item is used by other items and can't be permanently deleted. Show the items that are using this one"
             visible="<%=isRemoved && isUsed%>" />

trunk/www/admin/quantities/list_quantities.jsp

@@ -444 +444 @@
                   }
                   %>
-                  <base:icon
-                    image="add.png" 
-                    onclick="<%="newUnit("+itemId+")"%>" 
-                    tooltip="Create new unit" 
-                    visible="<%=mode.hasEditLink() && createUnitPermission && usePermission %>"
-                  />
                 </tbl:cell>
                 <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>

trunk/www/biomaterials/events/list_events.jsp

@@ -524 +524 @@
                       {
                         %>
-                        <span class="link" 
-                          onclick="Main.itemOnClick(event, '<%=ID%>', 'BIOPLATEEVENT', <%=event.getId()%>, <%=editLink%>, '<%=extraUrl%>')"
+                        <span class="link auto-init"
+                          data-auto-init="item-link" 
+                          data-item-type="BIOPLATEEVENT"
+                          data-item-id="<%=event.getId()%>"
+                          data-no-edit="<%=editLink ? 0 : 1 %>"
+                          data-extra-url="<%=extraUrl %>"
                           title="View this bioplate event <%=editLink? "(use CTRL, ALT or SHIFT to edit)" : ""%>"
                         >
@@ -592 +596 @@
     </tbl:table>
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     </t:tab>

trunk/www/lims/arraydesigns/features/list_features.jsp

@@ -477 +477 @@
             id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns…" 
             tooltip="Show, hide and re-order columns" 
@@ -753 +752 @@
 
     <base:buttongroup>
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
   

trunk/www/my_base/projects/items/list_items.jsp

@@ -287 +287 @@
             %>
             <tbl:panel clazz="messagepanel">
-              <div class="messagecontainer error" onclick="setToActive()" style="cursor: pointer;"
+              <div class="messagecontainer error" style="cursor: pointer;"
                 title="Click to make this project the active project">
               This project is not the active project. The list can't display items 

trunk/www/my_base/projects/list_projects.jsp

@@ -227 +227 @@
             id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns…" 
             tooltip="Show, hide and re-order columns" 

trunk/www/views/derivedbioassays/list_bioassays.jsp

@@ -140 +140 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title==null ? "Derived bioassays" : title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="<%=title==null ? "Derived bioassays" : title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,~bioassays.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'bioassays';
-    function newItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', 0, true);
-    }
-    function editItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, true);
-    }
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      Table.itemOnClick(formId, evt, itemId, '<%=mode.getName()%>', viewItem, editItem, returnSelected);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function setOwner()
-    {
-      Table.setOwnerOfItems(formId);
-    }
-    function shareItems()
-    {
-      Table.shareItems(formId);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    function newChildBioAssay(parentId)
-    {
-      Main.viewOrEditItem('<%=ID%>', 'DERIVEDBIOASSAY', 0, true, '&parent_id='+parentId);
-    }
-    function newRawBioAssay(parentId)
-    {
-      Main.viewOrEditItem('<%=ID%>', 'RAWBIOASSAY', 0, true, '&bioassay_id='+parentId);
-    }
-    function newMergedChild()
-    {
-      var frm = document.forms[formId];
-      Table.poolItems(submitPage, '<%=ID%>', formId, '<%=itemType.name()%>', 'NewMergedDerivedBioAssay');
-    }
-    </script>
   </base:head>
   
@@ -438 +360 @@
           >
           <tbl:button 
+            id="btnNewItem"
             disabled="<%=!createPermission%>" 
             image="new.png" 
-            onclick="newItem()" 
             title="New&hellip;" 
             tooltip="<%=createPermission ? "Create new derived bioassay" : "You do not have permission to create derived bioassays"%>" 
           />
           <tbl:button 
+            id="btnNewMergedDerivedBioAssay"
             disabled="<%=!createPermission%>" 
             image="new_pooled.png" 
-            onclick="newMergedChild()" 
             title="Merge&hellip;" 
             tooltip="<%=createPermission ? "Create new merged bioassay" : "You do not have permission to create derived bioassay"%>" 
           />
           <tbl:button 
+            id="btnDeleteItems"
             image="delete.png"
-            onclick="deleteItems()" 
             title="Delete" 
             tooltip="Delete the selected items" 
           />
           <tbl:button 
+            id="btnRestoreItems"
             image="restore.png"
-            onclick="restoreItems()" 
             title="Restore" 
             tooltip="Restore the selected (deleted) items"
           />
           <tbl:button 
+            id="btnShareItems"
             image="share.png"
-            onclick="shareItems()" 
             title="Share&hellip;" 
             tooltip="Share the selected items"
           />
           <tbl:button 
+            id="btnSetOwner"
             image="take_ownership.png"
-            onclick="setOwner()" 
             title="Set owner&hellip;"
             tooltip="Change owner of the selected items"
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button 
+            id="btnImport"
+            data-plugin-type="IMPORT"
             image="import.png" 
-            onclick="runPlugin('ImportItems')" 
             title="Import&hellip;" 
             tooltip="Import data" 
@@ -489 +412 @@
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -496 +420 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -616 +541 @@
                     visible="<%=item.isShared()%>"
                   />&nbsp;</tbl:header>
-                <tbl:cell column="name"><div class="link" 
-                  onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)" 
+                <tbl:cell column="name"><div 
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="<%=writePermission ? 0 : 1 %>" 
+                  tabindex="0"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -654 +582 @@
                   %>              
                   <base:icon
+                    subclass="link auto-init"
+                    data-auto-init="new-child-bioassay"
+                    data-item-id="<%=itemId %>"
                     image="add.png" 
-                    onclick="<%="newChildBioAssay("+itemId+")"%>" 
                     tooltip="Create new child bioassay" 
                     visible="<%=mode.hasEditLink() && createPermission && usePermission %>"
@@ -688 +618 @@
                   %>              
                   <base:icon
+                    subclass="link auto-init"
+                    data-auto-init="new-raw-bioassay"
+                    data-item-id="<%=itemId %>"
                     image="add.png" 
-                    onclick="<%="newRawBioAssay("+itemId+")"%>" 
                     tooltip="Create new raw bioassay" 
                     visible="<%=mode.hasEditLink() && createRawBioAssayPermission && usePermission %>"
@@ -863 +795 @@
     
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     

trunk/www/views/derivedbioassays/view_bioassay.jsp

@@ -146 +146 @@
   ExtensionsInvoker toolbarInvoker = ToolbarUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title%>">
-  <base:head scripts="table.js,tabcontrol.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
+  <base:page title="<%=title%>" id="view-page">
+  <base:head scripts="table.js,tabcontrol-2.js,~bioassays.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    function editItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, true);
-    }
-    function deleteItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=DeleteItem&item_id=<%=itemId%>');
-    }
-    function restoreItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_id=<%=itemId%>');
-    }
-    function shareItem()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=ShareItem&item_id=<%=itemId%>', 'ShareBioAssay', 600, 400);
-    }
-    function setOwner()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=SetOwnerOfItem&item_id=<%=itemId%>', 'SetOwnerOfItem', 450, 300);
-    }
-    function runItemPlugin(cmd)
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 750, 500);
-    }
-    function newChildBioAssay()
-    {
-      Main.viewOrEditItem('<%=ID%>', 'DERIVEDBIOASSAY', 0, true, '&parent_id=<%=itemId%>');
-    }
-    function newRawBioAssay()
-    {
-      Main.viewOrEditItem('<%=ID%>', 'RAWBIOASSAY', 0, true, '&bioassay_id=<%=itemId%>');
-    }
-    </script>
   </base:head>
   <base:body>
@@ -190 +156 @@
       /><p:pathelement title="<%=HTML.encodeTags(bioAssay.getName())%>" 
       /></p:path>
+    <div id="page-data" data-item-id="<%=itemId%>"></div>
     
     <t:tabcontrol 
@@ -206 +173 @@
           />
           <base:icon 
+            id="btnDeletePermanently"
             image="deleted.png"
-            onclick="deleteItemPermanently()"
             tooltip="This item has been flagged for deletion. Click to delete it now."
             enabled="<%=deletePermanentlyPermission %>"
             visible="<%=isRemoved%>" 
           />
-          <base:icon image="used.png" 
-            onclick="showUsingItems()"
+          <base:icon 
+            id="btnUsingItems"
+            image="used.png"
             tooltip="This item is used by other items and can't be permanently deleted. Show the items that are using this one"
             visible="<%=isRemoved && isUsed%>" />
@@ -220 +188 @@
           <tbl:toolbar subclass="bottomborder">
             <tbl:button 
+              id="btnEdit"
               disabled="<%=!writePermission%>" 
               image="edit.png" 
-              onclick="editItem()" 
               title="Edit&hellip;" 
               tooltip="<%=writePermission ? "Edit this bioassay" : "You do not have permission to edit this bioassay"%>" 
             />
             <tbl:button 
+              id="btnDelete"
               disabled="<%=!deletePermission%>" 
               image="delete.png" 
-              onclick="deleteItem()" 
               title="Delete"
               visible="<%=!bioAssay.isRemoved()%>"
@@ -235 +203 @@
             />
             <tbl:button 
+              id="btnRestore"
               disabled="<%=!writePermission%>" 
               image="restore.png" 
-              onclick="restoreItem()" 
               title="Restore"
               visible="<%=bioAssay.isRemoved()%>"
@@ -243 +211 @@
             />
             <tbl:button 
+              id="btnShare"
               disabled="<%=!sharePermission%>"
               image="share.png"
-              onclick="shareItem()" 
               title="Share&hellip;" 
               tooltip="<%=sharePermission ? "Share this bioassay to other user, groups and projects" : "You do not have permission to share this bioassay"%>"
             />
             <tbl:button 
+              id="btnSetOwner"
               disabled="<%=!setOwnerPermission%>"
               image="take_ownership.png"
-              onclick="setOwner()" 
               title="Set owner&hellip;"
               tooltip="<%=setOwnerPermission ? "Change owner of this item" : "You do not have permission to change ownership of this item"%>"
             />
             <tbl:button
+              id="btnNewChildBioAssay"
               image="add.png"
-              onclick="newChildBioAssay()"
               title="New child bioassay&hellip;"
               tooltip="Create a child bioassay from this bioassay"
@@ -264 +232 @@
             />
             <tbl:button
+              id="btnNewRawBioAssay"
               image="add.png"
-              onclick="newRawBioAssay()"
               title="New raw bioassay&hellip;"
               tooltip="Create a raw bioassay from this bioassay"
@@ -271 +239 @@
             />
             <tbl:button 
+              id="btnImport"
               image="import.png" 
-              onclick="runItemPlugin('ImportItem')" 
+              data-plugin-type="IMPORT"  
               title="Import&hellip;" 
               tooltip="Import data" 
@@ -278 +247 @@
             />
             <tbl:button 
-              image="export.png" 
-              onclick="runItemPlugin('ExportItem')" 
+              id="btnExport"
+              image="export.png"
+              data-plugin-type="EXPORT" 
               title="Export&hellip;" 
               tooltip="Export data" 
@@ -285 +255 @@
             />
             <tbl:button 
-              image="runplugin.png" 
-              onclick="runItemPlugin('RunPlugin')"
+              id="btnRunPlugin"
+              image="runplugin.png"  
+              data-plugin-type="OTHER" 
               title="Run plugin&hellip;" 
               tooltip="Run a plugin" 
@@ -292 +263 @@
             />
             <tbl:button 
-              image="runplugin.png" 
-              onclick="runItemPlugin('RunAnalysisPlugin')"
+              id="btnRunAnalysisPlugin"
+              image="runplugin.png"  
+              data-plugin-type="ANALYSIS" 
               title="Run analysis&hellip;" 
               tooltip="Run an analysis plugin with data from this bioassay"
@@ -302 +274 @@
             <tbl:button
               image="help.png"
-              onclick="<%="Main.openHelp('" + ID +"', 'derivedbioassay.view.properties')"%>"
+              subclass="auto-init"
+              data-auto-init="help"
+              data-help-id="derivedbioassay.view.properties"
               title="Help&hellip;"
               tooltip="Get help about this page"
@@ -757 +731 @@
       
       <t:tab id="annotations" title="Annotations &amp; parameters" 
-        tooltip="View annotation values and protocol parameters" clazz="white"
-        activate="AnnotationsList.loadOnce()">
+        tooltip="View annotation values and protocol parameters" clazz="white">
         <jsp:include page="../../common/annotations/list_frameset.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />
@@ -767 +740 @@
       
       <t:tab id="overview" title="Overview" 
-        tooltip="Display a tree overview of related items"
-        activate="Overview.loadOnce()">
+        tooltip="Display a tree overview of related items">
         <jsp:include page="../../common/overview/overview.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />
@@ -777 +749 @@
       <t:tab id="history" title="Change history" 
         tooltip="Displays a log of all modifications made to this item"
-        visible="<%=ChangeHistoryUtil.showChangeHistoryTab(sc)%>"
-        activate="History.loadOnce()">
+        visible="<%=ChangeHistoryUtil.showChangeHistoryTab(sc)%>">
         <jsp:include page="../../common/history/frameset.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />

trunk/www/views/experiments/edit_experiment.jsp

@@ -110 +110 @@
     }
     cc.removeObject("item");
-    String[] selected = request.getParameterValues("rawbioassay_id");
-    if (selected != null)
+    if (Values.getBoolean(request.getParameter("rawbioassays")))
     {
       rbaQuery = RawBioAssay.getQuery();
       rbaQuery.restrict(Restrictions.in(Hql.property("id"), Expressions.parameter("selected")));
-      rbaQuery.setParameter("selected", Arrays.asList(Values.getInt(selected)), Type.INT);
-    }   
+      rbaQuery.setParameter("selected", sc.getCurrentContext(Item.RAWBIOASSAY).getSelected(), Type.INT);
+    }
+
   }
   else

trunk/www/views/formulas/list_formulas.jsp

@@ -136 +136 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title==null ? "Formulas" : title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="<%=title==null ? "Formulas" : title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,~formulas.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'formulas';
-    function newItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', 0, true);
-    }
-    function editItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, true);
-    }
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      Table.itemOnClick(formId, evt, itemId, '<%=mode.getName()%>', viewItem, editItem, returnSelected);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function setOwner()
-    {
-      Table.setOwnerOfItems(formId);
-    }
-    function shareItems()
-    {
-      Table.shareItems(formId);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    </script>
   </base:head>
   
@@ -432 +367 @@
           >
           <tbl:button 
+            id="btnNewItem"
             disabled="<%=!createPermission%>" 
             image="new.png" 
-            onclick="newItem()" 
             title="New&hellip;" 
             tooltip="<%=createPermission ? "Create new formula" : "You do not have permission to create formulas"%>" 
           />
           <tbl:button 
+            id="btnDeleteItems"
             image="delete.png"
-            onclick="deleteItems()" 
             title="Delete" 
             tooltip="Delete the selected items" 
           />
           <tbl:button 
+            id="btnRestoreItems"
             image="restore.png"
-            onclick="restoreItems()" 
             title="Restore" 
             tooltip="Restore the selected (deleted) items"
           />
           <tbl:button 
+            id="btnShareItems"
             image="share.png"
-            onclick="shareItems()" 
             title="Share&hellip;" 
             tooltip="Share the selected items"
           />
           <tbl:button 
+            id="btnSetOwner"
             image="take_ownership.png"
-            onclick="setOwner()" 
             title="Set owner&hellip;"
             tooltip="Change owner of the selected items"
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button 
+            id="btnImport"
+            data-plugin-type="IMPORT"
             image="import.png" 
-            onclick="runPlugin('ImportItems')" 
             title="Import&hellip;" 
             tooltip="Import data" 
@@ -476 +412 @@
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -483 +420 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -604 +542 @@
                     visible="<%=item.isShared()%>"
                   />&nbsp;</tbl:header>
-                <tbl:cell column="name"><div class="link" 
-                  onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)" 
+                <tbl:cell column="name"><div
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="<%=writePermission ? 0 : 1 %>" 
+                  tabindex="0"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -683 +624 @@
     
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     

trunk/www/views/formulas/view_formula.jsp

@@ -100 +100 @@
   ExtensionsInvoker invoker = ToolbarUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title%>">
-  <base:head scripts="table.js,tabcontrol.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
+  <base:page title="<%=title%>" id="view-page">
+  <base:head scripts="table.js,tabcontrol-2.js,~formulas.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    function editItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, true);
-    }
-    function shareItem()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=ShareItem&item_id=<%=itemId%>', 'ShareFormula', 600, 400);
-    }
-    function deleteItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=DeleteItem&item_id=<%=itemId%>');
-    }
-    function restoreItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_id=<%=itemId%>');
-    }
-    function deleteItemPermanently()
-    {
-      Main.deleteItemPermanently('<%=ID%>', true, '<%=itemType.name()%>', <%=itemId%>, '&callback=itemDeleted');
-    }
-    function itemDeleted()
-    {
-      Main.listItems('<%=ID%>', '<%=itemType.name()%>');
-    }
-    function showUsingItems()
-    {
-      Main.showUsingItems('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>);
-    }
-    function setOwner()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=SetOwnerOfItem&item_id=<%=itemId%>', 'SetOwnerOfItem', 450, 300);
-    }
-    function runPlugin(cmd)
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 750, 500);
-    }
-    </script>
   </base:head>
   <base:body>
@@ -148 +110 @@
       /><p:pathelement title="<%=HTML.encodeTags(formula.getName())%>"
       /></p:path>
+    <div id="page-data" data-item-id="<%=itemId%>"></div>
     
     <t:tabcontrol 
@@ -164 +127 @@
           />
           <base:icon 
+            id="btnDeletePermanently"
             image="deleted.png"
-            onclick="deleteItemPermanently()"
             tooltip="This item has been flagged for deletion. Click to delete it now."
             enabled="<%=deletePermanentlyPermission %>"
             visible="<%=isRemoved%>" 
           />
-          <base:icon image="used.png" 
-            onclick="showUsingItems()"
+          <base:icon
+            id="btnUsingItems"
+            image="used.png" 
             tooltip="This item is used by other items and can't be permanently deleted. Show the items that are using this one"
             visible="<%=isRemoved && isUsed%>" />
@@ -178 +142 @@
           <tbl:toolbar subclass="bottomborder">
             <tbl:button 
+              id="btnEdit"
               disabled="<%=!writePermission%>" 
               image="edit.png" 
-              onclick="editItem()" 
               title="Edit&hellip;" 
               tooltip="<%=writePermission ? "Edit this formula" : "You do not have permission to edit this formula"%>" 
             />
             <tbl:button 
+              id="btnDelete"
               disabled="<%=!deletePermission%>" 
               image="delete.png" 
-              onclick="deleteItem()" 
               title="Delete"
               visible="<%=!formula.isRemoved()%>"
@@ -193 +157 @@
             />
             <tbl:button 
+              id="btnRestore"
               disabled="<%=!writePermission%>" 
               image="restore.png" 
-              onclick="restoreItem()" 
               title="Restore"
               visible="<%=formula.isRemoved()%>"
@@ -201 +165 @@
             />
             <tbl:button 
+              id="btnShare"
               disabled="<%=!sharePermission%>"
               image="share.png"
-              onclick="shareItem()" 
               title="Share&hellip;" 
               tooltip="<%=sharePermission ? "Share this formula to other user, groups and projects" : "You do not have permission to share this formula"%>"
             />
             <tbl:button 
+              id="btnSetOwner"
               disabled="<%=!setOwnerPermission%>"
               image="take_ownership.png"
-              onclick="setOwner()" 
               title="Set owner&hellip;"
               tooltip="<%=setOwnerPermission ? "Change owner of this item" : "You do not have permission to change ownership of this item"%>"
             />
             <tbl:button 
+              id="btnImport"
               image="import.png" 
-              onclick="runPlugin('ImportItem')" 
+              data-plugin-type="IMPORT"  
               title="Import&hellip;" 
               tooltip="Import data" 
@@ -222 +187 @@
             />
             <tbl:button 
-              image="export.png" 
-              onclick="runPlugin('ExportItem')" 
+              id="btnExport"
+              image="export.png"
+              data-plugin-type="EXPORT" 
               title="Export&hellip;" 
               tooltip="Export data" 
@@ -229 +195 @@
             />
             <tbl:button 
-              image="runplugin.png" 
-              onclick="runPlugin('RunPlugin')" 
+              id="btnRunPlugin"
+              image="runplugin.png"  
+              data-plugin-type="OTHER" 
               title="Run plugin&hellip;" 
               tooltip="Run a plugin" 
@@ -239 +206 @@
             <tbl:button
               image="help.png"
-              onclick="<%="Main.openHelp('" + ID +"', 'formula.view.properties')"%>"
+              subclass="auto-init"
+              data-auto-init="help"
+              data-help-id="formula.view.properties"
               title="Help&hellip;"
               tooltip="Get help about this page"
@@ -347 +316 @@
     <t:tab id="history" title="Change history" 
       tooltip="Displays a log of all modifications made to this item"
-      visible="<%=ChangeHistoryUtil.showChangeHistoryTab(sc)%>"
-      activate="History.loadOnce()">
+      visible="<%=ChangeHistoryUtil.showChangeHistoryTab(sc)%>">
       <jsp:include page="../../common/history/frameset.jsp">
         <jsp:param name="item_type" value="<%=itemType.name()%>" />

trunk/www/views/items/list_items.jsp

@@ -136 +136 @@
       "net.sf.basedb.clients.web.listcolumn.allitems");
   %>
-  <base:page title="All items">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="All items" id="list-page">
+  <base:head scripts="table.js,~items.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'allItems';
-    function itemOnClick(evt, itemId)
-    {
-      viewItem(itemId);
-    }
-    function deleteAllItems()
-    {
-      if (!confirm('You are about to PERMANENTLY DELETE all item.\n This can\'t be undone. Continue?'))
-      {
-        return;
-      }
-      var frm = document.forms[formId];
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteAllPermanently';
-      frm.submit();
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      var numChecked = Forms.numChecked(frm, /item:/);
-      if (numChecked == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm, /item:/) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function shareItems()
-    {
-      Table.shareItems(submitPage, '<%=ID%>', formId, '<%=itemType.name()%>', 'ShareItems', /item:/);
-    }
-    function setOwner()
-    {
-      Table.setOwnerOfItems(formId, /item:/);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    </script>
   </base:head>
   
@@ -256 +200 @@
         <tbl:toolbar subclass="bottomborder">
           <tbl:button 
+            id="btnDeleteItems"
             image="delete.png"
-            onclick="deleteItems()" 
             title="Delete" 
             tooltip="Mark the selected items for deletion" 
@@ -263 +207 @@
           />
           <tbl:button 
+            id="btnRestoreItems"
             image="restore.png"
-            onclick="restoreItems()" 
             title="Restore" 
             tooltip="Restore the selected items"
@@ -270 +214 @@
           />
           <tbl:button 
+            id="btnShareItems"
             image="share.png"
-            onclick="shareItems()" 
             title="Share&hellip;" 
             tooltip="Share the selected items"
@@ -277 +221 @@
           />
           <tbl:button 
+            id="btnSetOwner"
             image="take_ownership.png"
-            onclick="setOwner()" 
             title="Set owner&hellip;"
             tooltip="Change owner of the selected items"
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 

trunk/www/views/jobs/list_jobs.jsp

@@ -130 +130 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title==null ? "Jobs" : title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js" styles="table.css,toolbar.css,progressbar.css">
+  <base:page title="<%=title==null ? "Jobs" : title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,~jobs.js" styles="table.css,toolbar.css,progressbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'jobs';
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      viewItem(itemId);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function setOwner()
-    {
-      Table.setOwnerOfItems(formId);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    </script>
   </base:head>
   
@@ -437 +384 @@
           >
           <tbl:button 
+            id="btnDeleteItems"
             image="delete.png"
-            onclick="deleteItems()" 
             title="Delete" 
             tooltip="Delete the selected items" 
           />
           <tbl:button 
+            id="btnRestoreItems"
             image="restore.png"
-            onclick="restoreItems()" 
             title="Restore" 
             tooltip="Restore the selected (deleted) items"
           />
           <tbl:button 
+            id="btnSetOwner"
             image="take_ownership.png"
-            onclick="setOwner()" 
             title="Set owner&hellip;"
             tooltip="Change owner of the selected items"
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button 
+            id="btnImport"
+            data-plugin-type="IMPORT"
             image="import.png" 
-            onclick="runPlugin('ImportItems')" 
             title="Import&hellip;" 
             tooltip="Import data" 
@@ -468 +416 @@
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -475 +424 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -604 +554 @@
                     visible="<%=item.isRemoved()%>"
                   />&nbsp;</tbl:header>
-                <tbl:cell column="name"><div class="link" onclick="itemOnClick(event, <%=itemId%>)" 
+                <tbl:cell column="name"><div 
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="1"
+                  tabindex="0"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -762 +716 @@
     
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     

trunk/www/views/jobs/view_job.jsp

@@ -178 +178 @@
   }
   %>
-  <base:page type="popup" title="<%=title%>"> 
-  <base:head scripts="tabcontrol.js,table.js" styles="tabcontrol.css,progressbar.css,table.css">
-  <script>
-  function autoUpdate()
-  {
-    var autoUpdate = <%=autoUpdate ? "true" : "false"%>;
-    if (autoUpdate) sendProgressUpdateRequest();
-  }
-  function abortJob()
-  {
-    if (confirm('Are you sure? This action may not be undone'))
-    {
-      location.href = 'index.jsp?ID=<%=ID%>&cmd=AbortJob&item_id=<%=itemId%>';
-    }
-  }
-  function restartJob(clearDryRun)
-  {
-    var parameterVersion = <%=parameterVersion%>;
-    var latestVersion = <%=latestParameterVersion%>;
-    var useLatestConfiguration = 0;
-    if (parameterVersion != latestVersion)
-    {
-      var msg = 'The configuration parameters for the plugin has changed since\n';
-      msg += 'the job was added to the job queue. Do you want to use the new\n';
-      msg += 'configuration parameters?\n\n';
-      msg += 'Ok / Yes = Use the new parameters (version = '+latestVersion + ')\n';
-      msg += 'Cancel / No = Use the current parameters (version = ' + parameterVersion + ')';
-      if (confirm(msg)) useLatestConfiguration = 1;
-    }
-    var url = 'index.jsp?ID=<%=ID%>&cmd=RestartJob&item_id=<%=itemId%>';
-    url += '&useLatestConfiguration='+useLatestConfiguration;
-    if (clearDryRun) url += '&clearDryRun=' + clearDryRun;
-    location.href = url;
-  }
-  function reconfigureJob()
-  {
-    location.href = '../../common/plugin/index.jsp?ID=<%=ID%>&cmd=ConfigureJob&job_id=<%=itemId%>';
-  }
-  
-    function deleteItemPermanently()
-    {
-      Main.deleteItemPermanently('<%=ID%>', true, '<%=itemType.name()%>', <%=itemId%>, '&callback=itemDeleted');
-    }
-    function itemDeleted()
-    {
-      location.href = getRoot() + 'common/close_popup.jsp?ID=<%=ID%>&refresh_opener=1&wait=0';
-    }
-    function showUsingItems()
-    {
-      Main.showUsingItems('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>);
-    }
-    
-    var lastStatus = '<%=status.name()%>';
-    function sendProgressUpdateRequest()
-    {
-      var request = Ajax.getXmlHttpRequest();
-      var url = 'ajax.jsp?ID=<%=ID%>&cmd=GetProgress&item_id=<%=itemId%>&'+Math.random();
-      request.open("GET", url, true);
-      Ajax.setReadyStateHandler(request, progressUpdateCallback);
-      request.send(null);
-    }
-    function progressUpdateCallback(request)
-    {
-      var progress = JSON.parse(request.responseText);
-      var nextAction = 'sendProgressUpdateRequest()';
-      var nextTimeout = 1500;
-      if (progress && progress.status == 'ok')
-      {
-        var status = progress.jobStatus;
-        var message = progress.message;
-        var percentComplete = progress.percentComplete;
-        var runningTime = progress.runningTime;
-        
-        if (lastStatus != status) 
-        {
-          nextAction = 'location.reload()';
-          nextTimeout = 100;
-        }
-        if (status == 'EXECUTING')
-        {
-          displayProgress(percentComplete, message, runningTime);
-        }
-      }
-      setTimeout(nextAction, nextTimeout);
-    }
-
-    function displayProgress(percentDone, message, runningTime)
-    {
-      // Percent complete
-      var doneElement = document.getElementById('percentDone');
-      var remainElement = document.getElementById('percentRemain');
-      var unknownElement = document.getElementById('percentUnknown');
-      if (percentDone == -1)
-      {
-        Main.hide('percentDone');
-        Main.hide('percentRemain');
-        Main.show('percentUnknown');
-        Main.hide('percentText');
-      }
-      else
-      {
-        Main.hide('percentUnknown');
-        Main.show('percentText');
-        document.getElementById('percentText').innerHTML = percentDone+'%';
-        doneElement.style.width = percentDone+'%';
-        remainElement.style.width = (100-percentDone)+'%';
-        Main.showHide('percentDone', percentDone > 0);
-        Main.showHide('percentRemain', percentDone < 100);
-      }
-
-      // Message
-      document.getElementById('message').innerHTML = message;
-
-      // Running time
-      document.getElementById('runningTime').innerHTML = runningTime;
-    }
-  </script>
-  </base:head>
-  <base:body onload="autoUpdate()">
+  <base:page type="popup" title="<%=title%>" id="view-page">  
+  <base:head scripts="tabcontrol-2.js,table.js,~jobs.js" 
+    styles="tabcontrol.css,progressbar.css,table.css" />
+  <base:body>
     <h1><%=title%> <base:help tabcontrol="main" /></h1>
+    <div id="page-data" 
+      data-item-id="<%=itemId%>"
+      data-job-parameter-version="<%=parameterVersion %>"
+      data-latest-parameter-version="<%=latestParameterVersion %>"
+      data-job-status="<%=status.name()%>"
+      data-auto-update="<%=autoUpdate ? 1 : 0 %>"
+    ></div>
+
     <t:tabcontrol id="main" 
       subclass="content dialogtabcontrol"
@@ -311 +204 @@
           <div class="itemstatus">
             <base:icon 
+              id="btnDeletePermanently"
               image="deleted.png"
-              onclick="<%=deletePermanentlyPermission ? "deleteItemPermanently()" : null%>"
+              data-notify="btnDeletePermanently"
+              enabled="<%=deletePermanentlyPermission %>"
               tooltip="<%=deletePermanentlyPermission ? "Permanently delete this item" : null%>"
               visible="<%=isRemoved%>"> This item has been flagged for deletion<br></base:icon>
-            <base:icon image="used.png" 
-              onclick="showUsingItems()"
+            <base:icon
+              id="btnUsingItems"
+              image="used.png" 
               tooltip="Show the items that are using this one"
               visible="<%=isUsed%>"> This item is used by other items and can't be permanently deleted<br></base:icon>
@@ -394 +290 @@
             {
               %>
-              <td  style="padding-left: 10px;"><base:button image="view.png" 
+              <td style="padding-left: 10px;"><base:button 
+                subclass="link auto-init"
+                data-auto-init="view-file"
+                data-file-id="<%=logFile.getId()%>"
+                image="view.png" 
                 title="View log&hellip;"
-                onclick="<%="Main.viewFile('" + ID + "', " + logFile.getId() + ")"%>"
                 tooltip="View the log file with detailed information about this job"
                 /></td>
@@ -697 +596 @@
       {
         %>
-        <base:button onclick="abortJob()" title="Abort&hellip;" image="abort.png" />
+        <base:button id="btnAbort" title="Abort&hellip;" image="abort.png" />
         <%
       }
@@ -708 +607 @@
         {
           %>
-          <base:button onclick="restartJob(0)" title="Restart job" 
+          <base:button 
+            id="btnRestartJob" 
+            title="Restart job" 
             image="refresh.png" 
             tooltip="Try to run this job again with the same parameters"
           />
-          <base:button onclick="reconfigureJob()" title="Re-configure job"
+          <base:button 
+            id="btnReconfigureJob"
+            title="Re-configure job"
             image="runplugin.png"
             tooltip="Change the parameters for this job and try again"
@@ -723 +626 @@
       {
         %>
-        <base:button onclick="restartJob(1)" title="Really run" 
+        <base:button 
+          id="btnRestartJob"
+          data-clear-dry-run="1"
+          title="Really run" 
           image="refresh.png" 
           tooltip="Run this dry-run job for real"
@@ -730 +636 @@
       }
       %>
-      <base:button onclick="window.close()" title="Close" />
+      <base:button id="close" title="Close" />
     </base:buttongroup>
   </base:body>

trunk/www/views/permissiontemplates/edit_template.jsp

@@ -68 +68 @@
   }
   
-  
-  
   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.item(itemType), template);
   ExtensionsInvoker invoker = EditUtil.useEditExtensions(jspContext);
   %>
-  <base:page type="popup" title="<%=title%>">
-  <base:head scripts="tabcontrol.js" styles="tabcontrol.css">
+  <base:page type="popup" title="<%=title%>" id="edit-page">
+  <base:head scripts="tabcontrol-2.js,~templates.js" styles="tabcontrol.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    // Validate the "Permission template" tab
-    function validatePermissionTemplate()
-    {
-      var frm = document.forms['template'];
-      if (Main.trimString(frm.name.value) == '')
-      {
-        Forms.showNotification(frm.name, 'You must enter a name');
-        return false;
-      }
-      return true;
-    }
-
-    // Submit the form
-    function saveSettings()
-    {
-      var frm = document.forms['template'];
-      if (TabControl.validateActiveTab('settings'))
-      {
-        frm.submit();
-      }
-    }
-    
-    function init()
-    {
-      <%
-      if (template == null)
-      {
-        %>
-        var frm = document.forms['template'];
-        frm.name.focus();
-        frm.name.select();
-        <%
-      }
-      %>
-    }
-    </script>
   </base:head>
-  <base:body onload="init()">
+  <base:body>
     <h1><%=title%> <base:help tabcontrol="settings"/></h1>
     <form action="index.jsp?ID=<%=ID%>" method="post" name="template">
@@ -124 +85 @@
       position="bottom"  remember="<%=template != null%>"
       extensions="<%=invoker%>">
-    <t:tab id="info" title="Permission template" validate="validatePermissionTemplate()" helpid="permissiontemplate.edit">
+    <t:tab id="info" title="Permission template" helpid="permissiontemplate.edit">
       <table class="fullform input100 smaller">
       <tr>
         <th>Name</th>
-        <td><input class="text required" type="text" name="name" 
+        <td><input class="text required auto-init" data-auto-init="<%=template == null ? "focus-select" : "focus" %>"
+          type="text" name="name" 
           value="<%=HTML.encodeTags(template == null ? Values.getString(cc.getPropertyValue("name"), "New template") : template.getName())%>" 
           maxlength="<%=PermissionTemplate.MAX_NAME_LENGTH%>"></td>
@@ -153 +115 @@
 
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="saveSettings()" title="Save" />
-      <base:button onclick="window.close()" title="Cancel" />
+      <base:button id="btnSave" title="Save" />
+      <base:button id="close" title="Cancel" />
     </base:buttongroup>
   </base:body>

trunk/www/views/permissiontemplates/list_templates.jsp

@@ -93 +93 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title==null ? "Permission templates" : title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="<%=title==null ? "Permission templates" : title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,~templates.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'templates';
-    function newItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', 0, true);
-    }
-    function editItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, true);
-    }
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      Table.itemOnClick(formId, evt, itemId, '<%=mode.getName()%>', viewItem, editItem, returnSelected);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function setOwner()
-    {
-      Table.setOwnerOfItems(formId);
-    }
-    function shareItems()
-    {
-      Table.shareItems(formId);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    </script>
   </base:head>
   
@@ -246 +181 @@
           >
           <tbl:button 
+            id="btnNewItem"
             disabled="<%=!createPermission%>" 
             image="new.png" 
-            onclick="newItem()" 
             title="New&hellip;" 
             tooltip="<%=createPermission ? "Create new permission template" : "You do not have permission to create permission templates"%>" 
           />
           <tbl:button 
+            id="btnDeleteItems"
             image="delete.png"
-            onclick="deleteItems()" 
             title="Delete" 
             tooltip="Delete the selected items" 
           />
           <tbl:button 
+            id="btnRestoreItems"
             image="restore.png"
-            onclick="restoreItems()" 
             title="Restore" 
             tooltip="Restore the selected (deleted) items"
           />
           <tbl:button 
+            id="btnShareItems"
             image="share.png"
-            onclick="shareItems()" 
             title="Share&hellip;" 
             tooltip="Share the selected items"
           />
           <tbl:button 
+            id="btnSetOwner"
             image="take_ownership.png"
-            onclick="setOwner()" 
             title="Set owner&hellip;"
             tooltip="Change owner of the selected items"
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button 
+            id="btnImport"
+            data-plugin-type="IMPORT"
             image="import.png" 
-            onclick="runPlugin('ImportItems')" 
             title="Import&hellip;" 
             tooltip="Import data" 
@@ -290 +226 @@
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -297 +234 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -363 +301 @@
               PermissionTemplate item = templates.next();
               int itemId = item.getId();
-              
               
               boolean deletePermission = item.hasPermission(Permission.DELETE);
@@ -417 +354 @@
                     visible="<%=item.isShared()%>"
                   />&nbsp;</tbl:header>
-                <tbl:cell column="name"><div class="link" 
-                  onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)" 
+                <tbl:cell column="name"><div
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="<%=writePermission ? 0 : 1 %>" 
+                  tabindex="0"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -472 +412 @@
     
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     

trunk/www/views/permissiontemplates/view_template.jsp

@@ -95 +95 @@
   ExtensionsInvoker invoker = ToolbarUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title%>">
-  <base:head scripts="table.js,tabcontrol.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
+  <base:page title="<%=title%>" id="view-page">
+  <base:head scripts="tabcontrol-2.js,table.js,~templates.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    function editItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, true);
-    }
-    function shareItem()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=ShareItem&item_id=<%=itemId%>', 'SharePermissionTemplate', 600, 400);
-    }
-    function deleteItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=DeleteItem&item_id=<%=itemId%>');
-    }
-    function restoreItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_id=<%=itemId%>');
-    }
-    function deleteItemPermanently()
-    {
-      Main.deleteItemPermanently('<%=ID%>', true, '<%=itemType.name()%>', <%=itemId%>, '&callback=itemDeleted');
-    }
-    function itemDeleted()
-    {
-      Main.listItems('<%=ID%>', '<%=itemType.name()%>');
-    }
-    function showUsingItems()
-    {
-      Main.showUsingItems('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>);
-    }
-    function setOwner()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=SetOwnerOfItem&item_id=<%=itemId%>', 'SetOwnerOfItem', 450, 300);
-    }
-    function runPlugin(cmd)
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 750, 500);
-    }
-    </script>
   </base:head>
   <base:body>
@@ -143 +105 @@
       /><p:pathelement title="<%=HTML.encodeTags(template.getName())%>"
       /></p:path>
+    <div id="page-data" data-item-id="<%=itemId%>"></div>
     
     <t:tabcontrol 
@@ -159 +122 @@
           />
           <base:icon 
+            id="btnDeletePermanently"
             image="deleted.png"
-            onclick="deleteItemPermanently()"
             tooltip="This item has been flagged for deletion. Click to delete it now."
             enabled="<%=deletePermanentlyPermission %>"
             visible="<%=isRemoved%>" 
           />
-          <base:icon image="used.png" 
-            onclick="showUsingItems()"
+          <base:icon 
+            id="btnUsingItems"
+            image="used.png" 
             tooltip="This item is used by other items and can't be permanently deleted. Show the items that are using this one"
             visible="<%=isRemoved && isUsed%>" />
@@ -173 +137 @@
           <tbl:toolbar subclass="bottomborder">
             <tbl:button 
+              id="btnEdit"
               disabled="<%=!writePermission%>" 
               image="edit.png" 
-              onclick="editItem()" 
               title="Edit&hellip;" 
               tooltip="<%=writePermission ? "Edit this permission template" : "You do not have permission to edit this permission template"%>" 
             />
             <tbl:button 
+              id="btnDelete"
               disabled="<%=!deletePermission%>" 
               image="delete.png" 
-              onclick="deleteItem()" 
               title="Delete"
               visible="<%=!template.isRemoved()%>"
@@ -188 +152 @@
             />
             <tbl:button 
+              id="btnRestore"
               disabled="<%=!writePermission%>" 
               image="restore.png" 
-              onclick="restoreItem()" 
               title="Restore"
               visible="<%=template.isRemoved()%>"
@@ -196 +160 @@
             />
             <tbl:button 
+              id="btnShare"
               disabled="<%=!sharePermission%>"
               image="share.png"
-              onclick="shareItem()" 
               title="Permissions&hellip;" 
               tooltip="<%=sharePermission ? "Set permission on this permission template" : "You do not have permission to modify this permission template"%>"
             />
             <tbl:button 
+              id="btnSetOwner"
               disabled="<%=!setOwnerPermission%>"
               image="take_ownership.png"
-              onclick="setOwner()" 
               title="Set owner&hellip;"
               tooltip="<%=setOwnerPermission ? "Change owner of this item" : "You do not have permission to change ownership of this item"%>"
             />
             <tbl:button 
+              id="btnImport"
               image="import.png" 
-              onclick="runPlugin('ImportItem')" 
+              data-plugin-type="IMPORT"  
               title="Import&hellip;" 
               tooltip="Import data" 
@@ -217 +182 @@
             />
             <tbl:button 
-              image="export.png" 
-              onclick="runPlugin('ExportItem')" 
+              id="btnExport"
+              image="export.png"
+              data-plugin-type="EXPORT" 
               title="Export&hellip;" 
               tooltip="Export data" 
@@ -224 +190 @@
             />
             <tbl:button 
-              image="runplugin.png" 
-              onclick="runPlugin('RunPlugin')" 
+              id="btnRunPlugin"
+              image="runplugin.png"  
+              data-plugin-type="OTHER" 
               title="Run plugin&hellip;" 
               tooltip="Run a plugin" 
@@ -234 +201 @@
             <tbl:button
               image="help.png"
-              onclick="<%="Main.openHelp('" + ID +"', 'permissiontemplate.view.properties')"%>"
+              subclass="auto-init"
+              data-auto-init="help"
+              data-help-id="permissiontemplate.view.properties"
               title="Help&hellip;"
               tooltip="Get help about this page"

trunk/www/views/physicalbioassays/list_bioassays.jsp

@@ -135 +135 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title==null ? "Physical bioassays" : title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="<%=title==null ? "Physical bioassays" : title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,~bioassays.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'bioassays';
-    function newItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', 0, true);
-    }
-    function editItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, true);
-    }
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      Table.itemOnClick(formId, evt, itemId, '<%=mode.getName()%>', viewItem, editItem, returnSelected);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function setOwner()
-    {
-      Table.setOwnerOfItems(formId);
-    }
-    function shareItems()
-    {
-      Table.shareItems(formId);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    function newDerivedBioAssay(bioAssayId)
-    {
-      Main.viewOrEditItem('<%=ID%>', 'DERIVEDBIOASSAY', 0, true, '&physicalbioassay_id='+bioAssayId);
-    }
-    function newMergedDerivedBioAssay()
-    {
-      Table.poolItems(submitPage, '<%=ID%>', formId, '<%=itemType.name()%>', 'NewMergedDerivedBioAssay');
-    }
-    </script>
   </base:head>
   
@@ -413 +340 @@
           >
           <tbl:button 
+            id="btnNewItem"
             disabled="<%=!createPermission%>" 
             image="new.png" 
-            onclick="newItem()" 
             title="New&hellip;" 
             tooltip="<%=createPermission ? "Create new physical bioassay" : "You do not have permission to create physical bioassays"%>" 
           />
           <tbl:button
+            id="btnNewMergedDerivedBioAssay"
             disabled="<%=!createDerivedBioAssayPermission %>"
             image="add.png"
-            onclick="newMergedDerivedBioAssay()"
             title="New derived bioassay&hellip;"
             tooltip="<%=createDerivedBioAssayPermission ? "Create new derived bioassay from the selected physical bioassays" : "You do not have permission to create derived bioassays"%>"
           />
           <tbl:button 
+            id="btnDeleteItems"
             image="delete.png"
-            onclick="deleteItems()" 
             title="Delete" 
             tooltip="Delete the selected items" 
           />
           <tbl:button 
+            id="btnRestoreItems"
             image="restore.png"
-            onclick="restoreItems()" 
             title="Restore" 
             tooltip="Restore the selected (deleted) items"
           />
           <tbl:button 
+            id="btnShareItems"
             image="share.png"
-            onclick="shareItems()" 
             title="Share&hellip;" 
             tooltip="Share the selected items"
           />
           <tbl:button 
+            id="btnSetOwner"
             image="take_ownership.png"
-            onclick="setOwner()" 
             title="Set owner&hellip;"
             tooltip="Change owner of the selected items"
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button 
+            id="btnImport"
+            data-plugin-type="IMPORT"
             image="import.png" 
-            onclick="runPlugin('ImportItems')" 
             title="Import&hellip;" 
             tooltip="Import data" 
@@ -464 +392 @@
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -471 +400 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -505 +435 @@
                 image="check_uncheck.png" 
                 tooltip="Check/uncheck all" 
-                 
               /></tbl:header>
             <tbl:header 
@@ -539 +468 @@
               int itemId = item.getId();
               boolean usePermission = item.hasPermission(Permission.USE);
-              
-              
               boolean deletePermission = item.hasPermission(Permission.DELETE);
               boolean sharePermission = item.hasPermission(Permission.SET_PERMISSION);
@@ -592 +519 @@
                     visible="<%=item.isShared()%>"
                   />&nbsp;</tbl:header>
-                <tbl:cell column="name"><div class="link" 
-                  onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)" 
+                <tbl:cell column="name"><div
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="<%=writePermission ? 0 : 1 %>" 
+                  tabindex="0"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -703 +633 @@
                   %>
                   <base:icon
+                    subclass="link auto-init"
+                    data-auto-init="new-derived-bioassay"
+                    data-item-id="<%=itemId %>"
                     image="add.png" 
-                    onclick="<%="newDerivedBioAssay("+itemId+")"%>" 
                     tooltip="Create new derived bioassay" 
                     visible="<%=mode.hasEditLink() && createDerivedBioAssayPermission && usePermission %>"
@@ -799 +731 @@
     
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     

trunk/www/views/physicalbioassays/view_bioassay.jsp

@@ -117 +117 @@
   ExtensionsInvoker invoker = ToolbarUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title%>">
-  <base:head scripts="table.js,tabcontrol.js" styles="toolbar.css,table.css,headertabcontrol.css,path.css">
+  <base:page title="<%=title%>" id="view-page">
+  <base:head scripts="table.js,tabcontrol-2.js,~bioassays.js" styles="toolbar.css,table.css,headertabcontrol.css,path.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    function editItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, true);
-    }
-    function shareItem()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=ShareItem&item_id=<%=itemId%>', 'SharePhysicalBioAssay', 600, 400);
-    }
-    function deleteItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=DeleteItem&item_id=<%=itemId%>');
-    }
-    function restoreItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_id=<%=itemId%>');
-    }
-    function deleteItemPermanently()
-    {
-      Main.deleteItemPermanently('<%=ID%>', true, '<%=itemType.name()%>', <%=itemId%>, '&callback=itemDeleted');
-    }
-    function itemDeleted()
-    {
-      Main.listItems('<%=ID%>', '<%=itemType.name()%>');
-    }
-    function showUsingItems()
-    {
-      Main.showUsingItems('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>);
-    }
-    function setOwner()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=SetOwnerOfItem&item_id=<%=itemId%>', 'SetOwnerOfItem', 450, 300);
-    }
-    function runPlugin(cmd)
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 750, 500);
-    }
-    function newDerivedBioAssay()
-    {
-      Main.viewOrEditItem('<%=ID%>', 'DERIVEDBIOASSAY', 0, true, '&physicalbioassay_id=<%=itemId%>');
-    }
-    </script>
   </base:head>
   <base:body>
@@ -169 +127 @@
       /><p:pathelement title="<%=HTML.encodeTags(pba.getName())%>" 
       /></p:path>
+    <div id="page-data" data-item-id="<%=itemId%>"></div>
+
     <t:tabcontrol 
       id="main" 
@@ -184 +144 @@
           />
           <base:icon 
+            id="btnDeletePermanently"
             image="deleted.png"
-            onclick="deleteItemPermanently()"
             tooltip="This item has been flagged for deletion. Click to delete it now."
             enabled="<%=deletePermanentlyPermission %>"
             visible="<%=isRemoved%>" 
           />
-          <base:icon image="used.png" 
-            onclick="showUsingItems()"
+          <base:icon 
+            id="btnUsingItems"
+            image="used.png" 
             tooltip="This item is used by other items and can't be permanently deleted. Show the items that are using this one"
             visible="<%=isRemoved && isUsed%>" />
@@ -198 +159 @@
           <tbl:toolbar subclass="bottomborder">
             <tbl:button 
+              id="btnEdit"
               disabled="<%=!writePermission%>" 
               image="edit.png" 
-              onclick="editItem()" 
               title="Edit&hellip;" 
               tooltip="<%=writePermission ? "Edit this physical bioassay" : "You do not have permission to edit this physical bioassay"%>" 
             />
             <tbl:button 
+              id="btnDelete"
               disabled="<%=!deletePermission%>" 
               image="delete.png" 
-              onclick="deleteItem()" 
               title="Delete"
               visible="<%=!pba.isRemoved()%>"
@@ -213 +174 @@
             />
             <tbl:button 
+              id="btnRestore"
               disabled="<%=!writePermission%>" 
               image="restore.png" 
-              onclick="restoreItem()" 
               title="Restore"
               visible="<%=pba.isRemoved()%>"
@@ -221 +182 @@
             />
             <tbl:button 
+              id="btnShare"
               disabled="<%=!sharePermission%>"
               image="share.png"
-              onclick="shareItem()" 
               title="Share&hellip;" 
               tooltip="<%=sharePermission ? "Share this physical bioassay to other user, groups and projects" : "You do not have permission to share this physical bioassay"%>"
             />
             <tbl:button 
+              id="btnSetOwner"
               disabled="<%=!setOwnerPermission%>"
               image="take_ownership.png"
-              onclick="setOwner()" 
               title="Set owner&hellip;"
               tooltip="<%=setOwnerPermission ? "Change owner of this item" : "You do not have permission to change ownership of this item"%>"
             />
             <tbl:button
+              id="btnNewDerivedBioAssay"
               image="add.png"
-              onclick="newDerivedBioAssay()"
               title="New derived bioassay&hellip;"
               tooltip="Create a derived bioassay from this bioassay"
@@ -242 +203 @@
             />
             <tbl:button 
+              id="btnImport"
               image="import.png" 
-              onclick="runPlugin('ImportItem')" 
+              data-plugin-type="IMPORT"  
               title="Import&hellip;" 
               tooltip="Import data" 
@@ -249 +211 @@
             />
             <tbl:button 
-              image="export.png" 
-              onclick="runPlugin('ExportItem')" 
+              id="btnExport"
+              image="export.png"
+              data-plugin-type="EXPORT" 
               title="Export&hellip;" 
               tooltip="Export data" 
@@ -256 +219 @@
             />
             <tbl:button 
-              image="runplugin.png" 
-              onclick="runPlugin('RunPlugin')" 
+              id="btnRunPlugin"
+              image="runplugin.png"  
+              data-plugin-type="OTHER" 
               title="Run plugin&hellip;" 
               tooltip="Run a plugin" 
@@ -266 +230 @@
             <tbl:button
               image="help.png"
-              onclick="<%="Main.openHelp('" + ID +"', 'physicalbioassay.view.properties')"%>"
+              subclass="auto-init"
+              data-auto-init="help"
+              data-help-id="physicalbioassay.view.properties"
               title="Help&hellip;"
               tooltip="Get help about this page"
@@ -511 +477 @@
         <jsp:param name="title" value="Shared to" />
       </jsp:include>
-
       </t:tab>
       
       <t:tab id="annotations" title="Annotations &amp; parameters" 
-        tooltip="View annotation values and protocol parameters" clazz="white"
-        activate="AnnotationsList.loadOnce()">
+        tooltip="View annotation values and protocol parameters" clazz="white">
         <jsp:include page="../../common/annotations/list_frameset.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />
@@ -525 +489 @@
 
       <t:tab id="overview" title="Overview" 
-        tooltip="Display a tree overview of related items"
-        activate="Overview.loadOnce()">
+        tooltip="Display a tree overview of related items">
         <jsp:include page="../../common/overview/overview.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />
@@ -535 +498 @@
       <t:tab id="history" title="Change history" 
         tooltip="Displays a log of all modifications made to this item"
-        visible="<%=ChangeHistoryUtil.showChangeHistoryTab(sc)%>"
-        activate="History.loadOnce()">
+        visible="<%=ChangeHistoryUtil.showChangeHistoryTab(sc)%>">
         <jsp:include page="../../common/history/frameset.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />

trunk/www/views/rawbioassays/index.jsp

@@ -543 +543 @@
     redirect = "../../common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&main_type=OTHER&title=Run+plugin";
   }
+  else if ("NewExperiment".equals(cmd))
+  {
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    redirect = "../experiments/index.jsp?ID="+ID+"&cmd=NewItem&rawbioassays=1";
+  }
   else if ("CreateSpotImages".equals(cmd))
   {

trunk/www/views/rawbioassays/list_rawbioassays.jsp

@@ -143 +143 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title==null ? "Raw bioassays" : title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="<%=title==null ? "Raw bioassays" : title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,~bioassays.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'rawbioassays';
-    function newItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', 0, true);
-    }
-    function editItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, true);
-    }
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      Table.itemOnClick(formId, evt, itemId, '<%=mode.getName()%>', viewItem, editItem, returnSelected);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function setOwner()
-    {
-      Table.setOwnerOfItems(formId);
-    }
-    function shareItems()
-    {
-      Table.shareItems(formId);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    function newExperiment()
-    {
-      var frm = document.forms[formId];
-      var selected = Table.getSelected(formId);
-      if (selected.length == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      var extraUrl = '&rawbioassay_id='+selected.join('&rawbioassay_id=');
-      Main.viewOrEditItem('<%=ID%>', 'EXPERIMENT', 0, true, extraUrl);
-    }
-    </script>
   </base:head>
   
@@ -517 +440 @@
           >
           <tbl:button 
+            id="btnNewItem"
             disabled="<%=!createPermission%>" 
             image="new.png" 
-            onclick="newItem()" 
             title="New&hellip;" 
             tooltip="<%=createPermission ? "Create new raw bioassay" : "You do not have permission to create raw bioassays"%>" 
           />
           <tbl:button 
+            id="btnDeleteItems"
             image="delete.png"
-            onclick="deleteItems()" 
             title="Delete" 
             tooltip="Delete the selected items" 
           />
           <tbl:button 
+            id="btnRestoreItems"
             image="restore.png"
-            onclick="restoreItems()" 
             title="Restore" 
             tooltip="Restore the selected (deleted) items"
           />
           <tbl:button 
+            id="btnShareItems"
             image="share.png"
-            onclick="shareItems()" 
             title="Share&hellip;" 
             tooltip="Share the selected items"
           />
           <tbl:button 
+            id="btnSetOwner"
             image="take_ownership.png"
-            onclick="setOwner()" 
             title="Set owner&hellip;"
             tooltip="Change owner of the selected items"
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button
+            id="btnNewExperiment"
             image="add.png"
-            onclick="newExperiment()"
             title="New experiment&hellip;"
             tooltip="Create a new experiment from the selected raw bioassays"
@@ -561 +484 @@
           />
           <tbl:button 
+            id="btnImport"
+            data-plugin-type="IMPORT"
             image="import.png" 
-            onclick="runPlugin('ImportItems')" 
             title="Import&hellip;" 
             tooltip="Import data" 
@@ -568 +492 @@
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -575 +500 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -701 +627 @@
                     visible="<%=item.isShared()%>"
                   />&nbsp;</tbl:header>
-                <tbl:cell column="name"><div class="link" 
-                  onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)" 
+                <tbl:cell column="name"><div 
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="<%=writePermission ? 0 : 1 %>" 
+                  tabindex="0"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -906 +835 @@
     
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     

trunk/www/views/rawbioassays/rawdata/list_rawdata.jsp

@@ -145 +145 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title%>">
-  <base:head scripts="table.js,tabcontrol.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
+  <base:page title="<%=title%>" id="list-page">
+  <base:head scripts="table.js,tabcontrol-2.js,~rawdata.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'rawdata';
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false, '&rawbioassay_id=<%=rawBioAssayId%>');
-    }
-    function itemOnClick(evt, itemId)
-    {
-      viewItem(itemId);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    function switchTab(tabControlId, tabId)
-    {
-      if (tabId == 'properties' || tabId == 'annotations' || tabId == 'overview' || tabId == 'history')
-      {
-        location.href = '../index.jsp?ID=<%=ID%>&cmd=ViewItem&item_id=<%=rawBioAssayId%>&tab='+tabId;
-      }
-      else
-      {
-        TabControl.setActiveTab(tabControlId, tabId);
-      }
-    }
-    function newReporterList()
-    {
-      Table.submitToPopup(formId, 'CreateReporterList', 600, 400);
-    }
-    </script>
   </base:head>
   
@@ -200 +160 @@
       id="main" 
       subclass="mastertabcontrol content"
-      active="rawdata" switch="switchTab">
+      active="rawdata">
     <t:tab id="properties" title="Properties" />
     <t:tab id="annotations" title="Annotations &amp; parameters" 
@@ -594 +554 @@
           >
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button
+            id="btnNewReporterList"
             image="add.png"
-            onclick="newReporterList()"
             title="New reporter list&hellip;"
             tooltip="Create a new reporter list from matching spots"
@@ -607 +567 @@
           />
           <tbl:button 
+            id="btnImport"
+            data-plugin-type="IMPORT"
             image="import.png" 
-            onclick="runPlugin('ImportItems')" 
             title="Import&hellip;" 
             tooltip="Import data" 
@@ -614 +575 @@
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -621 +583 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -721 +684 @@
                   visible="<%=mode.hasIcons()%>"
                   ></tbl:header>
-                <tbl:cell column="position"><div class="link" onclick="itemOnClick(event, <%=itemId%>)" 
+                <tbl:cell column="position"><div
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-extra-url="<%="&rawbioassay_id="+rawBioAssayId%>"
+                  tabindex="0"
                   title="<%=tooltip%>"><%=item.getPosition()%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -909 +876 @@
 
     <base:buttongroup>
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
 

trunk/www/views/rawbioassays/rawdata/view_rawdata.jsp

@@ -91 +91 @@
   WellCoordinateFormatter columnFormatter = new WellCoordinateFormatter(false);
   %>
-  <base:page title="<%=title%>" type="popup">
-  <base:head scripts="tabcontrol.js" styles="tabcontrol.css">
-  </base:head>
+  <base:page title="<%=title%>" type="popup" id="view-page">
+  <base:head scripts="tabcontrol-2.js,~rawdata.js" styles="tabcontrol.css" />
   <base:body>
     <h1><%=title%></h1>
@@ -417 +416 @@
 
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="window.close()" title="Close" />
+      <base:button id="close" title="Close" />
     </base:buttongroup>
     

trunk/www/views/rawbioassays/view_rawbioassay.jsp

@@ -134 +134 @@
   ExtensionsInvoker invoker = ToolbarUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title%>">
-  <base:head scripts="table.js,tabcontrol.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
+  <base:page title="<%=title%>" id="view-page">
+  <base:head scripts="table.js,tabcontrol-2.js,~bioassays.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    function editItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, true);
-    }
-    function shareItem()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=ShareItem&item_id=<%=itemId%>', 'ShareRawBioAssay', 600, 400);
-    }
-    function deleteItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=DeleteItem&item_id=<%=itemId%>');
-    }
-    function restoreItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_id=<%=itemId%>');
-    }
-    function deleteItemPermanently()
-    {
-      Main.deleteItemPermanently('<%=ID%>', true, '<%=itemType.name()%>', <%=itemId%>, '&callback=itemDeleted');
-    }
-    function itemDeleted()
-    {
-      Main.listItems('<%=ID%>', '<%=itemType.name()%>');
-    }
-    function showUsingItems()
-    {
-      Main.showUsingItems('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>);
-    }
-    function setOwner()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=SetOwnerOfItem&item_id=<%=itemId%>', 'SetOwnerOfItem', 450, 300);
-    }
-    function runPlugin(cmd)
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 750, 500);
-    }
-    function viewRawData()
-    {
-      location.href = 'rawdata/index.jsp?ID=<%=ID%>&cmd=List&rawbioassay_id=<%=itemId%>';
-    }
-    function editSpotImages()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=EditSpotImages&item_id=<%=itemId%>', 'EditSpotImages', 600, 400);
-    }
-    function switchTab(tabControlId, tabId)
-    {
-      if (TabControl.isActive(tabControlId, tabId)) return;
-      if (tabId == 'rawdata')
-      {
-        viewRawData();
-      }
-      else
-      {
-        TabControl.setActiveTab(tabControlId, tabId);
-      }
-    }
-    </script>
   </base:head>
   <base:body>
@@ -202 +144 @@
       /><p:pathelement title="<%=HTML.encodeTags(rawBioAssay.getName())%>" 
       /></p:path>
+    <div id="page-data" data-item-id="<%=itemId%>"></div>
     
     <t:tabcontrol 
       id="main" 
       subclass="content mastertabcontrol" 
-      active="<%=tab%>" switch="switchTab" remember="false">
+      active="<%=tab%>">
     <t:tab id="properties" title="Properties">
       <div>
@@ -218 +161 @@
           />
           <base:icon 
+            id="btnDeletePermanently"
             image="deleted.png"
-            onclick="deleteItemPermanently()"
             tooltip="This item has been flagged for deletion. Click to delete it now."
             enabled="<%=deletePermanentlyPermission %>"
             visible="<%=isRemoved%>" 
           />
-          <base:icon image="used.png" 
-            onclick="showUsingItems()"
+          <base:icon
+            id="btnUsingItems"
+            image="used.png" 
             tooltip="This item is used by other items and can't be permanently deleted. Show the items that are using this one"
             visible="<%=isRemoved && isUsed%>" />
@@ -232 +176 @@
           <tbl:toolbar subclass="bottomborder">
             <tbl:button 
+              id="btnEdit"
               disabled="<%=!writePermission%>" 
               image="edit.png" 
-              onclick="editItem()" 
               title="Edit&hellip;" 
               tooltip="<%=writePermission ? "Edit this raw bioassay" : "You do not have permission to edit this raw bioassay"%>" 
             />
             <tbl:button 
+              id="btnDelete"
               disabled="<%=!deletePermission%>" 
               image="delete.png" 
-              onclick="deleteItem()" 
               title="Delete"
               visible="<%=!rawBioAssay.isRemoved()%>"
@@ -247 +191 @@
             />
             <tbl:button 
+              id="btnRestore"
               disabled="<%=!writePermission%>" 
               image="restore.png" 
-              onclick="restoreItem()" 
               title="Restore"
               visible="<%=rawBioAssay.isRemoved()%>"
@@ -255 +199 @@
             />
             <tbl:button 
+              id="btnShare"
               disabled="<%=!sharePermission%>"
               image="share.png"
-              onclick="shareItem()" 
               title="Share&hellip;" 
               tooltip="<%=sharePermission ? "Share this raw bioassay to other user, groups and projects" : "You do not have permission to share this raw bioassay"%>"
             />
             <tbl:button 
+              id="btnSetOwner"
               disabled="<%=!setOwnerPermission%>"
               image="take_ownership.png"
-              onclick="setOwner()" 
               title="Set owner&hellip;"
               tooltip="<%=setOwnerPermission ? "Change owner of this item" : "You do not have permission to change ownership of this item"%>"
             />
             <tbl:button 
+              id="btnImport"
               image="import.png" 
-              onclick="runPlugin('ImportItem')" 
+              data-plugin-type="IMPORT"  
               title="Import&hellip;" 
               tooltip="Import data" 
@@ -276 +221 @@
             />
             <tbl:button 
-              image="export.png" 
-              onclick="runPlugin('ExportItem')" 
+              id="btnExport"
+              image="export.png"
+              data-plugin-type="EXPORT" 
               title="Export&hellip;" 
               tooltip="Export data" 
@@ -283 +229 @@
             />
             <tbl:button 
-              image="runplugin.png" 
-              onclick="runPlugin('RunPlugin')" 
+              id="btnRunPlugin"
+              image="runplugin.png"  
+              data-plugin-type="OTHER" 
               title="Run plugin&hellip;" 
               tooltip="Run a plugin" 
@@ -290 +237 @@
             />
             <tbl:button
-              onclick="editSpotImages()"
+              id="btnEditSpotImages"
               image="runplugin.png" 
               title="Create spot images&hellip;"
@@ -299 +246 @@
             <tbl:button
               image="help.png"
-              onclick="<%="Main.openHelp('" + ID +"', 'rawbioassay.view.properties')"%>"
+              subclass="auto-init"
+              data-auto-init="help"
+              data-help-id="rawbioassay.view.properties"
               title="Help&hellip;"
               tooltip="Get help about this page"
@@ -592 +541 @@
       
       <t:tab id="annotations" title="Annotations &amp; parameters" 
-        tooltip="View annotation values and protocol parameters" clazz="white"
-        activate="AnnotationsList.loadOnce()">
+        tooltip="View annotation values and protocol parameters" clazz="white">
         <jsp:include page="../../common/annotations/list_frameset.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />
@@ -603 +551 @@
       <t:tab id="rawdata" title="Raw data" visible="<%=rawBioAssay.getNumDbSpots() > 0%>" />
       <t:tab id="overview" title="Overview" 
-        tooltip="Display a tree overview of related items"
-        activate="Overview.loadOnce()">
+        tooltip="Display a tree overview of related items">
         <jsp:include page="../../common/overview/overview.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />
@@ -613 +560 @@
       <t:tab id="history" title="Change history" 
         tooltip="Displays a log of all modifications made to this item"
-        visible="<%=ChangeHistoryUtil.showChangeHistoryTab(sc)%>"
-        activate="History.loadOnce()">
+        visible="<%=ChangeHistoryUtil.showChangeHistoryTab(sc)%>">
         <jsp:include page="../../common/history/frameset.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />

trunk/www/views/reporterlists/list_reporterlists.jsp

@@ -95 +95 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title==null ? "Reporter lists" : title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="<%=title==null ? "Reporter lists" : title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,~reporterlists.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'reporterLists';
-    function newItem()
-    {
-      var controller = Main.getController('REPORTERLIST');
-      Table.submitToPopup(formId, 'NewItem', controller.width, controller.height);
-    }
-    function editItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, true);
-    }
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      Table.itemOnClick(formId, evt, itemId, '<%=mode.getName()%>', viewItem, editItem, returnSelected);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function setOwner()
-    {
-      Table.setOwnerOfItems(formId);
-    }
-    function shareItems()
-    {
-      Table.shareItems(formId);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    </script>
   </base:head>
   
@@ -286 +220 @@
           >
           <tbl:button 
+            id="btnNewItem"
             disabled="<%=!createPermission%>" 
             image="new.png" 
-            onclick="newItem()" 
             title="New&hellip;" 
             tooltip="<%=createPermission ? "Create new reporter list" : "You do not have permission to create reporter lists"%>" 
           />
           <tbl:button 
+            id="btnDeleteItems"
             image="delete.png"
-            onclick="deleteItems()" 
             title="Delete" 
             tooltip="Delete the selected items" 
           />
           <tbl:button 
+            id="btnRestoreItems"
             image="restore.png"
-            onclick="restoreItems()" 
             title="Restore" 
             tooltip="Restore the selected (deleted) items"
           />
           <tbl:button 
+            id="btnShareItems"
             image="share.png"
-            onclick="shareItems()" 
             title="Share&hellip;" 
             tooltip="Share the selected items"
           />
           <tbl:button 
+            id="btnSetOwner"
             image="take_ownership.png"
-            onclick="setOwner()" 
             title="Set owner&hellip;"
             tooltip="Change owner of the selected items"
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button 
+            id="btnImport"
+            data-plugin-type="IMPORT"
             image="import.png" 
-            onclick="runPlugin('ImportItems')" 
             title="Import&hellip;" 
             tooltip="Import data" 
@@ -330 +265 @@
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -337 +273 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -456 +393 @@
                     visible="<%=item.isShared()%>"
                   />&nbsp;</tbl:header>
-                <tbl:cell column="name"><div class="link" 
-                  onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)" 
+                <tbl:cell column="name"><div
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="<%=writePermission ? 0 : 1 %>" 
+                  tabindex="0"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -521 +461 @@
     
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     

trunk/www/views/reporterlists/reporters/add_reporters_frameset.jsp

@@ -37 +37 @@
 %>
 
-<base:page type="popup" title="">
-  <base:head>
-  <script>
-  function addSelected()
-  {
-    var selected = top['reporters'].Table.getSelected('reporters');
-    if (selected.length == 0)
-    {
-      top['reporters'].Forms.showNotification('check.uncheck', 'Please select at least one reporter in the list', null, 'pointer-below');
-//      Forms.showNotification(top['reporters'].document.getElementById('check.uncheck'), 'Please select at least one reporter in the list', null, 'pointer-below');
-      return;
-    }
-    var frm = document.forms['addReporters'];
-    frm.which.value = 'selected';
-    Forms.createHidden(frm, 'items', selected.join(','));
-    frm.submit();
-  }
-  function addCurrentPage()
-  {
-    var frm = document.forms['addReporters'];
-    frm.which.value = 'page';
-    frm.submit();
-  }
-  function addAll()
-  {
-    var frm = document.forms['addReporters'];
-    frm.which.value = 'all';
-    frm.submit();
-  }
-  </script>
-  </base:head>
-  
+<base:page type="popup" title="Add reporters" id="add-page">
+  <base:head scripts="~reporters.js" />
   <base:body>
     <h1>Select reporters</h1>
@@ -76 +46 @@
     
     <base:buttongroup subclass="dialogbuttons topborder">
-      <base:button title="Add selected" onclick="addSelected()" />
-      <base:button title="Add current page" onclick="addCurrentPage()" />
-      <base:button title="Add all" onclick="addAll()" />
-      <base:button title="Close" onclick="window.top.close()" />
+      <base:button 
+        id="btnAddSelected"
+        title="Add selected" 
+      />
+      <base:button 
+        id="btnAddCurrentPage"
+        title="Add current page"
+      />
+      <base:button 
+        id="btnAddAll"
+        title="Add all" 
+      />
+      <base:button 
+        id="close"
+        title="Close" 
+      />
     </base:buttongroup>
     

trunk/www/views/reporterlists/reporters/list_reporters.jsp

@@ -117 +117 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js,tabcontrol.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
+  <base:page title="<%=title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,tabcontrol-2.js,~reporters.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'reporters';
-    function editItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, true);
-    }
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      Table.itemOnClick(formId, evt, itemId, '<%=mode.getName()%>', viewItem, editItem, returnSelected);
-    }
-    function addItems()
-    {
-      Main.openPopup('add_reporters_frameset.jsp?ID=<%=ID%>&reporterlist_id=<%=reporterListId%>', 'AddReporters', 1050, 700);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      var numChecked = Forms.numChecked(frm);
-      if (numChecked == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      else
-      {
-        var rep = numChecked == 1 ? 'reporter' : 'reporters';
-        if (!confirm('You are about to delete '+numChecked+' '+rep+' from the reporter list. This can\'t be undone. Continue?'))
-        {
-          return;
-        }
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    function switchTab(tabControlId, tabId)
-    {
-      if (tabId == 'properties')
-      {
-        location.href = '../index.jsp?ID=<%=ID%>&cmd=ViewItem&item_id=<%=reporterListId%>&tab='+tabId;
-      }
-      else
-      {
-        TabControl.setActiveTab(tabControlId, tabId);
-      }
-    }
-    </script>
   </base:head>
   
@@ -197 +132 @@
       id="main" 
       subclass="mastertabcontrol content"
-      active="reporters" switch="switchTab">
+      active="reporters">
     <t:tab id="properties" title="Properties" />
     
@@ -361 +296 @@
           >
           <tbl:button 
+            id="btnAddReporters"
             disabled="<%=!writePermission%>" 
             image="add.png" 
-            onclick="addItems()" 
             title="Add&hellip;" 
             tooltip="<%=writePermission ? "Add reporters to this list" : "You do not have permission to add reporters" %>" 
           />
           <tbl:button 
+            id="btnRemoveReporters"
             disabled="<%=!deletePermission%>" 
             image="delete.png" 
-            onclick="deleteItems()" 
             title="Remove&hellip;" 
             tooltip="<%=deletePermission ? "Remove the selected items from this list" : "You do not have permission to remove reporters" %>" 
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button 
+            id="btnImport"
+            data-plugin-type="IMPORT"
             image="import.png" 
-            onclick="runPlugin('ImportItems')" 
             title="Import&hellip;" 
             tooltip="Import data" 
@@ -388 +324 @@
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -395 +332 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -496 +434 @@
                   visible="<%=mode.hasIcons()%>"
                   >&nbsp;</tbl:header>
-                <tbl:cell column="name"><div class="link" 
-                  onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)" 
+                <tbl:cell column="name"><div
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="<%=writePermission ? 0 : 1 %>" 
+                  tabindex="0"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -544 +485 @@
 
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
 

trunk/www/views/reporterlists/view_reporterlist.jsp

@@ -94 +94 @@
   ExtensionsInvoker invoker = ToolbarUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title%>">
-  <base:head scripts="tabcontrol.js" styles="toolbar.css,headertabcontrol.css,path.css,table.css">
+  <base:page title="<%=title%>" id="view-page">
+  <base:head scripts="tabcontrol-2.js,~reporterlists.js" styles="toolbar.css,headertabcontrol.css,path.css,table.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    function editItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, true);
-    }
-    function shareItem()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=ShareItem&item_id=<%=itemId%>', 'ShareReporterList', 600, 400);
-    }
-    function deleteItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=DeleteItem&item_id=<%=itemId%>');
-    }
-    function restoreItem()
-    {
-      location.replace('index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_id=<%=itemId%>');
-    }
-    function deleteItemPermanently()
-    {
-      Main.deleteItemPermanently('<%=ID%>', true, '<%=itemType.name()%>', <%=itemId%>, '&callback=itemDeleted');
-    }
-    function itemDeleted()
-    {
-      Main.listItems('<%=ID%>', '<%=itemType.name()%>');
-    }
-    function showUsingItems()
-    {
-      Main.showUsingItems('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>);
-    }
-    function setOwner()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=SetOwnerOfItem&item_id=<%=itemId%>', 'SetOwnerOfItem', 450, 300);
-    }
-    function runPlugin(cmd)
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 750, 500);
-    }
-    function viewReporters()
-    {
-      location.href = 'reporters/index.jsp?ID=<%=ID%>&cmd=List&reporterlist_id=<%=itemId%>';
-    }
-    function switchTab(tabControlId, tabId)
-    {
-      if (tabId == 'reporters')
-      {
-        viewReporters();
-      }
-      else
-      {
-        TabControl.setActiveTab(tabControlId, tabId);
-      }
-    }
-    function merge(mergeType)
-    {
-      Main.openPopup('merge.jsp?ID=<%=ID%>&item_id=<%=itemId%>&mergeType='+mergeType, 'Union', 600, 400);
-    }
-    </script>
   </base:head>
   <base:body>
@@ -161 +104 @@
       /><p:pathelement title="<%=HTML.encodeTags(reporterList.getName())%>" 
       /></p:path>
+    <div id="page-data" data-item-id="<%=itemId%>"></div>
     
     <t:tabcontrol 
       id="main" 
       subclass="content mastertabcontrol" 
-      active="properties" switch="switchTab">
+      active="properties">
     <t:tab id="properties" title="Properties">
       <div>
@@ -177 +121 @@
           />
           <base:icon 
+            id="btnDeletePermanently"
             image="deleted.png"
-            onclick="deleteItemPermanently()"
             tooltip="This item has been flagged for deletion. Click to delete it now."
             enabled="<%=deletePermanentlyPermission %>"
             visible="<%=isRemoved%>" 
           />
-          <base:icon image="used.png" 
-            onclick="showUsingItems()"
+          <base:icon 
+            id="btnUsingItems"
+            image="used.png" 
             tooltip="This item is used by other items and can't be permanently deleted. Show the items that are using this one"
             visible="<%=isRemoved && isUsed%>" />
@@ -191 +136 @@
           <tbl:toolbar subclass="bottomborder">
             <tbl:button 
+              id="btnEdit"
               disabled="<%=!writePermission%>" 
               image="edit.png" 
-              onclick="editItem()" 
               title="Edit&hellip;" 
               tooltip="<%=writePermission ? "Edit this reporter list" : "You do not have permission to edit this reporter list"%>" 
             />
             <tbl:button 
+              id="btnDelete"
               disabled="<%=!deletePermission%>" 
               image="delete.png" 
-              onclick="deleteItem()" 
               title="Delete"
               visible="<%=!reporterList.isRemoved()%>"
@@ -206 +151 @@
             />
             <tbl:button 
+              id="btnRestore"
               disabled="<%=!writePermission%>" 
               image="restore.png" 
-              onclick="restoreItem()" 
               title="Restore"
               visible="<%=reporterList.isRemoved()%>"
@@ -214 +159 @@
             />
             <tbl:button 
+              id="btnShare"
               disabled="<%=!sharePermission%>"
               image="share.png"
-              onclick="shareItem()" 
               title="Share&hellip;" 
               tooltip="<%=sharePermission ? "Share this reporter list to other user, groups and projects" : "You do not have permission to share this formula"%>"
             />
             <tbl:button 
+              id="btnSetOwner"
               disabled="<%=!setOwnerPermission%>"
               image="take_ownership.png"
-              onclick="setOwner()" 
               title="Set owner&hellip;"
               tooltip="<%=setOwnerPermission ? "Change owner of this item" : "You do not have permission to change ownership of this item"%>"
             />
             <tbl:button
+              id="btnMergeUnion"
+              data-merge-type="union"
               visible="<%=writePermission%>"
               image="set_operations/union_small.png"
-              onclick="merge('union')"
               title="Union&hellip;"
               tooltip="Add reporters from other lists to this list"
             />
             <tbl:button
+              id="btnMergeIntersection"
+              data-merge-type="intersection"
               visible="<%=writePermission%>"
               image="set_operations/intersection_small.png"
-              onclick="merge('intersection')"
               title="Intersection&hellip;"
               tooltip="Keep only reporters that are present in other lists"
             />
             <tbl:button
+              id="btnMergeComplement"
+              data-merge-type="complement"
               visible="<%=writePermission%>"
               image="set_operations/complement_small.png"
-              onclick="merge('complement')"
               title="Complement&hellip;"
               tooltip="Remove reporters in other lists from this list"
             />
             <tbl:button 
+              id="btnImport"
               image="import.png" 
-              onclick="runPlugin('ImportItem')" 
+              data-plugin-type="IMPORT"  
               title="Import&hellip;" 
               tooltip="Import data" 
@@ -256 +205 @@
             />
             <tbl:button 
-              image="export.png" 
-              onclick="runPlugin('ExportItem')" 
+              id="btnExport"
+              image="export.png"
+              data-plugin-type="EXPORT" 
               title="Export&hellip;" 
               tooltip="Export data" 
@@ -263 +213 @@
             />
             <tbl:button 
-              image="runplugin.png" 
-              onclick="runPlugin('RunPlugin')" 
+              id="btnRunPlugin"
+              image="runplugin.png"  
+              data-plugin-type="OTHER" 
               title="Run plugin&hellip;" 
               tooltip="Run a plugin" 
@@ -273 +224 @@
             <tbl:button
               image="help.png"
-              onclick="<%="Main.openHelp('" + ID +"', 'reporterlist.view.properties')"%>"
+              subclass="auto-init"
+              data-auto-init="help"
+              data-help-id="reporterlist.view.properties"
               title="Help&hellip;"
               tooltip="Get help about this page"

trunk/www/views/reporters/list_reporters.jsp

@@ -111 +111 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title==null ? "Reporters" : title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="<%=title==null ? "Reporters" : title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,~reporters.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'reporters';
-    function newItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', 0, true);
-    }
-    function editItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, true);
-    }
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      Table.itemOnClick(formId, evt, itemId, '<%=mode.getName()%>', viewItem, editItem, returnSelected);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      var numChecked = Forms.numChecked(frm);
-      if (numChecked == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      else
-      {
-        var rep = numChecked == 1 ? 'reporter' : 'reporters';
-        if (!confirm('You are about to delete '+numChecked+' '+rep+'. This can\'t be undone. Continue?'))
-        {
-          return;
-        }
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    function newReporterList()
-    {
-      Table.submitToPopup(formId, 'CreateReporterList', 600, 400);
-    }
-    </script>
   </base:head>
   
@@ -336 +278 @@
         >
         <tbl:button 
+          id="btnNewItem"
           disabled="<%=!createPermission%>" 
           image="new.png" 
-          onclick="newItem()" 
           title="New&hellip;" 
           tooltip="<%=createPermission ? "Create a new reporter" : "You do not have permission to create reporter"%>" 
         />
         <tbl:button 
+          id="btnDeleteItems"
+          data-confirm="1"
           disabled="<%=!deletePermission%>" 
           image="delete.png" 
-          onclick="deleteItems()" 
           title="Delete&hellip;" 
           tooltip="<%=deletePermission ? "Delete the selected items" : "You do not have permission to delete reporters" %>" 
         />
         <tbl:button 
+          id="btnColumns"
           image="columns.png" 
-          onclick="configureColumns()" 
           title="Columns&hellip;" 
           tooltip="Show, hide and re-order columns" 
         />
         <tbl:button
+          id="btnNewReporterList"
           image="add.png"
-          onclick="newReporterList()"
           title="New reporter list&hellip;"
           tooltip="Create a new reporter list from matching reporters"
@@ -363 +306 @@
         />
         <tbl:button 
+          id="btnImport"
+          data-plugin-type="IMPORT"
           image="import.png" 
-          onclick="runPlugin('ImportItems')" 
           title="Import&hellip;" 
           tooltip="Import data" 
@@ -370 +314 @@
         />
         <tbl:button 
+          id="btnExport"
+          data-plugin-type="EXPORT"
           image="export.png" 
-          onclick="runPlugin('ExportItems')" 
           title="Export&hellip;" 
           tooltip="Export data" 
@@ -377 +322 @@
         />
         <tbl:button 
+          id="btnRunPlugin"
+          data-plugin-type="OTHER"
           image="runplugin.png" 
-          onclick="runPlugin('RunListPlugin')" 
           title="Run plugin&hellip;" 
           tooltip="Run a plugin" 
@@ -477 +423 @@
                   visible="<%=mode.hasIcons()%>"
                   >&nbsp;</tbl:header>
-                <tbl:cell column="name"><div class="link" 
-                  onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)" 
+                <tbl:cell column="name"><div
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="<%=writePermission ? 0 : 1 %>" 
+                  tabindex="0"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
@@ -531 +480 @@
     </div>
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
   </base:body>

trunk/www/views/reporters/view_reporter.jsp

@@ -90 +90 @@
   ExtensionsInvoker invoker = ToolbarUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title%>">
-  <base:head scripts="tabcontrol.js" styles="toolbar.css,headertabcontrol.css,path.css">
+  <base:page title="<%=title%>" id="view-page">
+  <base:head scripts="tabcontrol-2.js,~reporters.js" styles="toolbar.css,headertabcontrol.css,path.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    function editItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, true);
-    }
-    function deleteItem()
-    {
-      if (confirm('This can\'t be undone. Continue?'))
-      {
-        location.replace('index.jsp?ID=<%=ID%>&cmd=DeleteItem&item_id=<%=itemId%>');
-      }
-    }
-    function runPlugin(cmd)
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 750, 500);
-    }
-    </script>
   </base:head>
   <base:body>
@@ -117 +100 @@
       /><p:pathelement title="<%=HTML.encodeTags(reporter.getName())%>" 
       /></p:path>
+    <div id="page-data" data-item-id="<%=itemId%>"></div>
     
     <t:tabcontrol 
@@ -130 +114 @@
           <tbl:toolbar subclass="bottomborder">
             <tbl:button 
+              id="btnEdit"
               disabled="<%=!writePermission%>" 
               image="edit.png" 
-              onclick="editItem()" 
               title="Edit&hellip;" 
               tooltip="<%=writePermission ? "Edit this reporter" : "You do not have permission to edit this reporter"%>" 
             />
             <tbl:button 
+              id="btnDelete"
+              data-confirm="1"
               disabled="<%=!deletePermission%>" 
               image="delete.png" 
-              onclick="deleteItem()" 
               title="Delete&hellip;" 
               tooltip="<%=deletePermission ? "Delete this reporter" : "You do not have permission to delete this reporter"%>" 
             />
             <tbl:button 
+              id="btnImport"
               image="import.png" 
-              onclick="runPlugin('ImportItem')" 
+              data-plugin-type="IMPORT"  
               title="Import&hellip;" 
               tooltip="Import data" 
@@ -151 +137 @@
             />
             <tbl:button 
-              image="export.png" 
-              onclick="runPlugin('ExportItem')" 
+              id="btnExport"
+              image="export.png"
+              data-plugin-type="EXPORT" 
               title="Export&hellip;" 
               tooltip="Export data" 
@@ -158 +145 @@
             />
             <tbl:button 
-              image="runplugin.png" 
-              onclick="runPlugin('RunPlugin')" 
+              id="btnRunPlugin"
+              image="runplugin.png"  
+              data-plugin-type="OTHER" 
               title="Run plugin&hellip;" 
               tooltip="Run a plugin" 
@@ -166 +154 @@
             <tbl:button
               image="help.png"
-              onclick="<%="Main.openHelp('" + ID +"', 'reporter.view.properties')"%>"
+              subclass="auto-init"
+              data-auto-init="help"
+              data-help-id="reporter.view.properties"
               title="Help&hellip;"
               tooltip="Get help about this page"

trunk/www/views/sessions/list_sessions.jsp

@@ -100 +100 @@
   ExtensionsInvoker columnsInvoker = ListColumnUtil.useExtensions(jspContext);
   %>
-  <base:page title="<%=title==null ? "Sessions" : title%>" type="<%=mode.getPageType()%>">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="<%=title==null ? "Sessions" : title%>" type="<%=mode.getPageType()%>" id="list-page">
+  <base:head scripts="table.js,~sessions.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'sessions';
-    function viewItem(itemId)
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, false);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      viewItem(itemId);
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function runPlugin(cmd)
-    {
-      Table.submitToPopup(formId, cmd, 750, 500);
-    }
-    function returnSelected()
-    {
-      Table.returnSelected(formId, <%=callback != null ? "window.opener."+callback : "null" %>);
-      window.close();
-    }
-    </script>
   </base:head>
   
@@ -243 +218 @@
           >
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
           />
           <tbl:button 
+            id="btnExport"
+            data-plugin-type="EXPORT"
             image="export.png" 
-            onclick="runPlugin('ExportItems')" 
             title="Export&hellip;" 
             tooltip="Export data" 
@@ -256 +232 @@
           />
           <tbl:button 
+            id="btnRunPlugin"
+            data-plugin-type="OTHER"
             image="runplugin.png" 
-            onclick="runPlugin('RunListPlugin')" 
             title="Run plugin&hellip;" 
             tooltip="Run a plugin" 
@@ -357 +334 @@
                   >&nbsp;</tbl:header>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
-                <tbl:cell column="loginTime"><div class="link" onclick="itemOnClick(event, <%=itemId%>)" 
+                <tbl:cell column="loginTime"><div 
+                  class="link table-item"
+                  data-item-id="<%=itemId%>"
+                  data-no-edit="1"
+                  tabindex="0"
                   title="<%=tooltip%>"><%=dateTimeFormatter.format(item.getLoginTime())%></div></tbl:cell>
                 <tbl:cell column="logoutTime" value="<%=item.getLogoutTime()%>" />
@@ -402 +383 @@
     
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="returnSelected();" title="Ok" visible="<%=mode.hasOkButton()%>" />
-      <base:button onclick="window.close();" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
-      <base:button onclick="window.close();" title="Close" visible="<%=mode.hasCloseButton()%>" />
+      <base:button id="btnOk" title="Ok" visible="<%=mode.hasOkButton()%>" />
+      <base:button id="close" title="Cancel" visible="<%=mode.hasCancelButton()%>" />
+      <base:button id="close" title="Close" visible="<%=mode.hasCloseButton()%>" />
     </base:buttongroup>
     

trunk/www/views/sessions/view_session.jsp

@@ -89 +89 @@
   Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
   %>
-  <base:page type="popup" title="<%=title%>">
-  <base:head>
-  </base:head>
+  <base:page type="popup" title="<%=title%>" id="view-page">
+  <base:head scripts="~sessions.js" />
   <base:body>
     
     <h1><%=title%> <base:help helpid="session.view" /></h1>
+    <div id="page-data" data-item-id="<%=itemId%>"></div>
+    
     <div class="content">
       <table class="fullform bottomborder outlined">
@@ -128 +129 @@
     </div>
     <base:buttongroup subclass="dialogbuttons">
-      <base:button onclick="window.close()" title="Close" />
+      <base:button id="close" title="Close" />
     </base:buttongroup>
 

trunk/www/views/trashcan/index.jsp

@@ -119 +119 @@
     sc.setSessionSetting("progress.trashcan", progress);
     int numRemoved = Trashcan.delete(sc, items, false, progress);
-
+  
     if (numTotal != numRemoved)
     {

trunk/www/views/trashcan/list_trash.jsp

@@ -104 +104 @@
       "net.sf.basedb.clients.web.listcolumn.trashcan");
   %>
-  <base:page title="Trashcan">
-  <base:head scripts="table.js" styles="table.css,toolbar.css">
+  <base:page title="Trashcan" id="list-page">
+  <base:head scripts="table.js,~trash.js" styles="table.css,toolbar.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'trashcan';
-    function viewItem(itemId)
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=ViewItem&item_id='+itemId, 'ViewJob', 750, 500);
-    }
-    function itemOnClick(evt, itemId)
-    {
-      viewItem(itemId);
-    }
-    function deleteAllItems()
-    {
-      if (!confirm('You are about to PERMANENTLY DELETE all item.\n This can\'t be undone. Continue?'))
-      {
-        return;
-      }
-      Main.openPopup('../../common/progress_reporter.jsp?ID=<%=ID%>&progress=trashcan&title=Empty trashcan', 'Progress', 400, 200);
-      var frm = document.forms[formId];
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteAllPermanently';
-      frm.submit();
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      var numChecked = Forms.numChecked(frm, /item:/);
-      if (numChecked == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      else
-      {
-        var items = numChecked == 1 ? 'item' : 'items';
-        if (!confirm('You are about to PERMANENTLY DELETE '+numChecked+' '+items+'.\n This can\'t be undone. Continue?'))
-        {
-          return;
-        }
-      }
-      Main.openPopup('../../common/progress_reporter.jsp?ID=<%=ID%>&progress=trashcan&title=Delete items', 'Progress', 400, 200);
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItemsPermanently';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      if (Forms.numChecked(frm, /item:/) == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function configureColumns()
-    {
-      Table.configureColumns(formId);
-    }
-    function showUsingItems(itemType, itemId)
-    {
-      var url = 'index.jsp?ID=<%=ID%>&cmd=ViewUsingItems&item_type='+itemType+'&item_id='+itemId;
-      location.href = url;
-    }
-    </script>
   </base:head>
   
@@ -222 +155 @@
         <tbl:toolbar subclass="bottomborder">
           <tbl:button
+            id="btnDeleteAllItems"
             image="deleteall.png"
-            onclick="deleteAllItems()"
             title="Empty trash&hellip;"
             tooltip="Delete all items from the trashcan"
@@ -229 +162 @@
           />
           <tbl:button 
+            id="btnDeleteItems"
             image="delete_permanently.png"
-            onclick="deleteItems()" 
             title="Delete permanently&hellip;" 
             tooltip="Delete the selected items permanently" 
@@ -236 +169 @@
           />
           <tbl:button 
+            id="btnRestoreItems"
             image="restore.png"
-            onclick="restoreItems()" 
             title="Restore" 
             tooltip="Restore the selected items"
@@ -243 +176 @@
           />
           <tbl:button 
+            id="btnColumns"
             image="columns.png" 
-            onclick="configureColumns()" 
             title="Columns&hellip;" 
             tooltip="Show, hide and re-order columns" 
@@ -343 +276 @@
                   clazz="icons" 
                   ><base:icon 
-                    image="used.png" 
+                    subclass="link auto-init"
+                    data-auto-init="show-using-items"
+                    data-item-type="<%=item.getType().name() %>"
+                    data-item-id="<%=itemId %>"
+                    image="used.png"
                     tooltip="This item is used by other items and cannot be deleted"
                     visible="<%=isUsed%>"
-                    onclick="<%="showUsingItems('" + item.getType().name() + "', " +  itemId + ")"%>"
                   />&nbsp;</tbl:header>
                 <tbl:cell column="type"><%=item.getType()%></tbl:cell>

trunk/www/views/trashcan/view_item.jsp

@@ -119 +119 @@
     "net.sf.basedb.clients.web.toolbar.item.trashcan");
   %>
-  <base:page title="<%="Trashcan - " + HTML.encodeTags(name) %>">
-  <base:head scripts="tabcontrol.js,table.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
+  <base:page title="<%="Trashcan - " + HTML.encodeTags(name) %>" id="view-page">
+  <base:head scripts="tabcontrol-2.js,table.js,~trash.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
     <ext:scripts context="<%=jspContext%>" />
     <ext:stylesheets context="<%=jspContext%>" />
-    <script>
-    var submitPage = 'index.jsp';
-    var formId = 'usingItems';
-    function editItem()
-    {
-      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, true);
-    }
-    function shareItem()
-    {
-      var controller = Main.getController('<%=itemType.name()%>');
-      var url = getRoot() + controller.url + '?ID=<%=ID%>&cmd=ShareItem&item_id=<%=itemId%>';
-      Main.openPopup(url, 'ShareItem', 600, 400);
-    }
-    function restoreItem()
-    {
-      var controller = Main.getController('<%=itemType.name()%>');
-      url = 'index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_type=<%=itemType.name()%>&item_id=<%=itemId%>';      
-      url += '&itemsIndexPage=' + getRoot() + controller.url;
-      location.replace(url);
-    }
-    function deleteItem()
-    {
-      if (!confirm('You are about to PERMANENTLY DELETE this item.\n This can\'t be undone. Continue?'))
-      {
-        return;
-      }
-      var url = 'index.jsp?ID=<%=ID%>&cmd=DeleteItem&item_type=<%=itemType.name()%>&item_id=<%=itemId%>';
-      location.replace(url);
-    }
-    function deleteItems()
-    {
-      var frm = document.forms[formId];
-      var numChecked = Forms.numChecked(frm, /item:/);
-      if (numChecked == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'DeleteItems';
-      frm.submit();
-    }
-    function restoreItems()
-    {
-      var frm = document.forms[formId];
-      var numChecked = Forms.numChecked(frm, /item:/);
-      if (numChecked == 0)
-      {
-        Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-        return; 
-      }
-      frm.action = submitPage;
-      frm.cmd.value = 'RestoreItems';
-      frm.submit();
-    }
-    function showUsingItems(itemType, itemId)
-    {
-      var url = 'index.jsp?ID=<%=ID%>&cmd=ViewUsingItems&item_type='+itemType+'&item_id='+itemId;
-      location.href = url;
-    }
-    
-  </script>
   </base:head>
   <base:body>
@@ -190 +128 @@
       /><p:pathelement title="<%=itemType.toString() + ": " + HTML.encodeTags(name)%>"
       /></p:path>
+    <div id="page-data" data-item-id="<%=itemId%>" data-item-type="<%=itemType.name()%>"></div>
 
     <t:tabcontrol id="main" subclass="content mastertabcontrol">
@@ -207 +146 @@
             visible="<%=isRemoved%>" 
           />
-          <base:icon image="used.png" 
-            tooltip="This item is used by other items and can't be permanently deleted. Show the items that are using this one"
+          <base:icon
+            image="used.png" 
+            tooltip="This item is used by other items and can't be permanently deleted."
             visible="<%=isUsed%>" />
         </th>
         <td style="padding: 0px;">
           <tbl:toolbar subclass="bottomborder">
-
             <tbl:button 
+              id="btnEdit"
               disabled="<%=!writePermission%>" 
               image="edit.png" 
-              onclick="editItem()" 
               title="Edit&hellip;" 
               tooltip="<%=writePermission ? "Edit this item" : "You do not have permission to edit this item"%>" 
             />
             <tbl:button 
+              id="btnDeleteItem"
               disabled="<%=!deletePermission%>" 
               image="delete_permanently.png" 
-              onclick="deleteItem()" 
               title="Delete permanently&hellip;"
               visible="<%=!isUsed%>"
@@ -230 +169 @@
             />
             <tbl:button 
+              id="btnRestore"
               disabled="<%=!writePermission%>" 
               image="restore.png" 
-              onclick="restoreItem()" 
               title="Restore"
               visible="<%=isRemoved%>"
               tooltip="<%=writePermission ? "Restore this item" : "You do not have permission to restore this item"%>" 
             />
-            <tbl:button 
+            <tbl:button
+              id="btnShare" 
               disabled="<%=!sharePermission%>"
               image="share.png"
-              onclick="shareItem()" 
               title="Share&hellip;" 
               visible="<%=shareable != null%>"
@@ -249 +188 @@
             <tbl:button
               image="help.png"
-              onclick="<%="Main.openHelp('" + ID +"', 'trash.view.properties')"%>"
+              subclass="auto-init"
+              data-auto-init="help"
+              data-help-id="trash.view.properties"
               title="Help&hellip;"
               tooltip="Get help about this page"
@@ -282 +223 @@
           <tbl:toolbar subclass="leftborder topborder rightborder">
             <tbl:button 
+              id="btnDeleteItems"
               image="delete.png"
-              onclick="deleteItems()" 
               title="Delete" 
               tooltip="Mark the selected items for deletion" 
             />
             <tbl:button 
-              image="restore.png"
-              onclick="restoreItems()" 
+              id="btnRestoreItems"
+              image="restore.png" 
               title="Restore" 
               tooltip="Restore the selected item" 
@@ -297 +238 @@
             id="usingItems"
             columns="all"
+            action="index.jsp"
+            sc="<%=sc%>"
           >
           <tbl:hidden 
@@ -415 +358 @@
                   />
                   <base:icon 
+                    subclass="link auto-init"
+                    data-auto-init="show-using-items"
+                    data-item-type="<%=proxy.getType().name() %>"
+                    data-item-id="<%=proxy.getId() %>"
                     image="used.png"
                     tooltip="This item is used by other items"
                     visible="<%=usedByIsRemoved &&  usedByIsUsed%>"
-                    onclick="<%="showUsingItems('" + usedBy.getType().name() + "', " +  usedBy.getId() + ")"%>"
                   />&nbsp;</tbl:header>
                 <tbl:cell column="name"><%=Base.getLink(ID, HTML.encodeTags(usedByName), proxy.getType(), proxy.getId(), writePermissionOnUsedBy)%></tbl:cell>