diff options
| author | Christophe Simonis <chs@openerp.com> | 2011-11-18 14:26:06 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2011-11-18 14:26:06 +0100 |
| commit | f994e70e41d133d8f6430dac3c7b1bef90cdea7e (patch) | |
| tree | f2bf8e8602f580dce526b7a42a2cf86117ac8f71 /addons/web/static/src/xml/base.xml | |
| parent | 4e85f0762cc69af8efdb88ec857329ac955afe0b (diff) | |
| parent | e6f0378bd8e290606fe09ac29788e3f633a345a3 (diff) | |
merge upstream
bzr revid: chs@openerp.com-20111117125432-zhfrcyrtwy9b9cv8
bzr revid: chs@openerp.com-20111118132606-6gh7zmrx7606w8fv
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index beb7fc528a3..24defe23e2e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -714,7 +714,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"> @@ -907,13 +907,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" t-att-src='widget.session.server + "/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"> @@ -1081,7 +1081,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="widget.session.server + '/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> @@ -1163,8 +1163,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="widget.session.server + '/web/static/src/img/icons/' + attrs.icon + '.png'" width="16" height="16"/> - <br t-if="attrs.icon and attrs.string"/> + <img t-att-src="widget.session.server + '/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" |