From cac80dc99a17235b2d1427f64015fa1d6639b638 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Wed, 30 Jun 2010 11:50:14 +0000 Subject: [PATCH] Use Base_getSearchText in KM UI. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36732 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../search_text_listbox.xml | 2 +- .../your_search_text.xml | 2 +- .../erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml | 4 +--- .../portal_skins/erp5_km_theme/km_css/listbox.css.xml | 4 ++++ .../portal_skins/erp5_km_theme/km_js/erp5_km.js.xml | 4 ++-- bt5/erp5_km/bt/revision | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/search_text_listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/search_text_listbox.xml index 820d4c4ae0..e4ed82df6a 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/search_text_listbox.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/search_text_listbox.xml @@ -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> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_text.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_text.xml index 60f712dc26..bb1ace8cb8 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_text.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_text.xml @@ -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> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml index eeb178b390..9bd12a4fe1 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewListBoxSearchButtonWidget.xml @@ -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 diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml index 030cd0f5f1..781e3c2a00 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml @@ -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 diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml index fb84405cb1..e624629294 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml @@ -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> diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 029aeb486f..1d1a6f5557 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1474 \ No newline at end of file +1475 \ No newline at end of file -- 2.30.9