[Erp5-report] r38298 ivan - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTe...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Sep 13 14:05:15 2010
New Revision: 38298

URL: http://svn.erp5.org?rev=38298&view=rev
Log:
Listbox do not need any longer a 'global_search_column_script' as it can use a default update one.
Make sure that global search column acts as a normal search column (i.e. it will be passed to count* & search methods and work fine).
Remove hard coded script to extract global search column value. Use request (resp. selection) to get it.
Add proper i18n.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml?rev=38298&r1=38297&r2=38298&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml [utf8] Mon Sep 13 14:05:15 2010
@@ -62,8 +62,8 @@
               display_style_list here/getDisplayStyleList;\n
               list_style here/getListboxDisplayStyle;\n
               global_search_column here/getGlobalSearchColumn;\n
-              global_search_column_script here/getGlobalSearchColumnScript;\n
-              show_global_search python: global_search_column not in (\'\', None) and global_search_column_script not in (\'\', None);\n
+              global_search_column_script python: here.getGlobalSearchColumnScript() or \'Base_doSelect\';\n
+              show_global_search python: global_search_column not in (\'\', None);\n
               line_list here/query;\n
               listbox_max_lines  python: int(here.getMaxLineNumber());\n
               total_line         python: int(here.total_size);\n
@@ -380,7 +380,9 @@
                 <tal:block tal:condition="python: search_field is None">\n
                   <input tal:condition="python: not is_gadget_mode" \n
                          name="id" size="5" value=""\n
-                         type="text" tal:attributes="name alias; value param"/>\n
+                         type="text" \n
+                         tal:attributes="name alias; value param"\n
+                         onkeypress="submitFormOnEnter(event, this.form, \'Base_doSelect\');"/>\n
                   <!-- Search for gadget mode -->\n
                   <input tal:condition="python: is_gadget_mode" \n
                          tal:define ="params python: {alias:\'this.value\'};"\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml?rev=38298&r1=38297&r2=38298&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml [utf8] Mon Sep 13 14:05:15 2010
@@ -100,23 +100,31 @@
 \n
 <div class=" listbox-full-text-search"\n
      metal:define-macro="listbox_global_search"\n
-     tal:define="search_text real_context/Base_getSearchText">\n
+     tal:define="search_text python: request.get(global_search_column, \n
+                                       selection.params.get(global_search_column));">\n
 \n
   <tal:block tal:condition="not: is_gadget_mode">\n
     <!-- Normal mode -->\n
     <input type="text"\n
+           title="Global Search"\n
+           i18n:domain="ui" i18n:attributes="value; title" \n
            tal:attributes="value search_text;\n
                            name global_search_column;\n
                            onkeypress string: submitFormOnEnter(event, this.form, \'${global_search_column_script}\');"/>\n
     <input class="button" \n
-           i18n:domain="ui" i18n:attributes="value"\n
-           value="Search"  type="submit" \n
+           value="Search"  \n
+           type="submit"\n
+           title="Search"\n
+           i18n:domain="ui" i18n:attributes="value; title" \n
            tal:attributes="name string:${global_search_column_script}:method"/>\n
   </tal:block>\n
+\n
   <tal:block tal:condition="is_gadget_mode">\n
     <!-- Gadget mode -->\n
     <input tal:define="params python: {\'%s:method\' %global_search_column_script:\'\',\'%s\' %global_search_column:\'this.value\'};"\n
            type="text"\n
+           title="Global Search"\n
+           i18n:domain="ui" i18n:attributes="value; title"\n
            tal:attributes=\'value search_text;\n
                            name global_search_column;\n
                            onkeypress python:"if(event.keyCode==13){" + real_context.KnowledgePad_generateAjaxCall(context_url+"/"+form_id,box,box_id,params).replace("\\"this.value\\"","this.value")+ "return false;;}"\'/>\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=38298&r1=38297&r2=38298&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] Mon Sep 13 14:05:15 2010
@@ -1 +1 @@
-1015
\ No newline at end of file
+1016
\ No newline at end of file