summaryrefslogtreecommitdiff
path: root/addons/web/static/src/xml
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2012-12-19 10:01:28 +0100
committerFabien Meghazi <fme@openerp.com>2012-12-19 10:01:28 +0100
commitfe843951277f772988571dcfec7825b76e3bcf5d (patch)
tree36e90ad911474f4a933abb170c0e3d40d2c70a45 /addons/web/static/src/xml
parentc3e74781ca3976d2ec919cd2a4085ca97e2fba17 (diff)
parent56248183fc87b8eba9af50acddc81087a84bc34b (diff)
[MERGE] trunk
bzr revid: fme@openerp.com-20121219090128-m5z0l5rlee8mu6hj
Diffstat (limited to 'addons/web/static/src/xml')
-rw-r--r--addons/web/static/src/xml/base.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 62e123f6695..a3fd74bfb00 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -36,11 +36,11 @@
<t t-name="CrashManager.warning">
<table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning">
<tr>
- <td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe_dialog_icon"/></td>
+ <td class="oe_dialog_icon"><img t-att-src='_s + "/web/static/src/img/warning.png"'/></td>
<td>
<p>
<t t-js="d">
- var message = d.message ? d.message : d.error.data.fault_code;
+ var message = d.error.message ? d.error.message : d.error.data.fault_code;
d.html_error = context.engine.tools.html_escape(message)
.replace(/\n/g, '<br/>');
</t>
@@ -437,7 +437,10 @@
<tr>
<td class="oe_leftbar" valign="top">
<t t-set="debug" t-value="__debug__ ? '&amp;debug' : ''"/>
- <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}"><img t-att-src='widget.session.url("/web/binary/company_logo")'/></a>
+ <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}">
+ <span class="oe_logo_edit">Edit Company data</span>
+ <img t-att-src='widget.session.url("/web/binary/company_logo")'/>
+ </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>