[limb-svn] r5803 - in 3.x/trunk/limb/cms/template: admin_documents admin_file_folder admin_image_folder admin_media admin_news admin_news_folder admin_tree

svn at limb-project.com svn at limb-project.com
Fri May 4 15:38:18 MSD 2007


Author: pachanga
Date: 2007-05-04 15:38:18 +0400 (Fri, 04 May 2007)
New Revision: 5803
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5803

Modified:
   3.x/trunk/limb/cms/template/admin_documents/display.html
   3.x/trunk/limb/cms/template/admin_file_folder/display.html
   3.x/trunk/limb/cms/template/admin_image_folder/display.html
   3.x/trunk/limb/cms/template/admin_media/index.html
   3.x/trunk/limb/cms/template/admin_news/display.html
   3.x/trunk/limb/cms/template/admin_news_folder/display.html
   3.x/trunk/limb/cms/template/admin_tree/display.html
   3.x/trunk/limb/cms/template/admin_tree/index.html
Log:
-- fixes due to JS package cleanup

Modified: 3.x/trunk/limb/cms/template/admin_documents/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_documents/display.html	2007-05-04 11:37:52 UTC (rev 5802)
+++ 3.x/trunk/limb/cms/template/admin_documents/display.html	2007-05-04 11:38:18 UTC (rev 5803)
@@ -25,7 +25,7 @@
 <div class='actions'>
 <span>
 <core:optional for='object_id'>
-  <route_url params="action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'>
+  <route_url params="action:edit,id:{$id}" extra='?popup=1'>
     <img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='edit'/>
   </route_url>
 </core:optional>
@@ -36,7 +36,7 @@
 
 <div class='actions'>
 <span>
-<route_url params="action:create" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)'>
+<route_url params="action:create" extra='?popup=1&parent={$id}'>
  <img src='/shared/cms/images/icons/create_object.gif' width='24' height='24' alt='create new document here'/>
 </route_url>
 </span>
@@ -74,8 +74,8 @@
       </ul>
       </td>
       <td>
-        <route_url params="action:edit,id:{$node.id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='edit'/></route_url>
-        <route_url params="action:delete" extra='?popup=1&ids[]={$node.id}' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='delete'/></route_url>
+        <route_url params="action:edit,id:{$node.id}" extra='?popup=1'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='edit'/></route_url>
+        <route_url params="action:delete" extra='?popup=1&ids[]={$node.id}'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='delete'/></route_url>
       </td>
     </tr>
   </list:item>
@@ -83,16 +83,16 @@
 
   <div class='list_actions'>
     <route_url_set field='delete_url' params="action:delete" />
-    <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+    <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 
     <route_url_set field='publish_url' params="action:publish" />
-    <input type='submit' value='Publish' onclick='Limb.Form.submit(this.form, "{$publish_url}?popup=1");return false;'/>
+    <input type='submit' value='Publish' onclick='Limb.Form.submitPopup(this.form, "{$publish_url}");return false;'/>
 
     <route_url_set field='unpublish_url' params="action:unpublish" />
-    <input type='submit' value='Unpublish' onclick='Limb.Form.submit(this.form, "{$unpublish_url}?popup=1");return false;'/>
+    <input type='submit' value='Unpublish' onclick='Limb.Form.submitPopup(this.form, "{$unpublish_url}");return false;'/>
 
     <route_url_set field='save_order_url' params="controller:admin_tree,action:save_priority" />
-    <input type='submit' value='Save order' onclick='Limb.Form.submit(this.form, "{$save_order_url}?popup=1");return false;'/>
+    <input type='submit' value='Save order' onclick='Limb.Form.submitPopup(this.form, "{$save_order_url}");return false;'/>
   </div>
 </list:list>
 

Modified: 3.x/trunk/limb/cms/template/admin_file_folder/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_file_folder/display.html	2007-05-04 11:37:52 UTC (rev 5802)
+++ 3.x/trunk/limb/cms/template/admin_file_folder/display.html	2007-05-04 11:38:18 UTC (rev 5803)
@@ -16,7 +16,7 @@
 
 <h2>Folders list</h2>
 
-<route_url params="controller:admin_file_folder,action:create" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)'>
+<route_url params="controller:admin_file_folder,action:create" extra='?popup=1&parent={$id}'>
   <img src='/shared/cms/images/icons/create_object.gif' width='24' height='24' alt='Create folder' />
 </route_url>
 
@@ -35,15 +35,15 @@
     <tr>
       <td><input type='checkbox' name='ids[]' value='{$id}' class='input' runat='client'/></td>
       <td><route_url params='id:{$id}'>{$title}</route_url></td>
-      <td><route_url params="controller:admin_file_folder,action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)' alt='Edit' title='Edit'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' /></route_url>
-          <route_url params="controller:admin_file_folder,action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)' alt='Delete' title='Delete'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' /></route_url>
+      <td><route_url params="controller:admin_file_folder,action:edit,id:{$id}" extra='?popup=1' alt='Edit' title='Edit'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' /></route_url>
+          <route_url params="controller:admin_file_folder,action:delete" extra='?popup=1&ids[]={$id}' alt='Delete' title='Delete'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' /></route_url>
       </td>
     </tr>
   </list:item>
 </table>
   <br/>
   <route_url_set field='delete_url' params="controller:admin_file_folder,action:delete" />
-  <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+  <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 </list:list>
 
 </form>
@@ -56,7 +56,7 @@
 
 <h2>Files list</h2>
 
-<route_url params="controller:admin_file_object,action:create" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)'>
+<route_url params="controller:admin_file_object,action:create" extra='?popup=1&parent={$id}'>
   <img src='/shared/cms/images/icons/create_object.gif' width='24' height='24' alt='Create file' />
 </route_url>
 
@@ -75,15 +75,15 @@
     <tr>
       <td><input type='checkbox' name='ids[]' value='{$id}' class='input' runat='client'/></td>
       <td>{$title}</td>
-      <td><route_url params="controller:admin_file_object,action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit' /></route_url>
-          <route_url params="controller:admin_file_object,action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' alt='Delete' /></route_url>
+      <td><route_url params="controller:admin_file_object,action:edit,id:{$id}" extra='?popup=1'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit' /></route_url>
+          <route_url params="controller:admin_file_object,action:delete" extra='?popup=1&ids[]={$id}'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' alt='Delete' /></route_url>
       </td>
     </tr>
   </list:item>
 </table>
   <br/>
   <route_url_set field='delete_url' params="controller:admin_file_object,action:delete" />
-  <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+  <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 </list:list>
 
 </form>

Modified: 3.x/trunk/limb/cms/template/admin_image_folder/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_image_folder/display.html	2007-05-04 11:37:52 UTC (rev 5802)
+++ 3.x/trunk/limb/cms/template/admin_image_folder/display.html	2007-05-04 11:38:18 UTC (rev 5803)
@@ -17,7 +17,7 @@
 
 <h2>Folders list</h2>
 
-<route_url params="controller:admin_image_folder,action:create" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)' alt='Create folder' title='Create folder'>
+<route_url params="controller:admin_image_folder,action:create" extra='?popup=1&parent={$id}' alt='Create folder' title='Create folder'>
   <img src='/shared/cms/images/icons/create_object.gif' alt='Create folder'/>
 </route_url>
 
@@ -37,8 +37,8 @@
     <tr>
       <td><input type='checkbox' name='ids[]' value='{$id}' class='input' runat='client'/></td>
       <td><route_url params='id:{$id}'>{$title}</route_url></td>
-      <td><route_url params="controller:admin_image_folder,action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit' /></route_url>&nbsp;&nbsp;
-          <route_url params="controller:admin_image_folder,action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' alt='Delete' /></route_url>
+      <td><route_url params="controller:admin_image_folder,action:edit,id:{$id}" extra='?popup=1'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit' /></route_url>&nbsp;&nbsp;
+          <route_url params="controller:admin_image_folder,action:delete" extra='?popup=1&ids[]={$id}'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' alt='Delete' /></route_url>
       </td>
     </tr>
   </list:item>
@@ -46,7 +46,7 @@
 </table>
   <br/>
   <route_url_set field='delete_url' params="controller:admin_image_folder,action:delete" />
-  <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+  <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 </list:list>
 
 </form>
@@ -57,7 +57,7 @@
 
 <h2>Images list</h2>
 
-<route_url params="controller:admin_image,action:create" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)'>
+<route_url params="controller:admin_image,action:create" extra='?popup=1&parent={$id}'>
   <img src='/shared/cms/images/icons/create_object.gif' alt='Create image'/>
 </route_url>
 
@@ -81,8 +81,8 @@
       <td class='left'><input type='checkbox' name='ids[]' value='{$id}' class='input' runat='client'/></td>
       <td align='center'><img src='{$object.icon.show_url}'/></td>
       <td>{$title}</td>
-      <td><route_url params="controller:admin_image,action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit' /></route_url>&nbsp;&nbsp;
-          <route_url params="controller:admin_image,action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' alt='Delete' /></route_url>
+      <td><route_url params="controller:admin_image,action:edit,id:{$id}" extra='?popup=1'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit' /></route_url>&nbsp;&nbsp;
+          <route_url params="controller:admin_image,action:delete" extra='?popup=1&ids[]={$id}'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' alt='Delete' /></route_url>
       </td>
     </tr>
   </list:item>
@@ -90,7 +90,7 @@
 </table>
   <br/>
   <route_url_set field='delete_url' params="controller:admin_image,action:delete" />
-  <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+  <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 </list:list>
 
 </form>

Modified: 3.x/trunk/limb/cms/template/admin_media/index.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_media/index.html	2007-05-04 11:37:52 UTC (rev 5802)
+++ 3.x/trunk/limb/cms/template/admin_media/index.html	2007-05-04 11:38:18 UTC (rev 5803)
@@ -5,7 +5,7 @@
 <core:wrap in='title_zone'>Media list</core:wrap>
 
 <core:wrap in='actions'>
-    <route_url params="action:create" extra='?popup=1' onclick='return Limb.Http.click(this.href);'>Create media</route_url>
+    <route_url params="action:create" extra='?popup=1'>Create media</route_url>
 </core:wrap>
 
   <core:wrap in='table'>
@@ -27,8 +27,8 @@
           </td>
           <td>{$title}</td>
           <td align="center">
-            <route_url params="action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)' title="Edit"><img alt="Edit" title="Edit" src="/shared/cms/icons/edit.gif"/></route_url>
-            <route_url params="action:delete" extra='?ids[]={$id}&popup=1' onclick='return Limb.Http.click(this.href)' title="Delete"><img alt="Delete" title="Delete" src="/shared/cms/icons/delete.gif"/></route_url>
+            <route_url params="action:edit,id:{$id}" extra='?popup=1' title="Edit"><img alt="Edit" title="Edit" src="/shared/cms/icons/edit.gif"/></route_url>
+            <route_url params="action:delete" extra='?ids[]={$id}&popup=1' title="Delete"><img alt="Delete" title="Delete" src="/shared/cms/icons/delete.gif"/></route_url>
           </td>
         </tr>
         </list:ITEM>
@@ -36,7 +36,7 @@
       </table>
       <br/>
       <route_url_set field='delete_url' params="action:delete" />
-      <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+      <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
       </form>
     </list:LIST>
   </core:wrap>

Modified: 3.x/trunk/limb/cms/template/admin_news/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_news/display.html	2007-05-04 11:37:52 UTC (rev 5802)
+++ 3.x/trunk/limb/cms/template/admin_news/display.html	2007-05-04 11:38:18 UTC (rev 5803)
@@ -8,7 +8,7 @@
 <h1>News</h1>
 
 <div class='actions'>
-  <route_url params="action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'>
+  <route_url params="action:edit,id:{$id}" extra='?popup=1'>
     <img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='edit'/>
   </route_url>
 </div>
@@ -17,7 +17,7 @@
 
 <div class='actions'>
 <span>
-<route_url params="controller:admin_news_folder,action:create" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)'>
+<route_url params="controller:admin_news_folder,action:create" extra='?popup=1&parent={$id}'>
  <img src='/shared/cms/images/icons/create_object.gif' width='24' height='24' alt='Create news folder'/>
 </route_url>
 </span>
@@ -49,8 +49,8 @@
           </ul>
         </td>
         <td>
-          <route_url params="controller:admin_news_folder,action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit'/></route_url>
-          <route_url params="controller:admin_news_folder,action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='Delete'/></route_url>
+          <route_url params="controller:admin_news_folder,action:edit,id:{$id}" extra='?popup=1'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit'/></route_url>
+          <route_url params="controller:admin_news_folder,action:delete" extra='?popup=1&ids[]={$id}'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='Delete'/></route_url>
         </td>
       </tr>
     </list:item>
@@ -58,10 +58,10 @@
 
   <div class='list_actions'>
     <route_url_set field='delete_url' params="controller:admin_news_folder,action:delete" />
-    <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+    <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 
     <route_url_set field='save_order_url' params="controller:admin_tree,action:save_priority" />
-    <input type='submit' value='Save order' onclick='Limb.Form.submit(this.form, "{$save_order_url}?popup=1");return false;'/>
+    <input type='submit' value='Save order' onclick='Limb.Form.submitPopup(this.form, "{$save_order_url}");return false;'/>
   </div>
 </list:list>
 
@@ -72,7 +72,7 @@
 
 <div class='actions'>
 <span>
-<route_url params="controller:admin_news_item,action:create" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)'>
+<route_url params="controller:admin_news_item,action:create" extra='?popup=1&parent={$id}'>
  <img src='/shared/cms/images/icons/create_object.gif' width='24' height='24' alt='Create news'/>
 </route_url>
 </span>
@@ -108,8 +108,8 @@
         </ul>
       </td>
       <td>
-        <route_url params="controller:admin_news_item,action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit'/></route_url>
-        <route_url params="controller:admin_news_item,action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='Delete'/></route_url>
+        <route_url params="controller:admin_news_item,action:edit,id:{$id}" extra='?popup=1'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit'/></route_url>
+        <route_url params="controller:admin_news_item,action:delete" extra='?popup=1&ids[]={$id}'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='Delete'/></route_url>
       </td>
     </tr>
   </list:item>
@@ -117,10 +117,10 @@
 
   <div class='list_actions'>
     <route_url_set field='delete_url' params="controller:admin_news_item,action:delete" />
-    <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+    <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 
     <route_url_set field='save_order_url' params="controller:admin_tree,action:save_priority" />
-    <input type='submit' value='Save order' onclick='Limb.Form.submit(this.form, "{$save_order_url}?popup=1");return false;'/>
+    <input type='submit' value='Save order' onclick='Limb.Form.submitPopup(this.form, "{$save_order_url}");return false;'/>
   </div>
 </list:list>
 

Modified: 3.x/trunk/limb/cms/template/admin_news_folder/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_news_folder/display.html	2007-05-04 11:37:52 UTC (rev 5802)
+++ 3.x/trunk/limb/cms/template/admin_news_folder/display.html	2007-05-04 11:38:18 UTC (rev 5803)
@@ -6,7 +6,7 @@
 <h1>News folder "{$title}"</h1>
 
 <div class='actions'>
-  <route_url params="action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'>
+  <route_url params="action:edit,id:{$id}" extra='?popup=1'>
     <img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='edit'/>
   </route_url>
 </div>
@@ -25,7 +25,7 @@
 
 <div class='actions'>
 <span>
-<route_url params="controller:admin_news_folder,action:create" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)'>
+<route_url params="controller:admin_news_folder,action:create" extra='?popup=1&parent={$id}'>
  <img src='/shared/cms/images/icons/create_object.gif' width='24' height='24' alt='Create news folder'/>
 </route_url>
 </span>
@@ -57,8 +57,8 @@
           </ul>
         </td>
         <td>
-          <route_url params="controller:admin_news_folder,action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit'/></route_url>
-          <route_url params="controller:admin_news_folder,action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='Delete'/></route_url>
+          <route_url params="controller:admin_news_folder,action:edit,id:{$id}" extra='?popup=1'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit'/></route_url>
+          <route_url params="controller:admin_news_folder,action:delete" extra='?popup=1&ids[]={$id}'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='Delete'/></route_url>
         </td>
       </tr>
     </list:item>
@@ -66,10 +66,10 @@
 
   <div class='list_actions'>
     <route_url_set field='delete_url' params="controller:admin_news_folder,action:delete" />
-    <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+    <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 
     <route_url_set field='save_order_url' params="controller:admin_tree,action:save_priority" />
-    <input type='submit' value='Save order' onclick='Limb.Form.submit(this.form, "{$save_order_url}?popup=1");return false;'/>
+    <input type='submit' value='Save order' onclick='Limb.Form.submitPopup(this.form, "{$save_order_url}");return false;'/>
   </div>
 </list:list>
 
@@ -80,7 +80,7 @@
 
 <div class='actions'>
 <span>
-<route_url params="controller:admin_news_item,action:create" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)'>
+<route_url params="controller:admin_news_item,action:create" extra='?popup=1&parent={$id}'>
  <img src='/shared/cms/images/icons/create_object.gif' width='24' height='24' alt='Create news'/>
 </route_url>
 </span>
@@ -116,8 +116,8 @@
         </ul>
       </td>
       <td>
-        <route_url params="controller:admin_news_item,action:edit,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit'/></route_url>
-        <route_url params="controller:admin_news_item,action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='Delete'/></route_url>
+        <route_url params="controller:admin_news_item,action:edit,id:{$id}" extra='?popup=1'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit'/></route_url>
+        <route_url params="controller:admin_news_item,action:delete" extra='?popup=1&ids[]={$id}'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24'  alt='Delete'/></route_url>
       </td>
     </tr>
   </list:item>
@@ -125,10 +125,10 @@
 
   <div class='list_actions'>
     <route_url_set field='delete_url' params="controller:admin_news_item,action:delete" />
-    <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+    <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 
     <route_url_set field='save_order_url' params="controller:admin_tree,action:save_priority" />
-    <input type='submit' value='Save order' onclick='Limb.Form.submit(this.form, "{$save_order_url}?popup=1");return false;'/>
+    <input type='submit' value='Save order' onclick='Limb.Form.submitPopup(this.form, "{$save_order_url}");return false;'/>
   </div>
 </list:list>
 

Modified: 3.x/trunk/limb/cms/template/admin_tree/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_tree/display.html	2007-05-04 11:37:52 UTC (rev 5802)
+++ 3.x/trunk/limb/cms/template/admin_tree/display.html	2007-05-04 11:38:18 UTC (rev 5803)
@@ -15,7 +15,7 @@
 <core:optional for='id'>
   Current node path: <b>{$url_path}</b><br/>
 </core:optional>
-<route_url params="action:create_node" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)'>
+<route_url params="action:create_node" extra='?popup=1&parent={$id}'>
   <img src='/shared/cms/images/icons/create_object.gif' width='24' height='24' alt='Create' />
 </route_url>
 
@@ -36,18 +36,18 @@
       <td><input type='checkbox' name='ids[]' value='{$id}' class='input' runat='client'/></td>
       <td><route_url params="id:{$id}">{$title}</route_url></td>
       <td>{$identifier}</td>
-      <td><route_url params="action:edit_node,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit' /></route_url>
-          <route_url params="action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' alt='Delete' /></route_url>
+      <td><route_url params="action:edit_node,id:{$id}" extra='?popup=1'><img src='/shared/cms/images/icons/edit.gif' width='24' height='24' alt='Edit' /></route_url>
+          <route_url params="action:delete" extra='?popup=1&ids[]={$id}'><img src='/shared/cms/images/icons/delete.gif' width='24' height='24' alt='Delete' /></route_url>
       </td>
     </tr>
   </list:item>
 </table>
   <br/>
   <route_url_set field='delete_url' params="action:delete" />
-  <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+  <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 
   <route_url_set field='move_url' params="action:move,id:{$id}" />
-  <input type='submit' value='Move' onclick='Limb.Form.submit(this.form, "{$move_url}?popup=1");return false;'/>
+  <input type='submit' value='Move' onclick='Limb.Form.submitPopup(this.form, "{$move_url}");return false;'/>
 </list:list>
 
 </form>

Modified: 3.x/trunk/limb/cms/template/admin_tree/index.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_tree/index.html	2007-05-04 11:37:52 UTC (rev 5802)
+++ 3.x/trunk/limb/cms/template/admin_tree/index.html	2007-05-04 11:38:18 UTC (rev 5803)
@@ -15,7 +15,7 @@
 <core:optional for='id'>
   Current object uri: <b>{$url_path}</b><br/>
 </core:optional>
-<route_url params="action:create_node" extra='?popup=1&parent={$id}' onclick='return Limb.Http.click(this.href)' alt='Create' title='Create'><img src='/shared/cms/icons/create.gif' width='24' height='24'/>Create new node</route_url>
+<route_url params="action:create_node" extra='?popup=1&parent={$id}' alt='Create' title='Create'><img src='/shared/cms/icons/create.gif' width='24' height='24'/>Create new node</route_url>
 
 <form name='list_form' method='post'>
 
@@ -34,18 +34,18 @@
       <td><route_url params="id:{$id}">{$title}</route_url></td>
       <td>{$identifier}</td>
       <td>{$object_class.title}</td>
-      <td><route_url params="action:edit_node,id:{$id}" extra='?popup=1' onclick='return Limb.Http.click(this.href)' alt='Edit' title='Edit'><img src='/shared/cms/icons/edit.gif' width='24' height='24' /></route_url>
-          <route_url params="action:delete" extra='?popup=1&ids[]={$id}' onclick='return Limb.Http.click(this.href)' alt='Delete' title='Delete'><img src='/shared/cms/icons/delete.gif' width='24' height='24' /></route_url>
+      <td><route_url params="action:edit_node,id:{$id}" extra='?popup=1' alt='Edit' title='Edit'><img src='/shared/cms/icons/edit.gif' width='24' height='24' /></route_url>
+          <route_url params="action:delete" extra='?popup=1&ids[]={$id}' alt='Delete' title='Delete'><img src='/shared/cms/icons/delete.gif' width='24' height='24' /></route_url>
       </td>
     </tr>
   </list:item>
 </table>
   <br/>
   <route_url_set field='delete_url' params="action:delete" />
-  <input type='submit' value='Delete' onclick='Limb.Form.submit(this.form, "{$delete_url}?popup=1");return false;'/>
+  <input type='submit' value='Delete' onclick='Limb.Form.submitPopup(this.form, "{$delete_url}");return false;'/>
 
   <route_url_set field='move_url' params="action:move,id:{$id}" />
-  <input type='submit' value='Move' onclick='Limb.Form.submit(this.form, "{$move_url}?popup=1");return false;'/>
+  <input type='submit' value='Move' onclick='Limb.Form.submitPopup(this.form, "{$move_url}");return false;'/>
 </list:list>
 
 </form>



More information about the limb-svn mailing list