diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c1782f43ab6..2b9a5bd92f3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -476,13 +476,13 @@ max-height: 180px; } .openerp .oe_view_manager_current a.accessactive { - display:inline-block; - text-decoration:none; + display: inline-block; + text-decoration: none; } -.openerp .oe_view_manager_current .accessactive:first-letter{ - text-decoration:underline; +.openerp .oe_view_manager_current .accessactive:first-letter { + text-decoration: underline; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - font-weight:bold; + font-weight: bold; } .openerp .oe_button.oe_link { border: none; @@ -3025,12 +3025,56 @@ div.ui-widget-overlay { border-radius: 3px; } -.resolution table { - width: 100%; - line-height: 20px; +.resolution { + width: 350px; + background-color: white; + margin-bottom: 15px; + margin-left: 5px; + position: relative; + z-index: 10; } -.resolution table td { - valign: middle; +.resolution .res { + display: table; + width: 100%; +} + +div.res { + border: 1px solid; +} + +.resolution .res > div:not(.simtext) { + border-bottom: 1px solid; + height: 70px; + clear: both; +} + +.res .simtext { + border-bottom: 0px; + padding: 5px; + height: auto; +} + +.simtext span { + font-size: 8px; + color: grey; +} + +.resolution .res div div { + display: inline; + position: absolute; + padding-top: 30px; + padding-left: 10px; +} + +.res img { + width: 150px; + height: 40px; + padding-top: 20px; + padding-left: 5px; +} +.res span a { + font-size: 10px; + padding-right: 5px; } @media print { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cff89d12ff5..dc550a3ad9f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2399,11 +2399,50 @@ div.ui-widget-overlay .ui-corner-all @include radius(3px) -.resolution table - width: 100% - line-height: 20px - td - valign: middle +.resolution + width: 350px + background-color: white + margin-bottom: 15px + margin-left: 5px + position: relative + z-index: 10 + .res + display: table + width: 100% + +div.res + border: 1px solid + +.resolution .res > div:not(.simtext) + border-bottom: 1px solid + height: 70px + clear: both + +.res .simtext + border-bottom: 0px + padding: 5px + height: auto + +.simtext span + font-size: 8px + color: grey + +.resolution .res div div + display: inline + position: absolute + padding-top: 30px + padding-left: 10px + +.res + img + width: 150px + height: 40px + padding-top: 20px + padding-left: 5px + span a + font-size: 10px + padding-right: 5px + @media print .openerp diff --git a/addons/web/static/src/img/OpenERP_Vector_Logo_2011.svg b/addons/web/static/src/img/OpenERP_Vector_Logo_2011.svg new file mode 100644 index 00000000000..ed10906240f --- /dev/null +++ b/addons/web/static/src/img/OpenERP_Vector_Logo_2011.svg @@ -0,0 +1,125 @@ + + + +image/svg+xmlSource Business Applications + + + + \ No newline at end of file diff --git a/addons/web/static/src/img/logo1.png b/addons/web/static/src/img/logo1.png new file mode 100644 index 00000000000..d6dbd9d83d1 Binary files /dev/null and b/addons/web/static/src/img/logo1.png differ diff --git a/addons/web/static/src/img/openerp_big.png b/addons/web/static/src/img/openerp_big.png new file mode 100644 index 00000000000..aa2d6c69711 Binary files /dev/null and b/addons/web/static/src/img/openerp_big.png differ diff --git a/addons/web/static/src/img/openerp_partner_gold.png b/addons/web/static/src/img/openerp_partner_gold.png new file mode 100644 index 00000000000..098f5f6c896 Binary files /dev/null and b/addons/web/static/src/img/openerp_partner_gold.png differ diff --git a/addons/web/static/src/img/openerp_partner_gold.svg b/addons/web/static/src/img/openerp_partner_gold.svg new file mode 100644 index 00000000000..48b400a1122 --- /dev/null +++ b/addons/web/static/src/img/openerp_partner_gold.svg @@ -0,0 +1,97 @@ + + + + +Created by potrace 1.10, written by Peter Selinger 2001-2011 + + + + + + + + + + + diff --git a/addons/web/static/src/img/openerp_partner_ready.png b/addons/web/static/src/img/openerp_partner_ready.png new file mode 100644 index 00000000000..36d52037143 Binary files /dev/null and b/addons/web/static/src/img/openerp_partner_ready.png differ diff --git a/addons/web/static/src/img/openerp_partner_silver.png b/addons/web/static/src/img/openerp_partner_silver.png new file mode 100644 index 00000000000..aa25083e359 Binary files /dev/null and b/addons/web/static/src/img/openerp_partner_silver.png differ diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 466e876d99c..5cfe5336c5a 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1094,21 +1094,55 @@ instance.web.WebClient = instance.web.Client.extend({ }, start: function() { var self = this; + return $.when(this._super()).pipe(function() { self.$el.on('contextmenu','.oe_logo',function(e) { - instance.web.dialog($(QWeb.render('Resolution')),{ - title: "OpenERP Resolution" }); - + self.$el.find('.resolution').remove(); + self.$el.find('.oe_logo').after(QWeb.render('Resolution')) + self.$el.find('.oe_leftbar').css('display','inline-block'); $(self.$el).click(function(){ - $('.resolution').dialog('close'); - }) - $('.resolution a').click(function() { - 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.find('.resolution').hide(); + self.$el.find('.oe_leftbar').css('display','table-cell'); + }); + $('.resolution .res div[class]').each(function(){ + $(this).find('a').click(function(){ + if($(this).attr('id') == "freeto"){ + self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/logo.png') + } + if($(this).attr('id') == "readyto"){ + self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/openerp_partner_ready.png') + } + if($(this).attr('id') == "silverto"){ + self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/openerp_partner_silver.png') + } + if($(this).attr('id') == "goldto"){ + self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/openerp_partner_gold.png') + } + }); + $(this).find('div a').click(function(){ + if($(this).parent().attr('id') == "free"){ + self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/logo.png') + } + if($(this).parent().attr('id') == "ready"){ + self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/openerp_partner_ready.png') + } + if($(this).parent().attr('id') == "silver"){ + self.$el.find('.oe_logo').find('img').attr('src','web/static/src/img/openerp_partner_silver.png') + } + 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).attr('id') == "low"){ + self.$el.find('.oe_logo').find('img').css('width','150px') + self.$el.find('.oe_logo').find('img').css('height','40px') + } + else if($(this).attr('id') == "high"){ + self.$el.find('.oe_logo').find('img').css('width','185px') + self.$el.find('.oe_logo').find('img').css('height','50px') + } + }); + }); + }); self.$el.on('click', '.oe_logo', function(e) { self.action_manager.do_action('home'); }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b66f7ff1860..141d1a7da35 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -12,23 +12,34 @@
- - - - - - - - - - - - - - - - -
150 x 60250 x 90
290 x 90320 x 100
Original
+
+
+ Looking for the OpenERP logo?

+ Thank you for using and promoting the OpenERP brand.Select

+ the logo that fits your need. + +
+
+ Test +
Free to Use
+ Low Res |High Res |Vectorial
+
+
+ Test +
Official Ready Partners Only
+ Low Res |High Res |Vectorial
+
+
+ Test +
Official Silver Partners Only
+ Low Res |High Res |Vectorial
+
+
+ Test +
Official Golden Partners Only
+ Low Res |High Res |Vectorial
+
+