diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-05-23 13:29:41 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-05-23 13:29:41 +0200 |
| commit | 64dc8880532ab198147a03fe6c78b28bd1af794e (patch) | |
| tree | d86865b686dc68b161f18c16f32656a9c1521c8b /addons/web/static/src/xml/base.xml | |
| parent | 9168a66d6a5403495d74bb9136b85438004540ed (diff) | |
| parent | a54a3d73c58cbed96c07b30fab61a41db2c57376 (diff) | |
[MERGE] from trunk
bzr revid: xmo@openerp.com-20120523112941-botqwc4jpnk86571
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 7047b722462..14f6f727daf 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -136,7 +136,7 @@ </tr> <tr> <td><label for="db_name">New database name:</label></td> - <td><input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_]+$"/></td> + <td><input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_]+$" autofocus="true"/></td> </tr> <tr> <td><label for="demo_data">Load Demonstration data:</label></td> @@ -1529,8 +1529,6 @@ <t t-name="SearchView.extended_search.proposition.float"> <input type="number" class="field_float" step="0.01"/> </t> -<t t-name="SearchView.extended_search.proposition.boolean"> -</t> <t t-name="SearchView.extended_search.proposition.selection"> <select> <t t-foreach="widget.field.selection" t-as="element"> @@ -1538,7 +1536,7 @@ </t> </select> </t> -<t t-name="SelectCreatePopup"> +<t t-name="AbstractFormPopup.render"> <div> <table style="width:100%"> <tr style="width:100%"> @@ -1552,31 +1550,22 @@ </td> </tr> </table> - <div class="oe-select-create-popup-view-form" style="width:100%"></div> + <div class="oe-form-view-popup-form-placeholder oe-select-create-popup-view-form" style="width:100%"></div> </div> </t> <t t-name="SelectCreatePopup.search.buttons"> <button type="button" class="oe_button oe_selectcreatepopup-search-select" disabled="disabled">Select</button> <button type="button" class="oe_button oe_selectcreatepopup-search-close">Cancel</button> </t> -<t t-name="SelectCreatePopup.form.buttons"> - <t t-if="widget.options.disable_multiple_selection"> - <button type="button" class="oe_button oe_selectcreatepopup-form-save">Save</button> +<t t-name="AbstractFormPopup.buttons"> + <t t-if="! multi_select"> + <button type="button" class="oe_button oe_abstractformpopup-form-save">Save</button> </t> - <t t-if="! widget.options.disable_multiple_selection"> - <button type="button" class="oe_button oe_selectcreatepopup-form-save-new">Save & New</button> - <button type="button" class="oe_button oe_selectcreatepopup-form-save">Save & Close</button> + <t t-if="multi_select"> + <button type="button" class="oe_button oe_abstractformpopup-form-save-new">Save & New</button> + <button type="button" class="oe_button oe_abstractformpopup-form-save">Save & Close</button> </t> - <button type="button" class="oe_button oe_selectcreatepopup-form-close">Cancel</button> -</t> -<t t-name="FormOpenPopup"> - <div> - <div class="oe-form-open-popup-form-view" style="width:100%"></div> - </div> -</t> -<t t-name="FormOpenPopup.form.buttons"> - <button type="button" class="oe_button oe_formopenpopup-form-save">Save</button> - <button type="button" class="oe_button oe_formopenpopup-form-close">Cancel</button> + <button type="button" class="oe_button oe_abstractformpopup-form-close">Cancel</button> </t> <t t-extend="ListView.row"> <!-- adds back padding to row being rendered after edition, if necessary |