diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2011-11-22 11:47:53 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2011-11-22 11:47:53 +0530 |
| commit | 67e7ba0d0037e82196d34c4a0e57244ea40f015e (patch) | |
| tree | af48ad5669afedcb28bd3ab9a862f3ec5a50e332 /addons/web/static/src/xml | |
| parent | d206d8dc42f4c364a407637d346e18d01ae4eaad (diff) | |
| parent | 1a2277c1407315546559eb8ed838018febcba9d5 (diff) | |
[MERGE]resove conflict and merge with main branch.
bzr revid: vme@tinyerp.com-20111122061753-5uxqy3mxw0eedthn
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 25cfaee1232..6d35cf15d6c 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -18,7 +18,7 @@ </div> </t> <t t-name="Interface"> - <div id="oe_loading" class="loading"></div> + <div id="oe_loading"></div> <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table"> <tr> <td colspan="2" valign="top"> @@ -63,7 +63,9 @@ </table> </t> <t t-name="Loading"> + <div class="loading"> Loading... + </div> </t> <t t-name="Database"> <ul class="db_options" style="padding: 0px; display: inline;"> @@ -703,7 +705,7 @@ </t> <t t-name="Widget"> Unhandled widget - <t t-raw="console.log('Unhandled widget', widget)"/> + <t t-js="dict">console.warn('Unhandled widget', dict.widget);</t> </t> <t t-name="WidgetFrame"> <table border="0" width="100%" cellpadding="0" cellspacing="0" class="oe_frame oe_forms"> @@ -896,13 +898,13 @@ </t> <t t-name="web.datetimepicker"> <div class="oe_datepicker_root"> - <input type="text" size="1" style="width: 100%"/> + <input type="text" size="1" style="width: 100%" + t-att-name="widget.name" + t-attf-class="oe_datepicker_master field_#{widget.type_of_date}" + /> <img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png" title="Select date" width="16" height="16" border="0"/> - <div class="oe_datepicker ui-widget-content ui-corner-all" style="display: none; position: absolute; z-index: 1;"> - <div class="oe_datepicker_container"/> - <button type="button" class="oe_datepicker_close ui-state-default ui-priority-primary ui-corner-all" style="float: right;">Done</button> - </div> + <input type="text" size="1" class="oe_datepicker_container" disabled="disabled"/> </div> </t> <t t-name="FieldSelection"> @@ -1070,7 +1072,7 @@ </table> </t> <t t-name="WidgetButton"> - <button type="button" style="width: 100%" class="button"> + <button type="button" class="oe_button"> <img t-if="widget.node.attrs.icon" t-att-src="'/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/> <span t-if="widget.string"><t t-esc="widget.string"/></span> </button> @@ -1152,8 +1154,8 @@ t-att-title="attrs.help" t-att-class="classes.join(' ')" t-att-autofocus="attrs.default_focus === '1' ? 'autofocus' : undefined"> - <img t-if="attrs.icon" t-att-src="'/web/static/src/img/icons/' + attrs.icon + '.png'" width="16" height="16"/> - <br t-if="attrs.icon and attrs.string"/> + <img t-att-src="'/web/static/src/img/icons/' + (attrs.icon || 'gtk-home') + '.png'" width="16" height="16"/> + <br t-if="attrs.string"/> <t t-esc="attrs.string"/> </button> <span t-name="SearchView.filters" class="filter_label_group" |