diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-12-07 09:10:26 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-12-07 09:10:26 +0100 |
| commit | 94c9801ac707086732cbe1a7913ef139d1cc785b (patch) | |
| tree | 4f06a75730ae688b2afe07fa9350e601d97030e8 /addons/web/static/src/xml/base.xml | |
| parent | 98e87a51aef5c7457c444334f3f5270cbb947ba3 (diff) | |
| parent | c09b9cb5f9a2a7825571cf803ec760f9e3983b6c (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20121207081026-3edlt0698csc6gk8
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 09249c11ea5..e50d6c68ffa 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -436,7 +436,7 @@ </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> + <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}"><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 +462,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"> @@ -1065,7 +1070,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> |