diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-09-18 17:32:38 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-09-18 17:32:38 +0200 |
| commit | a02496b5f88cff1e8332d6ddf1f41c8516fd7b3e (patch) | |
| tree | 735b82b9586bee3fa20fc9bb4d13d0ca2697b0cc /addons/web/static/src/xml/base.xml | |
| parent | 3fd98b0f80f4bfe20fbced3f4990f79065b06b1e (diff) | |
| parent | b08efa691824370130be1f009472ba7f59096127 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20120918153238-s0vvfwy5thpk8imc
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b6b89a4f1ec..232d4b618d7 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -650,9 +650,11 @@ </table> <div t-name="ListView.buttons" class="oe_list_buttons"> <t t-if="!widget.no_leaf and widget.options.action_buttons !== false and widget.options.addable and widget.is_action_enabled('create')"> - <button type="button" class="oe_button oe_list_add oe_highlight"> - <t t-esc="widget.options.addable"/> - </button> + <div name="oe_list_add_div"> + <button type="button" class="oe_button oe_list_add oe_highlight"> + <t t-esc="widget.options.addable"/> + </button> + </div> </t> </div> <t t-name="ListView.pager"> @@ -693,7 +695,7 @@ </td> </tr> <t t-extend="ListView.buttons"> - <t t-jquery="button.oe_list_add" t-operation="after"> + <t t-jquery="div.oe_list_add_div" t-operation="after"> <button class="oe_button oe_list_save oe_highlight" type="button">Save</button> <span class="oe_alternative"> @@ -740,7 +742,7 @@ <t t-name="FormView.pager"> <div class="oe_form_pager"> <t t-if="widget.options.pager !== false" t-call="ViewPager"> - <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span> + <span class="oe_form_pager_state"></span> </t> </div> </t> @@ -917,6 +919,7 @@ t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" t-att-placeholder="widget.node.attrs.placeholder" + t-att-maxlength="widget.field.size" /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/> </t> </span> @@ -931,6 +934,7 @@ t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" t-att-placeholder="widget.node.attrs.placeholder" + t-att-maxlength="widget.field.size" /> </div> </t> @@ -949,6 +953,7 @@ t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" t-att-placeholder="! widget.get('effective_readonly') ? widget.node.attrs.placeholder : ''" + t-att-maxlength="widget.field.size" ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate and !widget.get('effective_readonly')" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0" @@ -1235,8 +1240,8 @@ <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save</button> </t> <t t-if="multi_select"> - <button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save & New</button> <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save & Close</button> + <button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save & New</button> </t> or </t> @@ -1698,4 +1703,14 @@ <div class="oe_throbber_message" style="color:white"></div> </div> </t> +<t t-name="M2ODialog"> + <div> + 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> +</t> </templates> |