diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2011-09-22 15:46:17 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2011-09-22 15:46:17 +0530 |
| commit | dbe1e67f9274e58a1a4eec4295ade68558ab40a2 (patch) | |
| tree | a2debbf5f5c31c7666560cb04b95f7e1ee20c131 /addons/web/static/src/xml/base.xml | |
| parent | 27e6b96bb5871129862b2d9fbbcfffdc7df800b9 (diff) | |
| parent | 60d9065ff1d0115be69440cdc44543ddceab81a9 (diff) | |
[MERGE] Merge from openerp-web.
bzr revid: jra@tinyerp.com-20110922101617-u1gz39qnnopj016r
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 3870ef43b67..a451912dcb8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -800,13 +800,15 @@ ></textarea> <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/> </t> -<t t-name="FieldDate"> - <t t-call="FieldChar"/> - <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> +<t t-name="web.datetimepicker"> + <div class="oe_datepicker_root"> + <input type="text" size="1" style="width: 100%"/> + <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> </div> </t> <t t-name="FieldSelection"> @@ -1051,6 +1053,18 @@ <t t-if="filters.length" t-raw="filters.render(defaults)"/> </div> </t> +<t t-name="SearchView.date"> + <label t-att-class="'oe_label' + (attrs.help ? '_help' : '')" + t-att-title="attrs.help" + t-att-for="element_id"> + <t t-esc="attrs.string || attrs.name"/> + <span t-if="attrs.help">?</span> + </label> + <div style="white-space: nowrap;"> + <span t-att-id="element_id"></span> + <t t-if="filters.length" t-raw="filters.render(defaults)"/> + </div> +</t> <t t-name="SearchView.field.selection"> <label t-att-title="attrs.help" t-att-class="'oe_label' + (attrs.help ? '_help' : '')" @@ -1142,11 +1156,8 @@ <t t-name="SearchView.extended_search.proposition.char"> <input t-att-id="element_id" class="field_char"/> </t> -<t t-name="SearchView.extended_search.proposition.datetime"> - <input t-att-id="element_id" class="field_datetime"/> -</t> -<t t-name="SearchView.extended_search.proposition.date"> - <input t-att-id="element_id" class="field_date"/> +<t t-name="SearchView.extended_search.proposition.empty"> + <span t-att-id="element_id"></span> </t> <t t-name="SearchView.extended_search.proposition.integer"> <input type="number" t-att-id="element_id" class="field_integer" step="1"/> |