Skip to content

erp5
erp5
Commit efdeab9b authored by Ivan Tyagov's avatar Ivan Tyagov
Browse files
Options

Follow CSS guideline (remove inline CSS styling). 

Indentation.
Remove duplicating images.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37363 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3c2db1a7
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 233 deletions
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/ListBox_asHTML.xml
View file @ efdeab9b
...@@ -104,8 +104,13 @@ ...@@ -104,8 +104,13 @@
<div class="listbox-container">\n <div class="listbox-container">\n
\n \n
<div class="listbox-tree">\n <div class="listbox-tree">\n
<div class="listbox_domain_tree_mode" tal:condition="is_domain_tree_mode">\n \n
<div tal:define="selected_domain_path here/getSelectedDomainPath">\n <!-- Domain Report Tree mode -->\n
<div class="listbox-domain-tree-container" \n
tal:condition="is_domain_tree_mode">\n
<tal:block tal:define="selected_domain_path here/getSelectedDomainPath">\n
\n
<!-- Select domain node -->\n
<select name="domain_root_url"\n <select name="domain_root_url"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setDomainRoot\')">\n tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setDomainRoot\')">\n
<tal:block tal:repeat="c here/getDomainRootList">\n <tal:block tal:repeat="c here/getDomainRootList">\n
...@@ -113,33 +118,39 @@ ...@@ -113,33 +118,39 @@
tal:define="path python: c[0]; title python: c[1]"\n tal:define="path python: c[0]; title python: c[1]"\n
tal:attributes="selected python: path == selected_domain_path; value path"\n tal:attributes="selected python: path == selected_domain_path; value path"\n
tal:content="title"\n tal:content="title"\n
i18n:translate="" i18n:domain="ui">Base Domain</option>\n i18n:translate="" i18n:domain="ui"/>\n
</tal:block>\n </tal:block>\n
</select>\n </select>\n
<table id="listbox_domain_tree_table" cellpadding="0"\n \n
<!-- Domain node contents -->\n
<table id="listbox-domain-tree-table" \n
cellpadding="0"\n
summary="This table contains the domain tree"\n summary="This table contains the domain tree"\n
class="listbox_domain_tree_table"\n class="listbox_domain_tree_table"\n
tal:attributes="id string:${field_id}_domain_tree_table"\n tal:attributes="id string:${field_id}-domain-tree-table"\n
tal:define="report_tree_list python: here.makeReportTreeList(report_path = selected_domain_path, unfolded_list = selection.getDomainList(), is_report_opened = False, sort_on=((\'int_index\', \'ASC\'),));\n tal:define="report_tree_list python: here.makeReportTreeList(report_path = selected_domain_path, unfolded_list = selection.getDomainList(), is_report_opened = False, sort_on=((\'int_index\', \'ASC\'),));\n
total_depth python: max([report_tree.depth for report_tree in report_tree_list] + [-1])">\n total_depth python: max([report_tree.depth for report_tree in report_tree_list] + [-1])">\n
<tr tal:repeat="report_tree report_tree_list">\n <tr tal:repeat="report_tree report_tree_list">\n
<tal:block tal:repeat="i python: range(report_tree.depth)">\n <tal:block tal:repeat="i python: range(report_tree.depth)">\n
<td width="12" nowrap="nowrap">&nbsp;</td>\n <td width="12" nowrap="nowrap">&nbsp;</td>\n
</tal:block>\n </tal:block>\n
<td colspan="1" style="text-align: left; vertical-align: top; white-space: nowrap;"\n <td colspan="1" \n
class="domain-tree-table-cell"\n
tal:attributes="colspan python: total_depth - report_tree.depth + 1">\n tal:attributes="colspan python: total_depth - report_tree.depth + 1">\n
<a href="method" class="tree_open"\n <a href="method" class="tree_open"\n
tal:condition="report_tree/is_open"\n tal:condition="report_tree/is_open"\n
tal:attributes="href string:foldDomain?domain_url=${report_tree/domain_url}&form_id=${form_id}&list_selection_name=${selection_name}&domain_depth:int=${report_tree/depth}">\n tal:attributes="href string:foldDomain?domain_url=${report_tree/domain_url}&form_id=${form_id}&list_selection_name=${selection_name}&domain_depth:int=${report_tree/depth}">\n
<b tal:content="report_tree/obj/getCompactTranslatedTitle">Domain</b></a>\n <b tal:content="report_tree/obj/getCompactTranslatedTitle">Domain</b>\n
</a>\n
<a href="method" class="tree_closed"\n <a href="method" class="tree_closed"\n
tal:condition="not: report_tree/is_open"\n tal:condition="not: report_tree/is_open"\n
tal:attributes="href string:unfoldDomain?domain_url=${report_tree/domain_url}&form_id=${form_id}&list_selection_name=${selection_name}&domain_depth:int=${report_tree/depth}">\n tal:attributes="href string:unfoldDomain?domain_url=${report_tree/domain_url}&form_id=${form_id}&list_selection_name=${selection_name}&domain_depth:int=${report_tree/depth}">\n
<tal:block tal:content="report_tree/obj/getCompactTranslatedTitle">Domain</tal:block></a>\n <tal:block tal:content="report_tree/obj/getCompactTranslatedTitle">Domain</tal:block>\n
</a>\n
</td>\n </td>\n
</tr>\n </tr>\n
</table>\n </table>\n
</div>\n </tal:block>\n
</div>\n </div>\n
</div>\n </div>\n
\n \n
...@@ -151,18 +162,18 @@ ...@@ -151,18 +162,18 @@
<!--Show search result -->\n <!--Show search result -->\n
<span tal:condition="python: total_line > 0"\n <span tal:condition="python: total_line > 0"\n
tal:replace="structure python: real_context.Base_translateString(\'Results <em>${start} - ${stop}</em> of <em>${total}</em>.\', mapping=dict(start=current_page_start, stop=current_page_stop, total=total_line))"/>\n tal:replace="structure python: real_context.Base_translateString(\'Results <em>${start} - ${stop}</em> of <em>${total}</em>.\', mapping=dict(start=current_page_start, stop=current_page_stop, total=total_line))"/>\n
\n
<!-- Set a slot for additional content ? -->\n
</div>\n </div>\n
<div class="listbox-body">\n <div class="listbox-body">\n
<table class="listbox"> \n <table class="listbox"> \n
<thead>\n <thead>\n
<!--Column title -->\n <!--Column title -->\n
<tr id="listbox-label-line" class="listbox-label-line"\n <tr id="listbox-label-line" \n
class="listbox-label-line"\n
tal:attributes="id string:${field_id}-label-line"> \n tal:attributes="id string:${field_id}-label-line"> \n
\n
<!--Report tree-->\n <!--Report tree-->\n
<th tal:condition="is_report_tree_mode"\n <th tal:condition="is_report_tree_mode"\n
style="width: 50px; text-align: left; vertical-align: middle">\n class="listbox-table-report-tree-selection-cell">\n
<select name="report_root_url"\n <select name="report_root_url"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setReportRoot\')">\n tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setReportRoot\')">\n
<tal:block tal:repeat="c here/getReportRootList">\n <tal:block tal:repeat="c here/getReportRootList">\n
...@@ -173,15 +184,13 @@ ...@@ -173,15 +184,13 @@
</tal:block>\n </tal:block>\n
</select>\n </select>\n
</th>\n </th>\n
<!--Anchor Column -->\n \n
<th class="AnchorColumn" tal:condition="show_anchor_column">&nbsp;</th>\n <!-- Anchor cell -->\n
<!--Add colum for checkbox-->\n <th class="listbox-table-anchor-cell" tal:condition="show_anchor_column">&nbsp;</th>\n
\n
<!-- Select cell -->\n
<th tal:condition="python: show_select_column"\n <th tal:condition="python: show_select_column"\n
class="select_cell"\n class="listbox-table-select-cell">\n
style="border-width: 0;\n
text-align: center; \n
vertical-align: middle;\n
white-space: nowrap;">\n
\n \n
<input id="listbox-check-all"\n <input id="listbox-check-all"\n
class="listbox-selection-action listbox-check-all"\n class="listbox-selection-action listbox-check-all"\n
...@@ -204,14 +213,14 @@ ...@@ -204,14 +213,14 @@
i18n:domain="ui" i18n:attributes="title" /> \n i18n:domain="ui" i18n:attributes="title" /> \n
\n \n
</th>\n </th>\n
\n
<!-- Label column row -->\n <!-- Label column row -->\n
<tal:block tal:repeat="value here/getLabelValueList">\n <tal:block tal:repeat="value here/getLabelValueList">\n
<tal:block tal:define="sql python: value[0];\n <tal:block tal:define="sql python: value[0];\n
title python: value[1];\n title python: value[1];\n
sort_order python: value[2]">\n sort_order python: value[2]">\n
<th tal:condition="sql"\n
tal:attributes="style python: repeat[\'value\'].index==0 and \'border-width: 0 1px 1px 1px\' or \'\'"> \n
\n \n
<th tal:condition="sql" class="listbox-table-header-cell"> \n
<!-- Button in normal view -->\n <!-- Button in normal view -->\n
<button tal:define="\n <button tal:define="\n
bt_class python: sort_order==\'ascending\' and \'sort_button sort_button_asc\' \n bt_class python: sort_order==\'ascending\' and \'sort_button sort_button_asc\' \n
...@@ -224,7 +233,7 @@ ...@@ -224,7 +233,7 @@
value string:${field_id}.${sql};\n value string:${field_id}.${sql};\n
class bt_class;"\n class bt_class;"\n
i18n:domain="ui" i18n:attributes="title">\n i18n:domain="ui" i18n:attributes="title">\n
<span tal:content="title" i18n:domain="ui" i18n:translate="">ID</span>\n <span tal:content="title" i18n:domain="ui" i18n:translate=""/>\n
</button>\n </button>\n
\n \n
<!-- Button in gadget mode -->\n <!-- Button in gadget mode -->\n
...@@ -235,24 +244,29 @@ ...@@ -235,24 +244,29 @@
tal:attributes="title string:${title}; \n tal:attributes="title string:${title}; \n
onclick python: real_context.KnowledgePad_generateAjaxCall(context_url+\'/\'+form_id,box,dom_id,params);"\n onclick python: real_context.KnowledgePad_generateAjaxCall(context_url+\'/\'+form_id,box,dom_id,params);"\n
i18n:domain="ui" i18n:attributes="title">\n i18n:domain="ui" i18n:attributes="title">\n
<span tal:content="title" i18n:domain="ui" i18n:translate="">ID</span>\n <span tal:content="title" i18n:domain="ui" i18n:translate=""/>\n
</button>\n </button>\n
</th>\n </th>\n
<!--TODO Why not sql is possible ?-->\n \n
<th tal:condition="not: sql" tal:content="title" \n <th class="listbox-table-header-cell"\n
tal:condition="not: sql" \n
tal:content="title" \n
i18n:domain="ui" i18n:translate=""/>\n i18n:domain="ui" i18n:translate=""/>\n
\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tr>\n </tr>\n
\n \n
<!--Search column input -->\n <!--Search column input -->\n
<tr tal:condition="python: show_search_line or is_report_tree_mode"\n <tr tal:condition="python: show_search_line or is_report_tree_mode"\n
id="listbox_search_line" \n id="listbox-search-line" \n
class="listbox-search-line"\n class="listbox-search-line"\n
tal:attributes="id python: show_search_line and (\'%s-search-line\' % field_id) or (\'%s-report-depth-line\' % field_id)">\n tal:attributes="id python: show_search_line and (\'%s-search-line\' % field_id) or (\'%s-report-depth-line\' % field_id)">\n
\n
<!--Report Tree -->\n <!--Report Tree -->\n
<tal:block tal:condition="is_report_tree_mode">\n <tal:block tal:condition="is_report_tree_mode">\n
<th style="width: 50px; text-align: left; vertical-align: middle" colspan="1"\n <th class="listbox-table-report-tree-selection-cell"\n
colspan="1"\n
tal:attributes="colspan python: show_search_line and 1 or (len(here.getSelectedColumnList()) + show_select_column + show_anchor_column + 1)"\n tal:attributes="colspan python: show_search_line and 1 or (len(here.getSelectedColumnList()) + show_select_column + show_anchor_column + 1)"\n
tal:define="selection_index here/getSelectionIndex;\n tal:define="selection_index here/getSelectionIndex;\n
index python: selection_index is not None and \'&amp;selection_index=%s\' % selection_index or \'\';\n index python: selection_index is not None and \'&amp;selection_index=%s\' % selection_index or \'\';\n
...@@ -272,12 +286,12 @@ ...@@ -272,12 +286,12 @@
</th>\n </th>\n
</tal:block>\n </tal:block>\n
\n \n
<!--Anchor Column -->\n <!--Anchor cell -->\n
<th class="AnchorColumn" tal:condition="show_anchor_column">\n <th class="listbox-table-anchor-cell" tal:condition="show_anchor_column">&nbsp;</th>\n
&nbsp;\n \n
</th>\n <!--Select cell -->\n
<th tal:condition="python: show_select_column"\n <th tal:condition="python: show_select_column"\n
class="Data" style="text-align: center; vertical-align: middle">\n class="listbox-table-select-cell">\n
<input id="listbox_select" type="image"\n <input id="listbox_select" type="image"\n
title="Action" alt="Action" name="Base_doSelect:method"\n title="Action" alt="Action" name="Base_doSelect:method"\n
tal:attributes="id string:${field_id}_select;\n tal:attributes="id string:${field_id}_select;\n
...@@ -333,10 +347,9 @@ ...@@ -333,10 +347,9 @@
tal:content="section_name"/>\n tal:content="section_name"/>\n
</td>\n </td>\n
\n \n
<!--Anchor column -->\n <!--Anchor cell -->\n
<td tal:condition="python:show_anchor_column"\n <td tal:condition="show_anchor_column"\n
class="AnchorColumn" \n class="listbox-table-anchor-cell">\n
style="text-align: center; vertical-align: middle;">\n
<!--Use [0][4] ? :(-->\n <!--Use [0][4] ? :(-->\n
<a href="#" tal:attributes="href python:render_result[0][4]">\n <a href="#" tal:attributes="href python:render_result[0][4]">\n
<img src="document_icon.gif" alt="document" \n <img src="document_icon.gif" alt="document" \n
...@@ -344,23 +357,20 @@ ...@@ -344,23 +357,20 @@
</a>\n </a>\n
</td>\n </td>\n
\n \n
<!--Select column -->\n <!--Select cell -->\n
<td tal:condition="python: show_select_column"\n <td tal:condition="show_select_column"\n
class="select_cell" style="text-align: center; vertical-align: middle">\n class="listbox-table-select-cell">\n
<input tal:condition="python: not line.isSummary()"\n <input tal:condition="python: not line.isSummary()"\n
type="checkbox" id="listbox_cb_1" name="uids:list"\n type="checkbox" id="listbox_cb_1" name="uids:list"\n
tal:attributes="checked python: line.getUid() in checked_uid_set;\n tal:attributes="checked python: line.getUid() in checked_uid_set;\n
value line/getUid;\n value line/getUid;\n
id string:${field_id}_cb_${line/getUid}" /> \n id string:${field_id}_cb_${line/getUid}" /> \n
</td>\n </td>\n
\n \n
<!-- Data cells -->\n
<tal:block tal:repeat="value render_result">\n <tal:block tal:repeat="value render_result">\n
<!--Define many var but use only ONE !-->\n <td class="listbox-table-data-cell"\n
<td tal:define="html python: value[0];\n tal:define="html python: value[0];">\n
original_value python: value[1];\n
error python: value[2];\n
editable_field python: value[3];\n
editable_field_css python: editable_field != None and editable_field.get_value(\'css_class\')">\n
<input tal:condition="not: repeat/value/index"\n <input tal:condition="not: repeat/value/index"\n
type="hidden" value="1" name="listbox_uid:list"\n type="hidden" value="1" name="listbox_uid:list"\n
tal:attributes="value python: line.getUid() or \'\';\n tal:attributes="value python: line.getUid() or \'\';\n
...@@ -496,7 +506,6 @@ ...@@ -496,7 +506,6 @@
</div>\n </div>\n
</div>\n </div>\n
\n \n
<!-- Set a slot for additional content ? -->\n
</div>\n </div>\n
</div>\n </div>\n
</div>\n </div>\n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml
View file @ efdeab9b
...@@ -205,6 +205,21 @@ div.listbox-tree-mode-selection input{\n ...@@ -205,6 +205,21 @@ div.listbox-tree-mode-selection input{\n
width: auto;\n width: auto;\n
}\n }\n
\n \n
.listbox-table-anchor-cell, .listbox-table-select-cell {\n
text-align: center; \n
vertical-align: middle;\n
}\n
\n
th.listbox-table-report-tree-selection-cell{\n
width: 50px; \n
}\n
\n
td.domain-tree-table-cell{\n
text-align: left; \n
vertical-align: top; \n
white-space: nowrap;\n
}\n
\n
/*Footer block*/\n /*Footer block*/\n
div.listbox-footer{\n div.listbox-footer{\n
background-color:#F0EFE9;\n background-color:#F0EFE9;\n
...@@ -288,12 +303,12 @@ div.listbox-page-navigation input{\n ...@@ -288,12 +303,12 @@ div.listbox-page-navigation input{\n
\n \n
/* Report tree */\n /* Report tree */\n
a.tree_closed {\n a.tree_closed {\n
background:transparent url(\'./km_img/tree_closed.png\') no-repeat scroll left center;\n background:transparent url(\'./images/tree_closed.png\') no-repeat scroll left center;\n
padding-left:15px;\n padding-left:15px;\n
}\n }\n
\n \n
a.tree_open {\n a.tree_open {\n
background:transparent url(\'./km_img/tree_open.png\') no-repeat scroll left center;\n background:transparent url(\'./images/tree_open.png\') no-repeat scroll left center;\n
padding-left:15px;\n padding-left:15px;\n
}\n }\n
\n \n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/tree_closed.png.xml deleted 100644 → 0
View file @ 3c2db1a7
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Image" module="OFS.Image"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>http_cache</string> </value>
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts71684380.16</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>tree_closed.png</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>image/png</string> </value>
</item>
<item>
<key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAZ0lEQVQYV32QsQrAIAxE8+/t99T+
SKHZXd1cBBcHSbkDA23RwIPj7k2RM6js22UzsFNYHXaXWmtERDz/pFIKgTTyS+q9c/yC3qVaq8UY
CcaR0buUczZVJZBGRu9SSmkKpXDcyz9hfwBS5fiIbVgClQAAAABJRU5ErkJggg==</string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <int>9</int> </value>
</item>
<item>
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>160</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <int>9</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/tree_open.png.xml deleted 100644 → 0
View file @ 3c2db1a7
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Image" module="OFS.Image"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>http_cache</string> </value>
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts71684364.69</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>tree_open.png</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>image/png</string> </value>
</item>
<item>
<key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAXElEQVQYV32QMQrAMAhFvXt7nqYX
KdTd1c1FyJJBLGYQiiTCW/57k3A3hPN4fEX4GewufEZjjEKJVLXwi8zMAaAQe0a9dyeiQuwZiYgj
YiH2jJh5yYza9W7/FP4DhZwDXIMDO98AAAAASUVORK5CYII=</string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <int>9</int> </value>
</item>
<item>
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>149</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <int>9</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_km/bt/revision
View file @ efdeab9b
1501 1502
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7