From decc05e68eb1b57c2f02b5a005a3d28fd367c5fa Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 18 Oct 2012 12:48:40 +0530 Subject: [PATCH] [IMP] Set height & width for logo and improve code. bzr revid: bth@tinyerp.com-20121018071840-mzl3286v0twl088n --- addons/web/static/src/js/chrome.js | 10 ++++------ addons/web/static/src/xml/base.xml | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index ce871af68c3..a039433f09b 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -987,12 +987,10 @@ instance.web.WebClient = instance.web.Client.extend({ instance.web.dialog($(QWeb.render('Resolution')),{ title: "OpenERP Resolution" }); $('.resolution a').click(function() { - if ($(this).text() == "Original") { - self.$el.find('.oe_logo').css('width', "220px"); - self.$el.find('.oe_logo img').css('width', "157px"); - } - self.$el.find('.oe_logo').css('width', $(this).text()+"px"); - self.$el.find('.oe_logo img').css('width', $(this).text()+"px"); + self.$el.find('.oe_logo').css('width', $(this).attr('awidth')+"px"); + self.$el.find('.oe_logo').css('height', $(this).attr('aheight')+"px"); + self.$el.find('.oe_logo img').css('width', $(this).attr('imgw')+"px"); + self.$el.find('.oe_logo img').css('height', $(this).attr('imgh')+"px"); }) }) self.$el.on('click', '.oe_logo', function(e) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 90dc55cb29a..99437d8d66f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -17,16 +17,16 @@ - 100px - 200px + 150 x 60 + 250 x 90 - 250px - 300px + 290 x 90 + 320 x 100 - Original + Original