[Erp5-report] r40951 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Dec 1 09:27:57 CET 2010
Author: ivan
Date: Wed Dec 1 09:27:57 2010
New Revision: 40951
URL: http://svn.erp5.org?rev=40951&view=rev
Log:
When renaming tab catch ENTER and use it for rename rather than submit whole main ERP5 form.
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=40951&r1=40950&r2=40951&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] Wed Dec 1 09:27:57 2010
@@ -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
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=40951&r1=40950&r2=40951&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] Wed Dec 1 09:27:57 2010
@@ -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(kn
}\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(dial
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>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=40951&r1=40950&r2=40951&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Wed Dec 1 09:27:57 2010
@@ -1 +1 @@
-634
\ No newline at end of file
+635
\ No newline at end of file
More information about the Erp5-report
mailing list