From e4efb43a967d05c4a87bb310f0fddaa3c49bab96 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Wed, 1 Dec 2010 08:27:57 +0000
Subject: [PATCH] When renaming tab catch ENTER and use it for rename rather
 than submit whole main ERP5 form.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40951 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Base_viewKnowledgePadMacroLibrary.xml     | 52 +++++++++----------
 .../erp5_knowledge_box.js.xml                 | 15 ++++--
 bt5/erp5_knowledge_pad/bt/revision            |  2 +-
 3 files changed, 39 insertions(+), 30 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 c8c5809646..a6eaccd0d5 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
@@ -126,33 +126,33 @@
   </div>\n
 \n
   <div id="rename_tab_dialog" \n
-      tal:condition="active_knowledge_pad"\n
-      class="toggable_dialog">\n
+       tal:condition="active_knowledge_pad"\n
+       class="toggable_dialog"\n
+       tal:define="active_knowledge_pad_relative_url active_knowledge_pad/getRelativeUrl">\n
     <h3 i18n:translate="" i18n:domain="ui"> Rename tab </h3>\n
-    <form action="">\n
-      <div>\n
-        <span i18n:translate="" i18n:domain="ui">Tab name</span>:\n
-        <input type="text"\n
-              id="new_knowledge_pad_title"\n
-              name="knowledge_pad_title"\n
-              tal:attributes="value active_knowledge_pad/getTitle"/><br/><br/>\n
-        <button type="button"\n
-                i18n:translate="" \n
-                i18n:domain="ui"\n
-                onclick="toggleElementById(\'rename_tab_dialog\');">Cancel</button>\n
-        <button type="button"\n
-                i18n:translate="" \n
-                i18n:domain="ui"\n
-                id="rename_tab_dialog_rename_button"\n
-                tal:attributes="onclick python: \'renameKnowledgePadToServer(\n
-                \\\'rename_tab_dialog\\\',\n
-                \\\'active_knowledge_pad_title\\\',\n
-                \\\'new_knowledge_pad_title\\\',\n
-                \\\'%s\\\')\' %active_knowledge_pad.getRelativeUrl()">\n
-          Rename \n
-        </button>\n
-      </div>\n
-    </form>\n
+      <span i18n:translate="" i18n:domain="ui">Tab name</span>:\n
+      <input type="text"\n
+             id="new_knowledge_pad_title"\n
+             name="knowledge_pad_title"\n
+             tal:attributes="value active_knowledge_pad/getTitle;\n
+                             onkeypress string:return renameKnowledgePadToServerOnEnter(event,\n
+                                                        \'rename_tab_dialog\',\'active_knowledge_pad_title\',\n
+                                                         \'new_knowledge_pad_title\',\'${active_knowledge_pad_relative_url}\');"/>\n
+      <br/>\n
+      <br/>\n
+      <button type="button"\n
+              i18n:translate="" \n
+              i18n:domain="ui"\n
+              onclick="toggleElementById(\'rename_tab_dialog\');">Cancel</button>\n
+      <button type="button"\n
+              i18n:translate="" \n
+              i18n:domain="ui"\n
+              id="rename_tab_dialog_rename_button"\n
+              tal:attributes="onclick string:renameKnowledgePadToServer(\n
+                                               \'rename_tab_dialog\',\'active_knowledge_pad_title\',\n
+                                               \'new_knowledge_pad_title\',\'${active_knowledge_pad_relative_url}\');">\n
+        Rename \n
+      </button>\n
   </div>\n
 </tal:block>\n
 \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 5c5d4bdc90..f69513e56b 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>ts91117034.62</string> </value>
+            <value> <string>ts91191957.42</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -311,6 +311,15 @@ function removeKnowledgePadFromServer(knowledge_pad_relative_url, mode, base_pat
     }\n
 }\n
 \n
+function renameKnowledgePadToServerOnEnter(event, dialog_id, title_id, \n
+                                    input_id, knowledge_pad_relative_url){\n
+  if(event.keyCode == 13){\n
+    renameKnowledgePadToServer(dialog_id, title_id, input_id, knowledge_pad_relative_url);\n
+    return false;\n
+  }\n
+  return true;\n
+}\n
+\n
 function renameKnowledgePadToServer(dialog_id, title_id, \n
                                     input_id, knowledge_pad_relative_url){\n
   if (is_knowledge_template_used){\n
@@ -323,7 +332,7 @@ function renameKnowledgePadToServer(dialog_id, title_id, \n
     title_element.innerHTML = knowledge_pad_title;\n
     doSimpleXMLHttpRequest("ERP5Site_renameKnowledgePad", \n
                           {knowledge_pad_relative_url: knowledge_pad_relative_url,\n
-                            knowledge_pad_title: knowledge_pad_title});\n
+                           knowledge_pad_title: knowledge_pad_title});\n
   }\n
   //anyway toggle show dialog\n
   toggle(dialog_id);\n
@@ -433,7 +442,7 @@ MochiKit.DOM.addLoadEvent(initialize);\n
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>15998</int> </value>
+            <value> <int>16302</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 dc9e6b20e2..b697ae4122 100644
--- a/bt5/erp5_knowledge_pad/bt/revision
+++ b/bt5/erp5_knowledge_pad/bt/revision
@@ -1 +1 @@
-634
\ No newline at end of file
+635
\ No newline at end of file
-- 
2.30.9