diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-05-02 14:33:55 +0200 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-05-02 14:33:55 +0200 |
| commit | 132ccb71807ea24ff2731f4300ea610ca71731da (patch) | |
| tree | 8eac85efb5b57107f49bef313debe68c60e9e7c5 /addons/web/static/src/xml | |
| parent | 5910f9375f2181da8f847738eb2118073986bc61 (diff) | |
| parent | db48dbef3e5eb738bfeb55c930bddd4a829cb968 (diff) | |
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502123355-9dqpwq1g9rrpisxj
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 7b502bc4e8a..18a55656df2 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -40,7 +40,7 @@ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 class="modal-title"><t t-raw="title"/></h3> </div> - <div class="modal-body"> + <div class="modal-body" style="overflow-y: auto;"> </div> </div> </div> @@ -800,12 +800,11 @@ </t> <button t-name="ListView.row.text_button" type="button" t-att-title="widget.string" t-att-disabled="disabled || undefined" - t-att-class="disabled ? 'oe_list_button_disabled btn' : 'btn'"> - <t t-esc="widget.string"/> -</button> + t-att-class="disabled ? 'oe_list_button_disabled btn_txt oe_link' : 'btn_txt oe_link'" + ><t t-esc="widget.string"/></button> <button t-name="ListView.row.button" type="button" t-att-title="widget.string" t-att-disabled="disabled || undefined" - t-att-class="disabled ? 'oe_list_button_disabled btn_img' : 'btn_img'" + t-att-class="disabled ? 'oe_list_button_disabled' : ''" ><img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png" t-att-alt="widget.string"/></button> <t t-extend="ListView.row"> @@ -943,7 +942,6 @@ </t> <t t-name="FormRenderingLabel"> <label t-att-for="_for" - t-att-title="help" t-attf-class="#{classnames} oe_form_label#{help ? '_help' : ''} oe_align_#{align}"> <t t-esc="string"/> </label> @@ -1005,7 +1003,7 @@ </li> <li t-if="widget.field and widget.field.selection" data-item="selection"> <span class="oe_tooltip_technical_title">Selection:</span> - <ul> + <ul class="oe_tooltip_technical"> <li t-foreach="widget.field.selection" t-as="option"> [<t t-esc="option[0]"/>] <t t-if="option[1]"> - </t> @@ -1949,13 +1947,14 @@ </t> <t t-name="M2ODialog"> <div> + <p class="oe_grey"/> Name: <input class="oe_form_m2o_input_name" type="text"/> </div> </t> <t t-name="M2ODialog.buttons"> - <button class="oe_form_m2o_qc_button oe_button oe_highlight">Quick Add</button> - <button class="oe_form_m2o_sc_button oe_button">Add All Info...</button> - <button class="oe_form_m2o_cancel_button oe_button">Cancel</button> + <button class="oe_form_m2o_qc_button oe_button oe_highlight">Create</button> + <button class="oe_form_m2o_sc_button oe_button">Create and edit</button> or + <button class="oe_form_m2o_cancel_button oe_button oe_link"><span>Cancel</span></button> </t> <t t-name="FieldMonetary" t-extend="FieldChar"> <t t-jquery="t:first" t-operation="before"> |