[Erp5-report] r44388 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Mar 17 15:00:05 2011
New Revision: 44388

URL: http://svn.erp5.org?rev=44388&view=rev
Log:
Use simply link for "Add gadgets" this way we can use popup style for adding a new gadget without a page refresh.

Modified:
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
    erp5/trunk/bt5/erp5_knowledge_pad/bt/revision

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml?rev=44388&r1=44387&r2=44388&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] Thu Mar 17 15:00:05 2011
@@ -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

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml?rev=44388&r1=44387&r2=44388&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml [utf8] Thu Mar 17 15:00:05 2011
@@ -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_
   // 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_
     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>

Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=44388&r1=44387&r2=44388&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Thu Mar 17 15:00:05 2011
@@ -1 +1 @@
-708
\ No newline at end of file
+709
\ No newline at end of file