diff options
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 112 |
1 files changed, 54 insertions, 58 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 8baf7ce561e..27a99f61c05 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)"/> @@ -645,7 +649,7 @@ <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help" t-att-class="'oe-field-cell' + (align ? ' oe-number' : '')" t-att-data-field="column.id"> - <t t-raw="render_cell(record.toForm().data, column)"/> + <t t-raw="render_cell(record, column)"/> </td> </t> <td t-if="options.deletable" class='oe-record-delete' width="1"> @@ -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> @@ -754,12 +753,6 @@ <t t-call="WidgetFrame"/> </div> </t> -<t t-name="WidgetNotebook.readonly"> - <t t-foreach="widget.pages" t-as="page"> - <h3><t t-esc="page.string"/></h3> - <t t-raw="page.render()"/> - </t> -</t> <t t-name="WidgetSeparator"> <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation"> <t t-esc="widget.string"/> @@ -869,9 +862,9 @@ </t> <t t-name="FieldMany2One.context_menu"> <ul> - <li t-att-id="widget.cm_id + '_open'" style="color:grey">Open...</li> - <li t-att-id="widget.cm_id + '_create'">Create...</li> - <li t-att-id="widget.cm_id + '_search'" class="oe_m2o_menu_item_mandatory">Search...</li> + <li t-att-id="widget.cm_id + '_open'" style="color:grey" class="oe_m2o_menu_item_mandatory">Open...</li> + <li t-att-id="widget.cm_id + '_create'" class="oe_m2o_menu_item_noreadonly">Create...</li> + <li t-att-id="widget.cm_id + '_search'" class="oe_m2o_menu_item_noreadonly">Search...</li> <t t-set="i" t-value="0"/> <t t-foreach="widget.related_entries" t-as="entry"> <li t-att-id="widget.cm_id + '_related_' + i" style="color:grey" class="oe_m2o_menu_item_mandatory"> @@ -1469,7 +1462,8 @@ <a id="importview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Import</a> </t> <t t-name="ImportDataView"> -<form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data"> +<form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data" + class="oe-import oe-import-no-result"> <input type="hidden" name="session_id" t-att-value="session.session_id"/> <h2 class="separator horizontal">1. Import a .CSV file</h2> <p>Select a .CSV file to import. If you need a sample of file to import, @@ -1479,11 +1473,11 @@ <label for="csvfile">CSV File:</label> <input type="file" id="csvfile" size="50" name="csvfile"/> </p> - <h2 class="separator horizontal">2. Check your file format</h2> - <div id="result"></div> - <fieldset> - <legend style="cursor:pointer;">Import Options</legend> - <table style="display:none"> + <h2 class="separator horizontal oe-import-result">2. Check your file format</h2> + <div id="result" class="oe-import-result"></div> + <fieldset class="oe-closed oe-import-result"> + <legend>Import Options</legend> + <table> <tr> <td colspan="4"> <label for="file_has_headers">Does your file have titles?</label> @@ -1513,22 +1507,24 @@ </fieldset> </form> </t> -<table t-name="ImportView.result" - class="oe_import_grid" width="100%" style="margin: 5px 0;"> - <tr t-if="headers" class="oe_import_grid-header"> - <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"> - <t t-esc="header"/></td> - </tr> - <tr> - <td t-foreach="records[0]" t-as="column"> - <input class="sel_fields"/> - </td> - </tr> - <tr t-foreach="records" t-as="record" class="oe_import_grid-row"> - <td t-foreach="record" t-as="cell" class="oe_import_grid-cell"> - <t t-esc="cell"/></td> - </tr> -</table> +<t t-name="ImportView.result"> + <table class="oe_import_grid" width="100%" style="margin: 5px 0;"> + <tr t-if="headers" class="oe_import_grid-header"> + <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"> + <t t-esc="header"/></td> + </tr> + <tr> + <td t-foreach="records[0]" t-as="column"> + <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe-m2o-drop-down-button"> + <img src="/web/static/src/img/down-arrow.png" /></span> + </td> + </tr> + <tr t-foreach="records" t-as="record" class="oe_import_grid-row"> + <td t-foreach="record" t-as="cell" class="oe_import_grid-cell"> + <t t-esc="cell"/></td> + </tr> + </table> +</t> <t t-name="ImportView.error"> <p style="white-space:pre-line;">The import failed due to:<t t-esc="error.message"/></p> <t t-if="error.preview"> |