diff options
| author | Christophe Simonis <chs@openerp.com> | 2012-11-29 15:50:39 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2012-11-29 15:50:39 +0100 |
| commit | da574605c72b0830c0855c78308723b88fc0d948 (patch) | |
| tree | a03e68f1a6f73ac20f8dce75f0d4290d8d18fc57 /addons/web/static/src/xml/base.xml | |
| parent | 79b2e72f07fc5843f682650ba16ea8dbb62b0713 (diff) | |
| parent | c166c19ed18a2737d7a885641ebb7b0d25f2b0ed (diff) | |
merge upstream
bzr revid: chs@openerp.com-20121129145039-mzj8b1vpdu48budl
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f601afbbe41..44d1236bf88 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -448,6 +448,20 @@ </table> </div> </t> +<t t-name="WebClient.timezone_notification"> + <div class="oe_webclient_timezone_notification"> + <p>Your user's preference timezone does not match your browser timezone:</p> + + <dl> + <dt>User's timezone</dt> + <dd><t t-esc="user_timezone"/> (<t t-esc="user_offset"/>)</dd> + <dt>Browser's timezone</dt> + <dd><t t-esc="browser_offset"/></dd> + </dl> + + <p><a href="#">Click here to change your user's timezone.</a></p> + </div> +</t> <t t-name="EmbedClient"> <div class="openerp"> @@ -915,11 +929,11 @@ </li> <li t-if="widget.node.attrs.context" data-item="context"> <span class="oe_tooltip_technical_title">Context:</span> - <t t-esc="widget.node.attrs.context_string"/> + <t t-esc="widget.node.attrs.context"/> </li> <li t-if="widget.node.attrs.domain" data-item="domain"> <span class="oe_tooltip_technical_title">Domain:</span> - <t t-esc="widget.node.attrs.domain_string"/> + <t t-esc="widget.node.attrs.domain"/> </li> <li t-if="widget.node.attrs.modifiers and widget.node.attrs.modifiers != '{}'" data-item="modifiers"> <span class="oe_tooltip_technical_title">Modifiers:</span> |