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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed May  6 16:55:50 2009
New Revision: 26848

URL: http://svn.erp5.org?rev=26848&view=rev
Log:
* remove displaying portal_type and adding a download link for "Web Page".
* merge showPopik function to erp5.js.

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/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.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=26848&r1=26847&r2=26848&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 May  6 16:55:50 2009
@@ -49,7 +49,6 @@
               current_page_max   python: listbox_max_lines * current_page;\n
               current_page_start python: (listbox_max_lines * (current_page - 1)) + 1;\n
               current_page_stop  python: (total_line < current_page_max) and total_line or current_page_max;\n
-              box                python: real_context.restrictedTraverse(box_relative_url);\n
               your_search_text   python:here.getParamDict().get(\'your_search_text\', None)">\n
 \n
   <!-- ListBox (search mode) starts here.  -->\n
@@ -216,8 +215,9 @@
                 <tr tal:define="css python: test(repeat[\'line\'].index % 2, \'DataB\', \'DataA\');\n
                                 obj line/getObject;\n
                                 url obj/absolute_url;\n
-                                is_document python: obj.getPortalType() in\n
-                                  real_context.getPortalDocumentTypeList();\n
+                                portal_type obj/getPortalType;\n
+                                is_document python:portal_type in\n
+                                  real_context.getPortalDocumentTypeList() and portal_type != \'Web Page\';\n
                                 hidden_pop_dom_id string:dom_popup_${field_id}_${repeat/line/index};\n
                                 details_dom_id string:${field_id}_search_details_${repeat/line/index};"\n
                     tal:attributes="id string:${field_id}_data_line_${repeat/line/index}; \n
@@ -252,8 +252,8 @@
 \n
                       <div>\n
                         <a tal:attributes="href string:${url}/view">\n
-                          <span class="search_result_portal_type" tal:content="obj/getTranslatedPortalType" />\n
                           <span class="search_result_title" tal:content="python: obj.getTitle() or (hasattr(obj, \'getReference\') and obj.getReference()) or obj.getId()" />\n
+                          <span class="search_result_portal_type" tal:condition="python:portal_type != \'Web Page\'" tal:content="obj/getTranslatedPortalType" />\n
                         </a>\n
                       </div>\n
 \n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml?rev=26848&r1=26847&r2=26848&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml [utf8] Wed May  6 16:55:50 2009
@@ -220,6 +220,14 @@
     for(i=0;i<=inputs.length-1;i++) { inputs[i].id = "checkbox" + i; }\n
 }\n
 \n
+function showPopik(dom_id, what, delay){\n
+  var obj = getElement(dom_id);\n
+  if(what==true){\n
+    obj.style.display=\'block\';}\n
+  else{\n
+    obj.style.display=\'none\';}\n
+}\n
+\n
 addLoadEvent(indexAllCheckBoxesAtBTInstallationOnLoad)
 
 ]]></string> </value>

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=26848&r1=26847&r2=26848&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 May  6 16:55:50 2009
@@ -1,1 +1,1 @@
-747
+748