diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-05-17 11:06:26 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-05-17 11:06:26 +0200 |
| commit | dddabd3e0cefb0f4fbc622d2e5df05f2d4fafef7 (patch) | |
| tree | 81af3e85bdb50ef8a61f4ef6443b54787ac5fccb /addons/web/static/src/xml/base.xml | |
| parent | d24e53c6ed4da8acd516be32d9d8067b43d771bc (diff) | |
| parent | 8adb904c2367de9f7b2c30ea6eb4724e32c90c86 (diff) | |
[MERGE] [IMP] 'Stage Bar Manu' Task. This task improves the statusbar widget. Folded columns are
not hidden anymore, but available in a side menu accessible after other stages. The
purpose is to be able to have access to all stages using this widget. This way we will be
able to remove some action buttons in form views in a future task.
This web branch updates the statusbar widget (JS and CSS).
bzr revid: tde@openerp.com-20130517090626-n1g1k1o4r8wk9l4v
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 943326f5011..14c7f722ec2 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -650,7 +650,7 @@ <li t-if="section.name == 'files'" class="oe_sidebar_add_attachment"> <t t-call="HiddenInputFile"> <t t-set="fileupload_id" t-value="widget.fileupload_id"/> - <t t-set="fileupload_action">/web/binary/upload_attachment</t> + <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t> <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/> <input type="hidden" name="id" t-att-value="widget.model_id"/> <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/> @@ -1218,13 +1218,25 @@ <ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_status_clickable' : 'oe_form_status')" t-att-style="widget.node.attrs.style"/> </t> <t t-name="FieldStatus.content"> - <t t-foreach="widget.selection" t-as="i"> + <t t-foreach="widget.selection.unfolded" t-as="i"> <li t-att-class="i[0] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[0]"> <span class="label"><t t-esc="i[1]"/></span> <!-- are you mit ? --> <span class="arrow"><span></span></span> </li> </t> + <t t-if="widget.selection.folded.length"> + <li t-att-class="value_folded ? 'oe_active oe_folded' : 'oe_folded'"> + <span class="label"> ... </span> + <ul> + <t t-foreach="widget.selection.folded" t-as="i"> + <li t-att-class="i[0] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[0]"> + <span class="label"><t t-esc="i[1]"/></span> + </li> + </t> + </ul> + </li> + </t> </t> <t t-name="FieldBinaryImage"> <span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style"> @@ -1552,8 +1564,9 @@ <t t-esc="attrs.string"/> </button> <ul t-name="SearchView.filters"> - <li t-foreach="widget.filters" t-as="filter" t-if="filter.visible()" - t-att-title="filter.attrs.string ? filter.attrs.help : undefined"> + <li t-foreach="widget.filters" t-as="filter" t-if="!filter.visible || filter.visible()" + t-att-title="filter.attrs.string ? filter.attrs.help : undefined" + t-att-data-index="filter_index"> <t t-esc="filter.attrs.string or filter.attrs.help or filter.attrs.name or 'Ω'"/> </li> </ul> |