From 99b94a44e64d6bd7d68bf23305c91f691c4746df Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Fri, 27 Mar 2009 10:52:08 +0000 Subject: [PATCH] - use showPopik only in web mode (because the javascript function is defined in erp5_web portal_skins) - enhance a bit css for quick search git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26178 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_xhtml_style/ListBox_asSearchStyleHTML.xml | 4 ++-- .../portal_skins/erp5_xhtml_style/erp5.css.xml | 13 ++++--------- product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +- 3 files changed, 7 insertions(+), 12 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 02c135c255..fe0c6f77ec 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 @@ -259,8 +259,8 @@ tal:define=" listbox_max_lines python: int(here.getMaxLineNumber());\n \n <td>\n <div class="item_nohighlight"\n - tal:attributes="onmouseover string: showPopik(\'${hidden_pop_dom_id}\', true);\n - onmouseout string: showPopik(\'${hidden_pop_dom_id}\', false);">\n + tal:attributes="onmouseover python: is_web_mode and \'showPopik(\\\'%s\\\', true)\' % hidden_pop_dom_id or None;\n + onmouseout python: is_web_mode and \'showPopik(\\\'%s\\\', false)\' % hidden_pop_dom_id or None;">\n \n <div class="search_popup" \n style="z-index:100;"\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml index d3cbaeb81f..8d04eb22b4 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml @@ -1243,7 +1243,8 @@ div.popup_row a{\n color: green!important;\n }\n div.searchResultHeader {\n - border-top: 1px solid <dtml-var document_border_color>;\n + margin-top: 0em;\n + border: 1px solid <dtml-var document_border_color>;\n background-color: <dtml-var listbox_label_background_color>;\n padding: .2em;\n }\n @@ -1256,7 +1257,8 @@ div.searchResultHeader .left {float: left}\n table.documentList {\n width: 100%;\n margin-bottom: 1em;\n - border: 1px solid;\n + border-style: solid;\n + border-width: 0 1px 1px 1px;\n border-color:<dtml-var document_border_color>;\n }\n \n @@ -1395,13 +1397,6 @@ div.searchResultHeader #style_toggle_icon,\n vertical-align:bottom;\n }\n \n -div.searchResultHeader {\n - border-style: solid;\n - border-width: 1px 1px 0 1px;\n - border-color:<dtml-var document_border_color>;\n - margin-top: 0em;\n -}\n -\n div.search .centeredInner {\n text-align: center;\n }\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 55b7e8800f..38bfa57c0c 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -680 \ No newline at end of file +681 \ No newline at end of file -- 2.30.9