diff options
| author | Christophe Simonis <chs@openerp.com> | 2012-12-10 15:08:47 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2012-12-10 15:08:47 +0100 |
| commit | 8b4f341c949b6eac6a9e2ce80340eadbb10dd89f (patch) | |
| tree | 449ab939d5be2e46476148db4ee0d05698271d0d /addons/web/static/src/xml | |
| parent | da574605c72b0830c0855c78308723b88fc0d948 (diff) | |
| parent | 5d2d4dea2cae780f1b42718170b3aedeb2f0df73 (diff) | |
merge upstream
bzr revid: chs@openerp.com-20121205150654-c7ps8cygsx1zk1ua
bzr revid: chs@openerp.com-20121207104954-xz35sdqgya18pgus
bzr revid: chs@openerp.com-20121210140847-yoobt0twf9kg9yau
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 44d1236bf88..a1062cc0444 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -388,14 +388,16 @@ t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''" t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''"> <t t-esc="menu.name"/> - <t t-if="menu.needaction_enabled and menu.needaction_counter"> - <div class="oe_tag oe_tag_dark oe_menu_counter"> - <t t-if="menu.needaction_counter > 99"> 99+ </t><t t-if="menu.needaction_counter <= 99"> <t t-esc="menu.needaction_counter"/> </t> - </div> - </t> </a> </t> +<t t-name="Menu.needaction_counter"> + <div class="oe_tag oe_tag_dark oe_menu_counter"> + <t t-if="widget.needaction_counter > 99"> 99+ </t> + <t t-if="widget.needaction_counter <= 99"> <t t-esc="widget.needaction_counter"/> </t> + </div> +</t> + <t t-name="UserMenu"> <span class="oe_user_menu oe_topbar_item oe_dropdown_toggle oe_dropdown_arrow"> <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/> @@ -436,7 +438,8 @@ </tr> <tr> <td class="oe_leftbar" valign="top"> - <a class="oe_logo" href="#"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a> + <t t-set="debug" t-value="__debug__ ? '&debug' : ''"/> + <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a> <div class="oe_secondary_menus_container"/> <div class="oe_footer"> Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a> @@ -462,6 +465,11 @@ <p><a href="#">Click here to change your user's timezone.</a></p> </div> </t> +<t t-name="WebClient.timezone_systray"> + <div class="oe_topbar_item oe_timezone_systray" title="Timezone mismatch"> + <span class="ui-icon ui-state-error ui-icon-alert"/> + </div> +</t> <t t-name="EmbedClient"> <div class="openerp"> @@ -1049,7 +1057,10 @@ t-att-autofocus="widget.node.attrs.autofocus" t-att-id="widget.id_for_label"> <t t-foreach="widget.values" t-as="option"> - <option><t t-esc="widget.node.attrs.placeholder" t-if="option[0] == false and widget.node.attrs.placeholder"/><t t-esc="option[1]" t-if="option[0] != false"/></option> + <option> + <t t-esc="widget.node.attrs.placeholder" t-if="option[0] === false and widget.node.attrs.placeholder"/> + <t t-esc="option[1]" t-if="option[0] !== false"/> + </option> </t> </select> </span> |