From 008f25004f0cc3d12f3650b0b19499f08bf0f27d Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Thu, 17 Mar 2011 14:00:05 +0000
Subject: [PATCH] Use simply link for "Add gadgets" this way we can use popup
 style for adding a new gadget without a page refresh.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44388 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Base_viewKnowledgePadMacroLibrary.xml      |  3 +--
 .../erp5_knowledge_box.js.xml                  | 18 +++++++-----------
 bt5/erp5_knowledge_pad/bt/revision             |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
index f4236b91a1..f17bc2994c 100644
--- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
+++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
@@ -88,8 +88,7 @@
 <tal:block metal:define-macro="add_new_gadget"\n
            tal:define="active_knowledge_pad_relative_url active_knowledge_pad/getRelativeUrl;">\n
   <a tal:condition="not: isKnowledgePadTemplateUsed"\n
-     onclick="return addNewPad()"\n
-     tal:attributes="onclick string: addNewPad(\'${cancel_url}\',\'${active_knowledge_pad_relative_url}\',\'${mode}\')"\n
+     tal:attributes="href string:Base_viewGadgetListDialog?reset=1&amp;cancel_url=${cancel_url}&amp;mode=${mode}&amp;active_pad_relative_url=${active_knowledge_pad_relative_url}"\n
      title="Add gadgets"\n
      i18n:domain="ui"\n
      i18n:attributes="title"\n
diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
index cd0c2a7ce8..a14dc3063b 100644
--- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
+++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts99770782.61</string> </value>
+            <value> <string>ts00370324.82</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -314,6 +314,11 @@ function loadPadFromServer(pad_relative_url, selected_pad_dom_id, mode){\n
   // set new active pad\n
   active_knowledge_pad_relative_url = pad_relative_url;\n
   \n
+  // update "Add Gadget" link\n
+  current_url = $("#add-gadgets").attr("href");\n
+  new_url = current_url.substring(0, current_url.indexOf("active_pad_relative_url=")+24)+active_knowledge_pad_relative_url\n
+  $("#add-gadgets").attr("href", new_url);\n
+  \n
   //function metadataFetchFailed(meta){}\n
   function handleServerSuccess(data){\n
     body = data.body\n
@@ -328,15 +333,6 @@ function loadPadFromServer(pad_relative_url, selected_pad_dom_id, mode){\n
     setTimeout("$(\'#loading-wrapper\').first().hide();", 250 );};\n
 }\n
 \n
-function addNewPad(cancel_url, knowledge_pad_relative_url, mode){\n
-  // if it\'s first time we switch set active_knowledge_pad_relative_url\n
-  if(active_knowledge_pad_relative_url==\'\'){\n
-    active_knowledge_pad_relative_url = knowledge_pad_relative_url;\n
-  }\n
-  // redirect to add gadget dialog\n
-  window.location=add_new_gadget_form_id + "?reset=1&cancel_url="+cancel_url+"&active_pad_relative_url="+active_knowledge_pad_relative_url+"&mode="+mode; \n
-}\n
-\n
 function addPadOnServerOnEnter(event, mode, cancel_url){\n
   /* Catch and submit form when ENTER is pressed */\n
   if(event.keyCode == 13){\n
@@ -497,7 +493,7 @@ $(document).ready(initialize);\n
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>18445</int> </value>
+            <value> <int>18244</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_knowledge_pad/bt/revision b/bt5/erp5_knowledge_pad/bt/revision
index 2764f7b002..c5321a6e72 100644
--- a/bt5/erp5_knowledge_pad/bt/revision
+++ b/bt5/erp5_knowledge_pad/bt/revision
@@ -1 +1 @@
-708
\ No newline at end of file
+709
\ No newline at end of file
-- 
2.30.9