diff --git a/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml b/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml index ce672517e0bf3547a4893dfcbd7aa1f5966a1521..628e5c78ea57ea42df65eb01104216cc86814e2f 100644 --- a/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml +++ b/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml @@ -126,7 +126,7 @@ <fieldset id="fieldset-tiosearch">\n <input type="hidden" name="all_languages" value="1" />\n <input accesskey="4" type="text" size="40" name="field_your_search_text" class="input-text" \n - onkeypress="submitFormOnEnter(event, \'main_form\', \'ERP5Site_viewQuickSearchResultList\');" />\n + onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_viewQuickSearchResultList\');" />\n <input type="submit" class="input-submit" value="" alt="Search"\n name="ERP5Site_viewQuickSearchResultList:method"/> \n </fieldset>\n diff --git a/bt5/tiolive_base/bt/revision b/bt5/tiolive_base/bt/revision index 1758dddccea2b3b02d21228a0d06a45a35c0d861..dc7b54ad014355b948b93c4c6c5891da053d5fdd 100644 --- a/bt5/tiolive_base/bt/revision +++ b/bt5/tiolive_base/bt/revision @@ -1 +1 @@ -32 \ No newline at end of file +33 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_renderQuickSearchDialog.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_renderQuickSearchDialog.xml index a92e3f5cdee625595f8ecb839199dc34bbf294ce..d3b75123becfb00aa8feb8c26594036ae6efb26c 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_renderQuickSearchDialog.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_renderQuickSearchDialog.xml @@ -44,7 +44,7 @@ tal:define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \n \'text/html;; charset=utf-8\');">\n <div>\n - <input type="text" onkeypress="submitFormOnEnter(event, \'main_form\', \'ERP5Site_processAdvancedSearch\');" class="input-text" name="top_your_search_text" size="40" accesskey="4"/>\n + <input type="text" onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_processAdvancedSearch\');" class="input-text" name="top_your_search_text" size="40" accesskey="4"/>\n <select size="1" class="input" name="top_your_search_portal_type">\n <option value="" selected="selected" i18n:translate="" i18n:domain="ui">Everything</option>\n <option value="all" i18n:translate="" i18n:domain="ui">All Documents</option>\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml index 49f1ae718bab2f5cb95384a9d8f4a2cdcb91c329..6c230a97824e003a52c692651d66a4715e439fdb 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml @@ -83,7 +83,7 @@ tal:condition="python:here.getParamDict().has_key(\'your_search_text\')"\n type="text"\n onkeypress="submitFormOnEnter(event, \n - \'main_form\',\n + this.form,\n \'ERP5Site_processAdvancedSearch\');"\n tal:attributes="value python:here.getParamDict()[\'your_search_text\']"/>\n \n @@ -93,7 +93,7 @@ tal:condition="python:not here.getParamDict().has_key(\'your_search_text\')"\n type="text"\n onkeypress="submitFormOnEnter(event, \n - \'main_form\',\n + this.form,\n \'ERP5Site_processAdvancedSearch\');">\n \n <input class="button" \n @@ -360,7 +360,7 @@ tal:condition="python:here.getParamDict().has_key(\'your_search_text\')"\n type="text" \n onkeypress="submitFormOnEnter(event, \n - \'main_form\',\n + this.form,\n \'ERP5Site_processAdvancedSearchBottom\');"\n tal:attributes="value python:here.getParamDict()[\'your_search_text\']"/>\n \n @@ -370,7 +370,7 @@ tal:condition="python:not here.getParamDict().has_key(\'your_search_text\')"\n type="text"\n onkeypress="submitFormOnEnter(event, \n - \'main_form\',\n + this.form,\n \'ERP5Site_processAdvancedSearchBottom\');"/>\n \n <input class="button" \n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml index 950c927938c5c6ac17f776f6fd9b166c9fbf14e2..cde9a9b0bdd410de6798755f17a29453798be879 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml @@ -430,7 +430,7 @@ <input name="advanced_search_text" size="40" value=""\n type="text" tal:attributes="value python:here.getParamDict()[\'advanced_search_text\']"\n onkeypress="submitFormOnEnter(event,\n - \'main_form\',\n + this.form,\n \'ERP5Site_processAdvancedSearch\');"/>\n <input class="button" value="Search" name="ERP5Site_processAdvancedSearch:method" type="submit" />\n \n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml index fb8f1ae2f3342b4ce61f32063997db417c8b7bee..2729836eed7371ab361951528f2ae1367be5009b 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml @@ -183,11 +183,11 @@ function fixLeftRightHeightAndFocus(fix_height) {\n \n // This function can be used to catch ENTER pressed in an input \n // and modify respective main form action\n -function submitFormOnEnter(event, main_form_id, method_name){\n - var key_code = event.keyCode;\n - if(key_code == 13){\n - var main_form = getElement(main_form_id)\n - main_form.action=method_name;};\n +function submitFormOnEnter(event, form, method_name){\n + if(event.keyCode == 13){\n + form.action = method_name;\n + form.submit();\n + }\n }\n \n var old_index=0;\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml index f4dfd919100660f0aece31fc1a019d2afa1deb03..4e27ac8809a60f5d15f867f0b95b3f450336c8eb 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml @@ -122,7 +122,7 @@ <span id="search">\n <input type="hidden" name="all_languages" value="1" />\n <input accesskey="4" type="text" name="field_your_search_text" \n - onkeypress="submitFormOnEnter(event, \'main_form\', \'ERP5Site_viewQuickSearchResultList\');" />\n + onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_viewQuickSearchResultList\');" />\n <button type="submit" name="ERP5Site_viewQuickSearchResultList:method" title="Search"\n i18n:attributes="title" i18n:domain="ui">\n <span class="image"></span>\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 20f3ba5854e8d64eeaaf3ec9e70bda106317866f..6bd680a650ae04a8c4c21984c9267c37dcd331f4 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -710 \ No newline at end of file +711 \ No newline at end of file