Commit 8bbb4bb6 authored by Fabien Morin's avatar Fabien Morin

* 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
parent 2025f324
...@@ -72,7 +72,7 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n ...@@ -72,7 +72,7 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n
\n \n
<!-- Advanced Search header -->\n <!-- Advanced Search header -->\n
<div class="centeredInner searchBar" \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 \n
<input type="hidden" name="all_languages" value="1" />\n <input type="hidden" name="all_languages" value="1" />\n
<input name="top_your_search_text" \n <input name="top_your_search_text" \n
...@@ -94,8 +94,7 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n ...@@ -94,8 +94,7 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n
type="text"\n type="text"\n
onkeypress="submitFormOnEnter(event, \n onkeypress="submitFormOnEnter(event, \n
\'main_form\',\n \'main_form\',\n
\'ERP5Site_processAdvancedSearch\');"\n \'ERP5Site_processAdvancedSearch\');">\n
tal:attributes="value python:here.getParamDict()[\'your_search_text\']"/>\n
\n \n
<input class="button" \n <input class="button" \n
i18n:domain="ui" i18n:attributes="value"\n i18n:domain="ui" i18n:attributes="value"\n
...@@ -161,12 +160,18 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n ...@@ -161,12 +160,18 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n
<img id="style_toggle_icon"\n <img id="style_toggle_icon"\n
alt="Table Mode Icon"\n alt="Table Mode Icon"\n
src="erp5/images/search_style_icon.png" \n src="erp5/images/search_style_icon.png" \n
height="16"/></button>\n height="16"/>\n
</button>\n
\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 <em i18n:translate="" \n
i18n:domain="ui" tal:content="here/getTitle" tal:condition="here/getTitle"/>\n i18n:domain="ui" tal:content="here/getTitle" tal:condition="here/getTitle"/>\n
</a>\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 \n
<!-- supporting domain tree mode for gadget mode (disabled)-->\n <!-- supporting domain tree mode for gadget mode (disabled)-->\n
<!--\n <!--\n
......
670 671
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment