diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-06-23 08:44:24 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-06-23 08:44:24 +0200 |
| commit | 31a8d3db3cb94f5245bd10d6cc596f8264474520 (patch) | |
| tree | d04e26717f7a8ebfd693011f054feeb9c89797f4 /addons/web/static/src/xml | |
| parent | 32ac515aaa3d1d3a664f61840b346d728cf6abcb (diff) | |
| parent | e862ff7033dd001a84d7e0a192d0da7b11384bd9 (diff) | |
Merge remote-tracking branch 'odoo/master' into master-default-order-list-ged
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 10 | ||||
| -rw-r--r-- | addons/web/static/src/xml/website.tour.xml | 27 |
2 files changed, 33 insertions, 4 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 913783a2396..69af5cbe91d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1310,15 +1310,16 @@ <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"> - <t t-call="HiddenInputFile"> - <t t-set="fileupload_id" t-value="widget.fileupload_id"/> - Edit - </t> + <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> + <t t-call="HiddenInputFile"> + <t t-set="fileupload_id" t-value="widget.fileupload_id"/> + </t> </span> </t> <t t-name="FieldBinaryImage-img"> @@ -2038,4 +2039,5 @@ </t> <t t-name="StatInfo"> <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t> + </templates> diff --git a/addons/web/static/src/xml/website.tour.xml b/addons/web/static/src/xml/website.tour.xml new file mode 100644 index 00000000000..cae823bd04e --- /dev/null +++ b/addons/web/static/src/xml/website.tour.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<templates id="template" xml:space="preserve"> + <t t-name="tour.popover"> + <div t-attf-class="#{ fixed ? 'popover tour fixed' : 'popover tour' }"> + <div class="arrow" t-if="!next"></div> + <h3 class="popover-title"></h3> + <div class="popover-content"></div> + <t t-if="next or end"> + <nav class="popover-navigation"> + <t t-if="next"> + <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button> + </t> + <small t-if="next && end"> + <span class="text-muted"> or </span> + <button class="btn-link" data-role="end" style="float: none; padding: 0"><t t-esc="end"/></button> + </small> + <t t-if="end && ! next"> + <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button> + </t> + </nav> + </t> + </div> + </t> + <t t-name="tour.popover_title"> + <t t-esc="title"/><button title="End This Tutorial" type="button" class="close" data-role="end">×</button> + </t> +</templates> |