diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-12-15 20:26:59 +0100 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-12-15 20:26:59 +0100 |
| commit | 3e914abf80c20e5b0fc8b3b9ce63d497104a0dde (patch) | |
| tree | c0d4030607ba20d38c96b8286592044c1b4f01e7 /addons/web/static/src | |
| parent | 5fc754b5d300ed245ee76d205b70b7c8bf131dc4 (diff) | |
| parent | 27ae24eed2f19dc81c6c0f76f29551fb2cf35376 (diff) | |
[MERGE] customizable web logo by chs
bzr revid: al@openerp.com-20121215192659-g5psibisxvyl8adw
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 4 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 77ab4239a0d..9d0221e7082 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1152,12 +1152,8 @@ width: 220px; display: block; text-align: center; - height: 70px; - line-height: 70px; } .openerp a.oe_logo img { - height: 40px; - width: 157px; margin: 14px 0; border: 0; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1e0d45407e7..5ad6da28bda 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -943,11 +943,7 @@ $sheet-padding: 16px width: 220px display: block text-align: center - height: 70px - line-height: 70px img - height: 40px - width: 157px margin: 14px 0 border: 0 .oe_footer diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index fbe7fbde795..17116f18d3f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1175,6 +1175,7 @@ instance.web.WebClient = instance.web.Client.extend({ show_application: function() { var self = this; self.toggle_bars(true); + self.update_logo(); self.menu = new instance.web.Menu(self); self.menu.replace(this.$el.find('.oe_menu_placeholder')); self.menu.on('menu_click', this, this.on_menu_action); @@ -1186,6 +1187,10 @@ instance.web.WebClient = instance.web.Client.extend({ self.set_title(); self.check_timezone(); }, + update_logo: function() { + var img = this.session.url('/web/binary/company_logo'); + this.$el.find('.oe_logo img').attr('src', '').attr('src', img); + }, check_timezone: function() { var self = this; return new instance.web.Model('res.users').call('read', [[this.session.uid], ['tz_offset']]).then(function(result) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 0cd9e48b885..dc31a24dc31 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -439,7 +439,7 @@ <tr> <td class="oe_leftbar" valign="top"> <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> + <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}"><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> |