summaryrefslogtreecommitdiff
path: root/addons/web/static/src/xml/base.xml
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-11-28 17:03:44 +0100
committerAntony Lesuisse <al@openerp.com>2012-11-28 17:03:44 +0100
commita34f0ef51cd1d0c68f650d59180cc63001cb3b9a (patch)
tree8ea986d1a3a7c5972a47fec12379f3045b7dfe6f /addons/web/static/src/xml/base.xml
parent299d98ac6ec0e36f4972d4413325148e8bb572fc (diff)
parent04ee6498553a34e9ecf691bbe9cd367d2980d1b5 (diff)
[MERGE] trunk-timezone-notification-fme
if res.users and browser timezone offset differs we display a warning. openerp-web relies on the browser for datetime manipulations so we need both to be in sync. bzr revid: al@openerp.com-20121128160344-1iae73w47ocot9ib
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
-rw-r--r--addons/web/static/src/xml/base.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 9384ee7ebe8..9aa36595cba 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">