Paramjit Singh Sahota(OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-improve-little-right-click-openerp-logo-psa
into lp:~openerp-dev/openerp-web/trunk-improve-little-big-details.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-little-right-click-openerp-logo-psa/+merge/133916
Improved code OpenERP logo on right click.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-little-right-click-openerp-logo-psa/+merge/133916
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-web/trunk-improve-little-right-click-openerp-logo-psa
into lp:~openerp-dev/openerp-web/trunk-improve-little-big-details.
=== added file 'addons/web/static/src/img/openerp_community.png'
Binary files addons/web/static/src/img/openerp_community.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/openerp_community.png 2012-11-12 13:21:34 +0000 differ
=== modified file 'addons/web/static/src/img/openerp_partner_gold.png'
Binary files addons/web/static/src/img/openerp_partner_gold.png 2012-11-08 06:54:07 +0000 and addons/web/static/src/img/openerp_partner_gold.png 2012-11-12 13:21:34 +0000 differ
=== modified file 'addons/web/static/src/img/openerp_partner_ready.png'
Binary files addons/web/static/src/img/openerp_partner_ready.png 2012-11-08 06:54:07 +0000 and addons/web/static/src/img/openerp_partner_ready.png 2012-11-12 13:21:34 +0000 differ
=== modified file 'addons/web/static/src/img/openerp_partner_silver.png'
Binary files addons/web/static/src/img/openerp_partner_silver.png 2012-11-08 06:54:07 +0000 and addons/web/static/src/img/openerp_partner_silver.png 2012-11-12 13:21:34 +0000 differ
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-11-12 06:01:05 +0000
+++ addons/web/static/src/js/chrome.js 2012-11-12 13:21:34 +0000
@@ -1118,6 +1118,10 @@
if($(this).attr('id') == "goldto"){
self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/openerp_partner_gold.png')
}
+ if($(this).attr('id') == "community"){
+ self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/openerp_community.png')
+ }
+ self.$el.find('.oe_logo').find('img').removeAttr("style");
});
$(this).find('div a').click(function(){
if($(this).parent().attr('id') == "free"){
@@ -1132,6 +1136,12 @@
if($(this).parent().attr('id') == "gold"){
self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/openerp_partner_gold.png')
}
+ if($(this).parent().attr('id') == "community"){
+ self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/openerp_community.png')
+ }
+ if($(this).attr('id') == "vec"){
+ self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/logo1.png')
+ }
if($(this).attr('id') == "low"){
self.$el.find('.oe_logo').find('img').css('width','150px')
self.$el.find('.oe_logo').find('img').css('height','40px')
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-11-12 06:01:05 +0000
+++ addons/web/static/src/xml/base.xml 2012-11-12 13:21:34 +0000
@@ -20,24 +20,29 @@
</span>
</div>
<div class="freeto">
- <a id="freeto"><img alt="Test" src="/web/static/src/img/logo.png"></img></a>
+ <a id="freeto"><img alt="Test" src="/web/static/src/img/logo.png" width="45px" height="170px"></img></a>
<div><span>Free to Use</span><br/>
<span id="free"><a id="low" href="#">Low Res |</a><a id="high" href="#">High Res |</a><a id="vec" href="#">Vectorial</a></span></div>
</div>
<div class="readyto">
<a id="readyto"><img alt="Test" src="/web/static/src/img/openerp_partner_ready.png"></img></a>
<div><span>Official Ready Partners Only</span><br/>
- <span id="ready"><a id="low" href="#">Low Res |</a><a id="high" href="#">High Res |</a><a id="vec" href="#">Vectorial</a></span></div>
+ <span id="ready"><a id="low" href="#">Low Res |</a><a id="high" href="#">High Res</a></span></div>
</div>
<div class="silverto">
<a id="silverto"><img alt="Test" src="/web/static/src/img/openerp_partner_silver.png"></img></a>
<div><span>Official Silver Partners Only</span><br/>
- <span id="silver"><a id="low" href="#">Low Res |</a><a id="high" href="#">High Res |</a><a id="vec" href="#">Vectorial</a></span></div>
+ <span id="silver"><a id="low" href="#">Low Res |</a><a id="high" href="#">High Res</a></span></div>
</div>
- <div class="goldto" style="border-bottom: 0px;">
+ <div class="goldto">
<a id="goldto"><img alt="Test" src="/web/static/src/img/openerp_partner_gold.png"></img></a>
<div><span>Official Golden Partners Only</span><br/>
- <span id="gold"><a id="low" href="#">Low Res |</a><a id="high" href="#">High Res |</a><a id="vec" href="#">Vectorial</a></span></div>
+ <span id="gold"><a id="low" href="#">Low Res |</a><a id="high" href="#">High Res</a></span></div>
+ </div>
+ <div class="community" style="border-bottom: 0px;">
+ <a id="community"><img alt="Test" src="/web/static/src/img/openerp_community.png"></img></a>
+ <div><span>Community Members Only</span><br/>
+ <span id="community"><a id="low" href="#">Low Res |</a><a id="high" href="#">High Res</a></span></div>
</div>
</div>
</div>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
