diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-09-05 15:28:22 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-09-05 15:28:22 +0200 |
| commit | 31bf30d2d0eb78baaa36360b99fe58bf7cd4c9e7 (patch) | |
| tree | d7be61ecd6bb4c8b5552e39b03e2a64eebbbf323 /addons/web/static/src/xml | |
| parent | afba9e8817c458640ae446ac7aaaab79be4fe1e9 (diff) | |
| parent | ed1c173971968eaa96693cb4e1547efa6e6c34e0 (diff) | |
[MERGE] forward port of branch 8.0 up to ed1c173
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f37c282b01c..93269fe588f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -962,7 +962,7 @@ <div class="btn-group kanban_state"> <t t-foreach="widget.states" t-as="rec"> <a t-if="widget.get('value') === rec.name"> - <a class="oe_legend dropdown-toggle" data-toggle="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown"> <span t-att-class="rec.state_class" t-if="widget.get('value') === rec.name" t-att-title="rec.tooltip"/> <span class="sr-only">Toggle Dropdown</span> </a> @@ -971,7 +971,7 @@ <ul class="dropdown-menu state" role="menu"> <t t-foreach="widget.states" t-as="rec"> <t t-if="widget.get('value') !== rec.name"> - <li class="oe_legend" t-att-data-value="rec.name" ><a href="#"> + <li t-att-data-value="rec.name" ><a href="#"> <span t-att-class="rec.state_class" t-att-title="rec.tooltip"/> <t t-raw="rec.state_name" /></a> </li> @@ -983,7 +983,7 @@ <t t-name="Priority"> <ul style="list-style: none; padding-left: 2px; display: inline-block;"> <t t-foreach="widget.priorities" t-as="rec" > - <li t-att-data-value="rec.click_value" class="oe_legend" style="display: inline-block;"> + <li t-att-data-value="rec.click_value" style="display: inline-block;"> <a href="#" t-att-title="rec.name"> <span t-att-class="widget.get('value') gte rec.value and 'oe_e oe_star_on' or 'oe_e oe_star_off'">7</span> </a> @@ -1228,16 +1228,18 @@ </t> <t t-name="FieldBinaryImage"> <span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style"> - <div class="oe_form_field_image_controls oe_edit_only"> - <i class="fa fa-pencil fa-1g pull-left col-md-offset-1 oe_form_binary_file_edit" title="Edit"/> - <i class="fa fa-trash-o fa-1g col-md-offset-5 oe_form_binary_file_clear" title="Clear"/> - <div class="oe_form_binary_progress" style="display: none"> - <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/> - <b>Uploading ...</b> + <t t-if="!widget.get('effective_readonly')"> + <div class="oe_form_field_image_controls oe_edit_only"> + <i class="fa fa-pencil fa-1g pull-left col-md-offset-1 oe_form_binary_file_edit" title="Edit"/> + <i class="fa fa-trash-o fa-1g col-md-offset-5 oe_form_binary_file_clear" title="Clear"/> + <div class="oe_form_binary_progress" style="display: none"> + <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/> + <b>Uploading ...</b> + </div> </div> - </div> - <t t-call="HiddenInputFile"> + <t t-call="HiddenInputFile"> <t t-set="fileupload_id" t-value="widget.fileupload_id"/> + </t> </t> </span> </t> |