diff options
| author | Vishmita <vja@tinyerp.com> | 2012-08-17 10:56:00 +0530 |
|---|---|---|
| committer | Vishmita <vja@tinyerp.com> | 2012-08-17 10:56:00 +0530 |
| commit | d2144a9f4c73a2119c63522ea605f68e6b7142ed (patch) | |
| tree | aea2a9d6f7546c5ae1dba41b9808d7499d86ba1c /addons/web/static/src/xml/base.xml | |
| parent | f1dd8b488d68fa5fc95fb77d935739ed5953d0ba (diff) | |
| parent | 281877d27470826b8b4925aaa1e79d14c95f963f (diff) | |
[Merge]Merge trunk
bzr revid: vja@tinyerp.com-20120817052600-h0swfteh2kfve7kn
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 0fc022f15c8..317e2d4e242 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -975,6 +975,14 @@ /> </div> </t> +<t t-name="FieldTextHtml"> + <div t-att-class="'oe_form_field oe_form_field_html' + (widget.get('effective_readonly') ? ' oe_form_embedded_html' : '')" + t-att-style="widget.node.attrs.style"> + <t t-if="! widget.get('effective_readonly')"> + <textarea/> + </t> + </div> +</t> <t t-name="web.datepicker"> <span> <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/> @@ -1728,5 +1736,12 @@ <div t-name="Many2ManyKanban.quick_create" class="oe_kanban_quick_create"> <input t-att-placeholder="_t('Type name to search')"/> </div> - +<t t-name="Throbber"> + <div> + <div class="oe_blockui_spin" style="height: 50px"> + </div> + <br /> + <div style="color:white">Loading...</div> + </div> +</t> </templates> |