diff options
| author | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-10-24 18:42:18 +0530 |
|---|---|---|
| committer | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-10-24 18:42:18 +0530 |
| commit | 1e27353ed75cae9b415ce7c24ccaa7ccaca0446d (patch) | |
| tree | e2c717762f2e5c6820a1a3329e25a94190a2f917 /addons/web/static/src/xml/base.xml | |
| parent | 59f3ab077f4d44b443033069932ca489777fbd13 (diff) | |
| parent | f1f48e69f0e654487234ced0537a03dd46fb3e12 (diff) | |
[MERGE]merge main view editor branch upto 890 revision.
bzr revid: kch@tinyerp.com-20111024131218-p6liwm82irnd3q4c
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index cf74e14ebfc..f8f316eb6a0 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -449,11 +449,11 @@ </blockquote> <a class="oe-shortcut-toggle" title="Add / Remove Shortcut..." href="javascript: void(0)"> </a> - <h2 class="oe_view_title" t-if="self.session.debug || self.flags.display_title !==false"> - <t t-if="self.flags.display_title !==false" t-esc="self.action.name"/> - <button t-if="self.session.debug" class="oe_get_xml_view"> - View#<span></span> - </button> + <button t-if="self.session.debug" class="oe_get_xml_view"> + View#<span></span> + </button> + <h2 class="oe_view_title" t-if="self.flags.display_title !== false"> + <t t-if="self.flags.display_title !== false" t-esc="self.action.name"/> </h2> </t> <t t-jquery=".oe-view-manager-header" t-operation="after"> @@ -568,21 +568,7 @@ Delete </button> </td> - <th t-if="options.pager !== false" class="oe-list-pager"> - <button type="button" disabled="disabled" - data-pager-action="first">First</button> - <button type="button" disabled="disabled" - data-pager-action="previous" - ><</button> - - <span class="oe-pager-state"> - </span> - - <button type="button" disabled="disabled" - data-pager-action="next">></button> - <button type="button" disabled="disabled" - data-pager-action="last">Last</button> - </th> + <t t-call="Listview.navigation.button"/> </tr> </table> </th> @@ -612,8 +598,26 @@ </td> <td t-if="options.deletable"/> </tr> + <tr> + <t t-call="Listview.navigation.button"/> + </tr> </tfoot> </table> +<th t-name="Listview.navigation.button" t-if="options.pager !== false" + class="oe-list-pager" t-att-colspan="columns_count"> + <button type="button" disabled="disabled" + data-pager-action="first">First</button> + <button type="button" disabled="disabled" + data-pager-action="previous"><</button> + + <span class="oe-pager-state"> + </span> + + <button type="button" disabled="disabled" + data-pager-action="next">></button> + <button type="button" disabled="disabled" + data-pager-action="last">Last</button> +</th> <t t-name="ListView.rows" t-foreach="records.length" t-as="index"> <t t-call="ListView.row"> <t t-set="record" t-value="records.at(index)"/> @@ -658,15 +662,10 @@ <t t-name="FormView"> <div class="oe_form_header"> <div class="oe_form_buttons" t-if="view.options.action_buttons !== false"> - <!--<button type="button" class="oe_form_button_save"> + <button type="button" class="oe_form_button_save"> <span class="oe_form_on_update">Save</span> <span class="oe_form_on_create">Create</span> - </button>--> - <button type="button" class="oe_form_button_save_edit"> - <span class="oe_form_on_update">Save & Edit</span> - <span class="oe_form_on_create">Create & Edit</span> </button> - <!--<button type="button" class="oe_form_button_cancel">Cancel</button>--> <button type="button" class="oe_form_button_new">New</button> <button type="button" class="oe_form_button_duplicate oe_form_on_update">Duplicate</button> <button type="button" class="oe_form_button_toggle">Readonly/Editable</button> |