diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/view.xml index e976fdfbb9059d155934b02d8577ec541bd6bcf2..9a8c82ad5d0ab7c7d814ef0156081eb6509d221d 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/view.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/view.xml @@ -102,7 +102,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python: not (hasattr(request, \'current_web_section\') and not (getattr(request, \'ignore_layout\', False) or getattr(request, \'editable_mode\', False)))</string> </value> + <value> <string>python: object is not None and not object.isWebMode()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml index a1c1c76f1d153163cc17d5079150f2a2979c8ae4..d7c502369bfb5a3517ff50840d570eea91728dc6 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml @@ -102,7 +102,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python: not (hasattr(request, \'current_web_section\') and not (getattr(request, \'ignore_layout\', False) or getattr(request, \'editable_mode\', False)))</string> </value> + <value> <string>python: object is not None and not object.isWebMode()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewAsWeb/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewAsWeb/listbox.xml index 77a748b8c793244dc3501c9554ff29669ac5068b..d99432ef60890c153c7db4f5151b4979000af7a8 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewAsWeb/listbox.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewAsWeb/listbox.xml @@ -300,9 +300,7 @@ </item> <item> <key> <string>url_columns</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> </dictionary> </value> @@ -402,12 +400,12 @@ </item> <item> <key> <string>list_action</string> </key> - <value> <string>Folder_viewContentList</string> </value> + <value> <string>list</string> </value> </item> <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -418,7 +416,7 @@ </item> <item> <key> <string>page_template</string> </key> - <value> <string>ListBox_asWebStyleHTML</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>portal_types</string> </key> @@ -503,25 +501,6 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: [(\'title\', \'WebSite_getDocumentUrl\') ]</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/listbox.xml index 370917e849b830e85a5035ef9010c6bf38e4c9db..239b47888e51700e32a25bf40ee05e447990f83f 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/listbox.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/listbox.xml @@ -300,9 +300,7 @@ </item> <item> <key> <string>url_columns</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> </dictionary> </value> @@ -398,12 +396,12 @@ </item> <item> <key> <string>list_action</string> </key> - <value> <string>Folder_viewContentList</string> </value> + <value> <string>list</string> </value> </item> <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -414,7 +412,7 @@ </item> <item> <key> <string>page_template</string> </key> - <value> <string>ListBox_asWebStyleHTML</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>portal_types</string> </key> @@ -499,25 +497,6 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: [(\'title\', \'WebSite_getDocumentUrl\') ]</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_editable_content.css.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_editable_content.css.xml index f8deba3bb75d21decfd114af7e9201ea84c06fbc..656f20aebf1415941ad0cf229de697154bcc43ce 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_editable_content.css.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_editable_content.css.xml @@ -101,7 +101,16 @@ div#main_content button {\n ** TODO: change colors to have better integration in default erp5 web theme.\n ------------------------------------------------------------------ */\n \n -div#main_content .ListSummary table {display: none}\n +div#main_content .ListSummary table {\n + width: 100%;\n + background-color: white;\n + padding: .1em;\n + margin-top: 1em;\n + background: #fff url(erp5-website-field.png) top repeat-x;\n + border: 1pt solid #ccc;\n + color: #666;\n + padding: 2px;\n +}\n \n div#main_content .ListContent table {\n margin-bottom: 2em;\n @@ -114,10 +123,19 @@ div#main_content .ListContent td {\n vertical-align: top;\n }\n \n -div#main_content .ListContent td.Data {background-color: #adb9cc}\n -div#main_content .ListContent td.DataA {background-color: #fff}\n -div#main_content .ListContent td.DataB {background-color: #eee}\n +div#main_content .ListContent td.Data {\n + background: #adb9cc\n +}\n +\n +div#main_content .ListContent tr.DataA {\n + background: #fff\n +}\n \n +div#main_content .ListContent tr.DataB {\n + background: #eee\n +}\n +\n +div#main_content .ListContent table tr:hover {background: #ccc}\n \n /* Custom web Listbox styling.\n ** TODO: change colors to have better integration in default erp5 web theme.\n @@ -199,7 +217,11 @@ div#main_content table.listbox tbody td a,\n div#main_content table.listbox tbody td a:hover,\n div#main_content table.listbox tbody td a:visited {color: #4343D9}\n \n -div#main_content table.listbox tbody tr:hover {background: #f6f6f6}\n +div#main_content table.listbox tbody tr {\n + background: #fff;\n +}\n +\n +div#main_content table.listbox tbody tr:hover {background: #ccc}\n \n div#main_content table.listbox tbody span.number, tbody span.date {float: right}\n \n @@ -225,7 +247,6 @@ div#main_content table.listbox tfoot .pageNavigation button:hover {\n background: #eee;\n }\n \n -\n /*========================================================================================\n ** PAGE LAYOUT\n **========================================================================================*/\n @@ -463,15 +484,6 @@ div#main_content fieldset.webcontent span.headline {\n line-height: 140%;\n text-align: left;\n }\n -\n -div#main_content .headline legend,\n -div#main_content .headline label {\n - margin: 0;\n - width: 0em;\n - text-align: left;\n - float: left;\n - display: none;\n -}\n ]]></string> </value>