diff options
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 55280f6badb..5d55a0ece15 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -329,21 +329,20 @@ </span> </t> <t t-name="UserMenu.about"> - <div> - <a class="oe_activate_debug_mode" href="?debug" style="float:right; font-size: 80%;">Activate the developer mode</a> - <h1 style="margin:0;">OpenERP</h1> - <h3 style="margin:15px 0;padding:0;">Version <t t-esc="version_info.version"/></h3> - <p> - Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br /> - OpenERP is a trademark of the <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP SA Company</a>. - </p> - <p> - Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a> - </p> - <p> - For more information visit <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP.com</a> - </p> + + <div class="oe_about"> + <a class="oe_activate_debug_mode oe_right" href="?debug">Activate the developer mode</a> + <img class="oe_logo" src="/web/static/src/img/logo2.png"/> + <h3>Version <t t-esc="version_info.version"/></h3> + + <div class="oe_bottom"> + <p>Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br /> + OpenERP is a trademark of the <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP SA Company</a>.</p> + <p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a></p> + <p>For more information visit <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP.com</a></p> + </div> </div> + </t> <t t-name="UserMenu.password"> <form name="change_password_form" method="POST"> @@ -630,9 +629,9 @@ <button type="button" class="oe_button oe_list_add oe_highlight"> <t t-esc="widget.options.addable"/> </button> - <t t-if="widget.options.import_enabled"> + <span class="oe_alternative" t-if="widget.options.import_enabled"> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a> - </t> + </span> </t> </div> <t t-name="ListView.pager"> @@ -652,6 +651,7 @@ <tr t-name="ListView.row" t-att-class="row_parity" t-att-data-id="record.get('id')" t-att-style="view.style_for(record)"> + <t t-set="asData" t-value="record.toForm().data"/> <t t-foreach="columns" t-as="column"> <td t-if="column.meta"> @@ -663,23 +663,26 @@ <input t-if="!options.radio" type="checkbox" name="radiogroup" t-att-checked="checked"/> </th> <t t-foreach="columns" t-as="column"> - <t t-set="align" t-value="column.type === 'integer' or column.type == 'float'"/> + <t t-set="number" t-value="column.type === 'integer' or column.type == 'float'"/> + <t t-set="modifiers" t-value="column.modifiers_for(asData)"/> <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help" - t-att-class="'oe_list_field_cell' + (align ? ' oe_number' : '') - + (column.tag === 'button' ? ' oe_button' : '')" - t-att-data-field="column.id"> - <t t-raw="render_cell(record, column)"/> - </td> + t-attf-class="oe_list_field_cell oe_list_field_#{column.widget or column.type} #{number ? 'oe_number' : ''} #{column.tag === 'button' ? 'oe-button' : ''} #{modifiers.readonly ? 'oe_readonly' : ''}" + t-att-data-field="column.id" + ><t t-raw="render_cell(record, column)"/></td> </t> <td t-if="options.deletable" class='oe_list_record_delete' width="1"> <button type="button" name="delete" class="oe_i">d</button> </td> </tr> -<t t-name="ListView.row.save"> - <td> - <button class='oe_i oe_list_edit_row_save' type='button' name='save'/> - </td> +<t t-extend="ListView.buttons"> + <t t-jquery="button.oe_list_add" t-operation="after"> + <button class="oe_button oe_list_save oe_highlight" + type="button">Save</button> + </t> + <t t-jquery="a.oe_list_button_import" t-operation="after"> + <a href="#" class="oe_bold oe_list_discard">discard</a> + </t> </t> <t t-name="FormView"> @@ -956,7 +959,7 @@ <span class="oe_form_m2o_follow"/> </t> <t t-if="!widget.get('effective_readonly')"> - <a href="#" class="oe_m2o_cm_button oe_e oe_right">/</a> + <a href="#" tabindex="-1" class="oe_m2o_cm_button oe_e oe_right">/</a> <div> <input type="text" t-att-id="widget.id_for_label" @@ -1216,6 +1219,8 @@ <div class="oe_searchview_clear"/> <div class="oe_searchview_unfold_drawer" title="Advanced Search..."/> <div class="oe_searchview_drawer"/> + <button type="button" class="oe_searchview_search" + title="Search Again">Search</button> </div> <div t-name="SearchView.InputView" @@ -1403,8 +1408,8 @@ <div t-name="SearchView.addtodashboard" class="oe_searchview_dashboard"> <h4>Add to Dashboard</h4> <form> - <input placeholder ="Title of new Dashboard item" title = "Title of new Dashboard item" type="text"/> - <button class="oe_apply" type="submit">save</button> + <p><input placeholder ="Title of new Dashboard item" title = "Title of new Dashboard item" type="text"/></p> + <button class="oe_apply" type="submit">Save</button> </form> </div> <t t-name="SearchView.addtodashboard.selection"> @@ -1498,7 +1503,7 @@ missing columns --> <t t-jquery="> :last" t-operation="after"> - <td t-if="edited and !options.deletable" class="oe_list_padding"/> + <td t-if="edited and !options.deletable" class="oe-listview-padding"/> </t> </t> |