[Erp5-report] r36732 ivan - in /erp5/trunk/bt5/erp5_km: SkinTemplateItem/portal_skins/erp5_...

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Jun 30 13:50:15 CEST 2010


Author: ivan
Date: Wed Jun 30 13:50:14 2010
New Revision: 36732

URL: http://svn.erp5.org?rev=36732&view=rev
Log:
Use Base_getSearchText in KM UI.

Modified:
    erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/search_text_listbox.xml
    erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_text.xml
    erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml
    erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml
    erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml
    erp5/trunk/bt5/erp5_km/bt/revision

Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/search_text_listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/search_text_listbox.xml?rev=36732&r1=36731&r2=36732&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/search_text_listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/search_text_listbox.xml [utf8] Wed Jun 30 13:50:14 2010
@@ -234,7 +234,7 @@
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
-                    <value> <int>1</int> </value>
+                    <value> <int>0</int> </value>
                 </item>
                 <item>
                     <key> <string>external_validator</string> </key>

Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_text.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_text.xml?rev=36732&r1=36731&r2=36732&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_text.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_text.xml [utf8] Wed Jun 30 13:50:14 2010
@@ -275,7 +275,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: getattr(request, \'new_advanced_search_text\', False) or context.Base_translateString(\'Search\')</string> </value>
+            <value> <string>python: context.Base_getSearchText() or context.Base_translateString(\'Search\')</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml?rev=36732&r1=36731&r2=36732&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml [utf8] Wed Jun 30 13:50:14 2010
@@ -52,8 +52,7 @@
   -->\n
 </tal:block>\n
 \n
-<tal:block tal:define="search_text python: request.get(\'your_search_text\', None);">\n
-\n
+<tal:block tal:define="search_text here/Base_getSearchText">\n
   <input type="text"\n
          name="field_your_search_text"\n
          onkeypress="submitFormOnEnter(event, \'main_form\', \'ERP5Site_viewQuickSearchResultList\', false, this)"\n
@@ -63,7 +62,6 @@
          value="Search" \n
          name="ERP5Site_viewQuickSearchResultList:method" \n
          class=""/>\n
- \n
 </tal:block>\n
 
 

Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml?rev=36732&r1=36731&r2=36732&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml [utf8] Wed Jun 30 13:50:14 2010
@@ -305,6 +305,10 @@ button.sort_button_asc{\n
 /* in search mode listbox may contain top/ bottom quick search inputs */\n
 div.search-text-listbox{\n
   text-align: center;\n
+  float:left;\n
+  height:auto; \n
+  margin-bottom:0.5em;\n
+  margin-top:0.5em;\n
 }\n
 div.search-text-listbox input{\n
   width: auto;\n

Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml?rev=36732&r1=36731&r2=36732&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml [utf8] Wed Jun 30 13:50:14 2010
@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts76170392.93</string> </value>
+            <value> <string>ts77887532.32</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -23,7 +23,7 @@
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value> <string>application/javascript</string> </value>
+            <value> <string>application/x-javascript</string> </value>
         </item>
         <item>
             <key> <string>data</string> </key>

Modified: erp5/trunk/bt5/erp5_km/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/bt/revision?rev=36732&r1=36731&r2=36732&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/bt/revision [utf8] Wed Jun 30 13:50:14 2010
@@ -1 +1 @@
-1474
\ No newline at end of file
+1475
\ No newline at end of file




More information about the Erp5-report mailing list