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

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Sep 13 10:01:10 2010
New Revision: 38287

URL: http://svn.erp5.org?rev=38287&view=rev
Log:
Use proper API after r38286

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=38287&r1=38286&r2=38287&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 10:01:10 2010
@@ -61,9 +61,9 @@
               is_dialog_mode request/dialog_mode | nothing;\n
               display_style_list here/getDisplayStyleList;\n
               list_style here/getListboxDisplayStyle;\n
-              full_text_search_key here/getFullTextSearchKey;\n
-              full_text_search_key_script here/getFullTextSearchKeyScript;\n
-              show_full_text python: full_text_search_key not in (\'\', None) and full_text_search_key_script not in (\'\', None);\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
               line_list here/query;\n
               listbox_max_lines  python: int(here.getMaxLineNumber());\n
               total_line         python: int(here.total_size);\n
@@ -80,7 +80,7 @@
               page_navigation_mode python: request.get(\'page_navigation_mode\', here.getPageNavigationMode());\n
               is_slider_mode python: page_navigation_mode in (\'\', \'slider\');\n
               is_default_listbox_field python: field_id==\'listbox\';">\n
- \n
+\n
   <!-- Define hidden input.  -->\n
   <input type="hidden" \n
          name="list_selection_name" \n
@@ -508,8 +508,8 @@
 \n
       <!-- Full text search -->\n
       <div class="listbox-footer-box"\n
-           tal:condition="show_full_text">\n
-        <tal:block metal:use-macro="container/ListBox_asHTMLLibrary/macros/listbox_full_text_search"/>\n
+           tal:condition="show_global_search">\n
+        <tal:block metal:use-macro="container/ListBox_asHTMLLibrary/macros/listbox_global_search"/>\n
       </div>\n
 \n
       <!--Page navigation in web mode floating in right (slider) or whole width (text) -->\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=38287&r1=38286&r2=38287&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 10:01:10 2010
@@ -99,26 +99,26 @@
 \n
 \n
 <div class=" listbox-full-text-search"\n
-     metal:define-macro="listbox_full_text_search"\n
+     metal:define-macro="listbox_global_search"\n
      tal:define="search_text real_context/Base_getSearchText">\n
 \n
   <tal:block tal:condition="not: is_gadget_mode">\n
     <!-- Normal mode -->\n
     <input type="text"\n
            tal:attributes="value search_text;\n
-                           name full_text_search_key;\n
-                           onkeypress string: submitFormOnEnter(event, this.form, \'${full_text_search_key_script}\');"/>\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
-           tal:attributes="name string:${full_text_search_key_script}:method"/>\n
+           tal:attributes="name string:${global_search_column_script}:method"/>\n
   </tal:block>\n
   <tal:block tal:condition="is_gadget_mode">\n
     <!-- Gadget mode -->\n
-    <input tal:define="params python: {\'%s:method\' %full_text_search_key_script:\'\',\'%s\' %full_text_search_key:\'this.value\'};"\n
+    <input tal:define="params python: {\'%s:method\' %global_search_column_script:\'\',\'%s\' %global_search_column:\'this.value\'};"\n
            type="text"\n
            tal:attributes=\'value search_text;\n
-                           name full_text_search_key;\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
   </tal:block>\n
 \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=38287&r1=38286&r2=38287&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 10:01:10 2010
@@ -1 +1 @@
-1011
\ No newline at end of file
+1012
\ No newline at end of file