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 820d4c4ae063588cbf612ecb66a289e3bb97d0c8..e4ed82df6a9d6cecc4b88bd1541f949101127adb 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 60f712dc26d22537d5cc6b51581e84299286dbba..bb1ace8cb8d8c085d77100749ecc70cdaaf74db4 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 eeb178b39061e690a990938b37d4bfdc2a7ecdad..9bd12a4fe165d986a1dd115656722d198ba549d3 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 030cd0f5f1b3c1393a47973dfb19e081aced66c7..781e3c2a000c54420aee5b666c5f51bcdd2cf338 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 fb84405cb1e0e739f46abda72f1f0cc2a9b22e21..e6246292942ea33183db39e38e3a3def51404f17 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 029aeb486f9583f08c53e28fae0e84633fcbe4f9..1d1a6f5557ae01c74afcc73d3b97ad4895c8ba76 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