[Erp5-report] r26395 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Apr 10 15:47:40 CEST 2009


Author: fabien
Date: Fri Apr 10 15:47:37 2009
New Revision: 26395

URL: http://svn.erp5.org?rev=26395&view=rev
Log:
update ERP5Site_renderQuickSearchDialog to use ERP5Site_processAdvancedSearch to not make conflict with the top search box.
Split in many forms should be required to avoid this trick, but it's not possible to include a form in the main form. And split in many form is a very big change that will affect all sites and all projects.
So for now we will just use this trick like it is in the km.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_renderQuickSearchDialog.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_renderQuickSearchDialog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_renderQuickSearchDialog.xml?rev=26395&r1=26394&r2=26395&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_renderQuickSearchDialog.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_renderQuickSearchDialog.xml [utf8] Fri Apr 10 15:47:37 2009
@@ -44,10 +44,10 @@
   tal:define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \n
                                                        \'text/html;; charset=utf-8\');">\n
   <div>\n
-    <input type="text" size="40" name="new_advanced_search_text" id="SearchableText" class="autofocus"/>\n
-    <select size="1" class="input" name="new_advanced_search_portal_type">\n
-      <option value="" selected value="" i18n:translate="" i18n:domain="ui">Everything</option>\n
-      <option value="all" selected value="" i18n:translate="" i18n:domain="ui">All Documents</option>\n
+    <input type="text" onkeypress="submitFormOnEnter(event, \'main_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
       <option tal:repeat="ptype here/getPortalDocumentTypeList"\n
               tal:attributes="value ptype"\n
               tal:content="python:ptype"\n
@@ -57,7 +57,7 @@
       <option value="Person" i18n:translate="" i18n:domain="ui">Person</option>\n
       <option value="Organisation" i18n:translate="" i18n:domain="ui">Organisation</option>\n
     </select>\n
-    <input type="submit" name="ERP5Site_viewQuickSearchResultList:method" value="Search"\n
+    <input type="submit" name="ERP5Site_processAdvancedSearch:method" value="Search"\n
                          i18n:attributes="value" i18n:domain="ui"/>\n
   </div>\n
 </tal:block>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml?rev=26395&r1=26394&r2=26395&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml [utf8] Fri Apr 10 15:47:37 2009
@@ -343,7 +343,7 @@
                   <input tal:condition="python: not line.isSummary() and line.getObject() is not None"\n
                     type="checkbox" value="checked" name="uids:list"\n
                     tal:attributes="checked python: line.getUid() in checked_uid_set;\n
-                                    value line/getUid;">\n
+                                    value line/getUid;" />\n
                   <tal:block tal:condition="python: line.isSummary() or line.getObject() is None"></tal:block>\n
                 </td>\n
                 <tal:block tal:repeat="value render_result">\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=26395&r1=26394&r2=26395&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Fri Apr 10 15:47:37 2009
@@ -1,1 +1,1 @@
-702
+703




More information about the Erp5-report mailing list