diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-09-20 13:38:15 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-09-20 13:38:15 +0530 |
| commit | 4e28c04c1268934b6413223e3bee2658ef953d14 (patch) | |
| tree | a95921adfe54afd2baf78238913a11beaab03b79 /addons/web/static/src/xml/base.xml | |
| parent | 6652a6096fd4d4c995c49e8c3ab71909b3d09e86 (diff) | |
| parent | 0ea5dd48a7a79b0fd4ce7bb8dafeac3c4d152aec (diff) | |
[MERGE] Merge trunk.
bzr revid: jra@tinyerp.com-20120920080815-orqimgnvzelu0ef6
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 45ec5c432f0..f0b9d624607 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -742,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> @@ -919,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> @@ -933,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> @@ -951,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" @@ -1117,7 +1120,7 @@ <t t-call="HiddenInputFile"> <t t-set="fileupload_id" t-value="widget.fileupload_id"/> <t t-set="fileupload_style">width: 83px;</t> - <button class="oe_button oe_field_button" type="button" title="Set Image"> + <button class="oe_button oe_field_button" type="button"> <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/> <span>Select</span> </button> @@ -1237,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> @@ -1700,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> |