From 33e302e3934c7a4a2dc109114bbc00168a59ad69 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Thu, 30 Apr 2009 15:22:43 +0000
Subject: [PATCH] * fix the field name for the search field. * translate
'Search' string. * remove hardcoded width of 'Search' button.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26752 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_web_multiflex5_demo_layout/search_bar.xml | 4 ++--
.../erp5_web_multiflex5_layout/search_bar.xml | 4 ++--
.../portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml | 2 +-
bt5/erp5_web_multiflex5_theme/bt/revision | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/search_bar.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/search_bar.xml
index 76bf81a99b..4b4c8ee1df 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/search_bar.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/search_bar.xml
@@ -106,7 +106,7 @@
<div class="searchform">\n
<fieldset>\n
-<input name="field" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \'./ERP5Site_viewQuickSearchResultList\');" />\n
+<input name="field_your_search_text" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \'./ERP5Site_viewQuickSearchResultList\');" />\n
<input type="submit" name="./ERP5Site_viewQuickSearchResultList:method" class="button" value="Search" />\n
</fieldset>\n
</div>
@@ -160,7 +160,7 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
-python:\'<div class="searchform"> <fieldset> <input name="field" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \\\'%(section_id)s/ERP5Site_viewQuickSearchResultList\\\');" /> <input type="submit" name="%(section_id)s/ERP5Site_viewQuickSearchResultList:method" class="button" value="Search" /> </fieldset> </div>\' % {\'section_id\':getattr(here, \'layout_search_area_section_id\', \'.\')}
+python:\'<div class="searchform"><fieldset><input name="field_your_search_text" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \\\'%(section_id)s/ERP5Site_viewQuickSearchResultList\\\');" /><input type="submit" name="%(section_id)s/ERP5Site_viewQuickSearchResultList:method" class="button" value="%(search)s" /></fieldset></div>\' % {\'section_id\':getattr(here, \'layout_search_area_section_id\', \'.\'), \'search\':here.Base_translateString(\'Search\')}
]]></string> </value>
</item>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/search_bar.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/search_bar.xml
index 76bf81a99b..4b4c8ee1df 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/search_bar.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/search_bar.xml
@@ -106,7 +106,7 @@
<div class="searchform">\n
<fieldset>\n
-<input name="field" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \'./ERP5Site_viewQuickSearchResultList\');" />\n
+<input name="field_your_search_text" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \'./ERP5Site_viewQuickSearchResultList\');" />\n
<input type="submit" name="./ERP5Site_viewQuickSearchResultList:method" class="button" value="Search" />\n
</fieldset>\n
</div>
@@ -160,7 +160,7 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
-python:\'<div class="searchform"> <fieldset> <input name="field" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \\\'%(section_id)s/ERP5Site_viewQuickSearchResultList\\\');" /> <input type="submit" name="%(section_id)s/ERP5Site_viewQuickSearchResultList:method" class="button" value="Search" /> </fieldset> </div>\' % {\'section_id\':getattr(here, \'layout_search_area_section_id\', \'.\')}
+python:\'<div class="searchform"><fieldset><input name="field_your_search_text" class="field" value="" onkeyup="submitFormOnEnter(event, this.form, \\\'%(section_id)s/ERP5Site_viewQuickSearchResultList\\\');" /><input type="submit" name="%(section_id)s/ERP5Site_viewQuickSearchResultList:method" class="button" value="%(search)s" /></fieldset></div>\' % {\'section_id\':getattr(here, \'layout_search_area_section_id\', \'.\'), \'search\':here.Base_translateString(\'Search\')}
]]></string> </value>
</item>
diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml
index cfd82a956c..4a26739d12 100644
--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/mf54_grid.css.xml
@@ -147,7 +147,7 @@
.header-bottom .searchform {float:right; width:430px;}\n
.header-bottom .searchform form fieldset {float:right; border:none; padding-top:5px; padding-right:10px;}\n
.header-bottom .searchform input.field {width:15.0em; height:1.2em; padding:1px !important /*Non-IE6*/; padding:2px /*IE6*/; border:solid 1px <tal:block tal:replace="primary_color"/>; background-color:rgb(255,255,255); font-size:110% !important /*Non-IE6*/; font-size:100% /*IE6*/;}\n
-.header-bottom .searchform input.button {width:4.5em; height:1.6em; background-color:rgb(240,240,240); border:solid 1px rgb(150,150,150); text-align:center; color:rgb(100,100,100); font-size:110% !important /*Non-IE6*/; font-size:100% /*IE6*/;}\n
+.header-bottom .searchform input.button {height:1.6em; background-color:rgb(240,240,240); border:solid 1px rgb(150,150,150); text-align:center; color:rgb(100,100,100); font-size:110% !important /*Non-IE6*/; font-size:100% /*IE6*/;}\n
.header-bottom .searchform input.button:hover {cursor:pointer; border:solid 1px rgb(80,80,80); background-color:rgb(220,220,220); color:rgb(80,80,80);}\n
\n
/********************/\n
diff --git a/bt5/erp5_web_multiflex5_theme/bt/revision b/bt5/erp5_web_multiflex5_theme/bt/revision
index 832332893a..a76c74dcec 100644
--- a/bt5/erp5_web_multiflex5_theme/bt/revision
+++ b/bt5/erp5_web_multiflex5_theme/bt/revision
@@ -1 +1 @@
-67
\ No newline at end of file
+75
\ No newline at end of file
--
2.30.9