diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-05-22 15:22:46 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-05-22 15:22:46 +0200 |
| commit | 74c3a2b2020dd3caa65346f0c702be6e58477ae4 (patch) | |
| tree | 4987280cda5a68d8ed1a1666005f259b65961c68 /addons/web/static/src/xml | |
| parent | 174362aac03f2d19b655568c96fdc8aadb20826a (diff) | |
| parent | ca6283de8efc7d790fe1d6d843ec264777b3ae47 (diff) | |
[MERGE] from trunk
bzr revid: xmo@openerp.com-20120522132246-49w7jbkaytd7q3k2
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 28cba6062d7..47939a76b4b 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> @@ -1534,7 +1534,7 @@ </t> </select> </t> -<t t-name="SelectCreatePopup"> +<t t-name="AbstractFormPopup.render"> <div> <table style="width:100%"> <tr style="width:100%"> @@ -1548,31 +1548,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 |