From 8bbb4bb693d5b3126ece989690f7d470a29ad90d Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Wed, 25 Mar 2009 10:05:35 +0000
Subject: [PATCH] * always display search fields, even if there is no
your_search_text parameter * if List Action is not configured (== 'list'), we
don't need a link, so remove the link in search style listbox
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26152 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../ListBox_asSearchStyleHTML.xml | 15 ++++++++++-----
.../ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml
index 9e609b0f9b..5da22e34f5 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml
@@ -72,7 +72,7 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n
\n
<!-- Advanced Search header -->\n
<div class="centeredInner searchBar" \n
- tal:condition="python:not is_gadget_mode and show_search_line and here.getParamDict().has_key(\'your_search_text\')">\n
+ tal:condition="python:not is_gadget_mode and show_search_line">\n
\n
<input type="hidden" name="all_languages" value="1" />\n
<input name="top_your_search_text" \n
@@ -94,8 +94,7 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n
type="text"\n
onkeypress="submitFormOnEnter(event, \n
\'main_form\',\n
- \'ERP5Site_processAdvancedSearch\');"\n
- tal:attributes="value python:here.getParamDict()[\'your_search_text\']"/>\n
+ \'ERP5Site_processAdvancedSearch\');">\n
\n
<input class="button" \n
i18n:domain="ui" i18n:attributes="value"\n
@@ -161,12 +160,18 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n
<img id="style_toggle_icon"\n
alt="Table Mode Icon"\n
src="erp5/images/search_style_icon.png" \n
- height="16"/></button>\n
+ height="16"/>\n
+ </button>\n
\n
- <a tal:attributes="id string:${field_id}_title; href here/getListActionUrl">\n
+ <a tal:attributes="id string:${field_id}_title; href here/getListActionUrl"\n
+ tal:condition="python: here.field.get_value(\'list_action\') != \'list\'">\n
<em i18n:translate="" \n
i18n:domain="ui" tal:content="here/getTitle" tal:condition="here/getTitle"/>\n
</a>\n
+ <tal:block tal:condition="python: here.field.get_value(\'list_action\') == \'list\'">\n
+ <em i18n:translate="" \n
+ i18n:domain="ui" tal:content="here/getTitle" tal:condition="here/getTitle"/>\n
+ </tal:block>\n
\n
<!-- supporting domain tree mode for gadget mode (disabled)-->\n
<!--\n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index 4ffc0cd9c1..4e36eb8e01 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-670
\ No newline at end of file
+671
\ No newline at end of file
--
2.30.9