diff options
| author | vda (OpenERP) <vda@tinyerp.com> | 2011-04-27 15:54:56 +0530 |
|---|---|---|
| committer | vda (OpenERP) <vda@tinyerp.com> | 2011-04-27 15:54:56 +0530 |
| commit | 023119776de85a8274f88941adeb577a773ac00a (patch) | |
| tree | 681a78071cecae21c72c9817b7d37ac0debd5847 /addons/base/static/src/xml | |
| parent | bf5a922f889e81e1393523c3b9a3837932961b36 (diff) | |
| parent | ceb524e3376d92dde25e68dd7d74b6de0a5c8a6d (diff) | |
[MERGE] Merged latest trunk branch.Improved dashboard using addwidget api.
bzr revid: vda@tinyerp.com-20110427102456-icjhuk24ke8x8cbg
Diffstat (limited to 'addons/base/static/src/xml')
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index cbb90ca9e2e..b49ef2c7d6a 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -18,9 +18,6 @@ </div> </div> <div id="oe_login" class="login"></div> - <div style="position: absolute; right: 2px; top: 38px;"> - <button onclick="QWeb.add_template('base.xml'); $('body').css('background-color', '#FFFF9C'); setTimeout(function() { $('body').css('background-color', '#FFF'); }, 500);">Reload QWEB</button> - </div> <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" t-att-class="'main_table' + (typeof kitten == 'undefined' ? '' : ' kitten-mode-activated')"> <tr> @@ -33,10 +30,7 @@ <td valign="top" id="oe_secondary_menu" class="secondary_menu"> </td> <td valign="top" width="100%" height="100%"> - <div id="oe_main" class="main"> - <div id="oe_app" class="application"></div> - <div id="oe_sidebar"></div> - </div> + <div id="oe_app" class="oe-application"></div> </td> </tr> <tr> @@ -135,23 +129,23 @@ <t t-name="ViewManager"> <table class="view-manager-main-table"> <tr> - <td class="view-manager-main-content"> - <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" --> - <div class="oe_vm_switch"> - <t t-foreach="views" t-as="view"> - <button type="button" t-att-data-view-type="view[1]"> - <t t-esc="view[1]"/> - </button> - </t> - </div> - <div t-attf-id="#{prefix}_search"/> - <t t-foreach="views" t-as="view"> - <div t-attf-id="#{prefix}_view_#{view[1]}"/> - </t> - </td> - <td class="view-manager-main-sidebar"> - </td> - </tr> + <td class="view-manager-main-content"> + <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" --> + <div class="oe_vm_switch"> + <t t-foreach="views" t-as="view"> + <button type="button" t-att-data-view-type="view[1]"> + <t t-esc="view[1]"/> + </button> + </t> + </div> + <div t-attf-id="#{prefix}_search" t-opentag="true"/> + <t t-foreach="views" t-as="view"> + <div t-attf-id="#{prefix}_view_#{view[1]}"/> + </t> + </td> + <td class="view-manager-main-sidebar"> + </td> + </tr> </table> </t> <table t-name="ListView"> @@ -217,7 +211,8 @@ <t t-set="is_button" t-value="column.tag === 'button'"/> <!-- TODO: get correct widget from form --> <t t-if="!is_button and row['data'][column.id].value"> - <t t-esc="row['data'][column.id].value"/> + <t t-set="value" t-value="row['data'][column.id].value"/> + <t t-esc="value instanceof Array ? value[1] : value"/> </t> <button type="button" t-att-title="column.help" t-if="is_button"> @@ -299,7 +294,7 @@ t-att-ondblclick="'console.log(\'' + widget.element_id + '\', openerp.screen.' + widget.element_id + ')'"> <t t-esc="widget.string"/> <span t-if="widget.help">?</span> - <t t-if="widget.string">:</t> + <t t-if="widget.string and widget.node.tag != 'label'">:</t> </label> </t> <t t-name="FieldChar"> |