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

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Jul 27 11:16:37 CEST 2009


Author: ivan
Date: Mon Jul 27 11:16:37 2009
New Revision: 28181

URL: http://svn.erp5.org?rev=28181&view=rev
Log:
Omit showing listbox rows if no input (i.e. search criterions) are provided by user.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.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_asHTML.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml?rev=28181&r1=28180&r2=28181&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml [utf8] Mon Jul 27 11:16:37 2009
@@ -51,7 +51,10 @@
               real_context here/getContext;\n
               context_url real_context/absolute_url;\n
               md5_string here/getMD5Checksum;\n
-              line_list here/query;\n
+              hide_rows_on_no_search_criterion \n
+                python: here.isHideRowsOnNoSearchCriterion(request);\n
+              line_list python: test(hide_rows_on_no_search_criterion, \n
+                                     [], here.query());\n
               is_domain_tree_mode here/isDomainTreeMode;\n
               is_report_tree_mode here/isReportTreeMode;\n
               is_domain_tree_supported here/isDomainTreeSupported;\n
@@ -150,6 +153,7 @@
   <tal:block tal:condition="python: list_style not in (\'search\', \'table\')">\n
     <span metal:use-macro="real_context/ListBox_asStandardHTML/macros/main"/>\n
   </tal:block>\n
+\n
 </tal:block>\n
 
 

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml?rev=28181&r1=28180&r2=28181&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml [utf8] Mon Jul 27 11:16:37 2009
@@ -243,8 +243,8 @@
                 </td>\n
               </tal:block>\n
             </tr>\n
-\n
             <tal:block tal:repeat="line line_list" tal:define="checked_uid_set here/getCheckedUidSet">\n
+\n
               <tr id="listbox_data_line_0" class="DataA"\n
                 tal:define="css python: line.getRowCSSClassName() or test(repeat[\'line\'].index % 2, \'DataB\', \'DataA\');\n
                             render_result line/render;"\n
@@ -288,6 +288,16 @@
               </tr>\n
             </tal:block>\n
 \n
+            <tr tal:condition="hide_rows_on_no_search_criterion"\n
+                class="listbox_missing_search_criterion">\n
+                <td tal:attributes="colspan python: len(here.getSearchValueList()) + 1">\n
+                  <span i18n:translate="" \n
+                      i18n:domain="ui">\n
+                      To display actual content, please fill in one or more search criterion.\n
+                </span>\n
+              </td>\n
+            </tr>\n
+\n
             <tr tal:condition="here/showStat" id="listbox_stat_line"\n
               class="listbox_stat_line"\n
               tal:attributes="id string:${field_id}_stat_line">\n
@@ -301,6 +311,7 @@
                   tal:content="structure processed_value" />\n
               </tal:block>\n
             </tr>\n
+\n
           </table>\n
         </div>\n
       </tal:block>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml?rev=28181&r1=28180&r2=28181&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asTableStyleHTML.xml [utf8] Mon Jul 27 11:16:37 2009
@@ -315,6 +315,17 @@
                   <tal:block metal:use-macro="real_context/page_navigation_render/macros/page_navigation" />\n
                 </td>\n
               </tr>\n
+\n
+              <tr tal:condition="hide_rows_on_no_search_criterion"\n
+                  class="listbox_missing_search_criterion">\n
+                <td tal:attributes="colspan python: len(here.getSearchValueList()) + 1">\n
+                  <span i18n:translate="" \n
+                        i18n:domain="ui">\n
+                    To display actual content, please fill in one or more search criterion.\n
+                  </span>\n
+                </td>\n
+              </tr>\n
+\n
           </table>\n
 \n
           <!-- Advanced Search footer -->\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml?rev=28181&r1=28180&r2=28181&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml [utf8] Mon Jul 27 11:16:37 2009
@@ -1506,7 +1506,14 @@
 .document div.page div {\n
   color: black;\n
 }\n
-
+\n
+/* Listbox missing search criterion table row*/\n
+.listbox_missing_search_criterion {\n
+  background-color: white;\n
+}\n
+.listbox_missing_search_criterion td{\n
+  text-align: center!important;\n
+}
 
 ]]></string> </value>
         </item>

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=28181&r1=28180&r2=28181&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] Mon Jul 27 11:16:37 2009
@@ -1,1 +1,1 @@
-784
+788




More information about the Erp5-report mailing list