[Erp5-report] r26152 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: fabien
Date: Wed Mar 25 11:05:35 2009
New Revision: 26152

URL: http://svn.erp5.org?rev=26152&view=rev
Log:
* 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

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml?rev=26152&r1=26151&r2=26152&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asSearchStyleHTML.xml [utf8] Wed Mar 25 11:05:35 2009
@@ -72,7 +72,7 @@
 \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 @@
                    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 @@
                     <img id="style_toggle_icon"\n
                          alt="Table Mode Icon"\n
                          src="erp5/images/search_style_icon.png" \n
-                         height="16"/></button>\n
-\n
-                  <a tal:attributes="id string:${field_id}_title; href here/getListActionUrl">\n
+                         height="16"/>\n
+                  </button>\n
+\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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=26152&r1=26151&r2=26152&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Wed Mar 25 11:05:35 2009
@@ -1,1 +1,1 @@
-670
+671