diff options
| author | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-10-17 18:55:33 +0530 |
|---|---|---|
| committer | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-10-17 18:55:33 +0530 |
| commit | 40e1cbda37f2821cc6479d7bae46ccd39b07edaf (patch) | |
| tree | 5d8db837d61b5cdd94da440b1eff3096c6661c38 /addons/web/static/src | |
| parent | a72d4a76ed27251825e7c4dba81458a7197d4401 (diff) | |
[IMP] Improve code.
bzr revid: bth@tinyerp.com-20121017132533-s4wxx3vvn1g3tdaf
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 7 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 12 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 32 |
3 files changed, 34 insertions, 17 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c8f1567bee9..9b7524363fa 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2913,3 +2913,10 @@ div.ui-widget-overlay { -webkit-border-radius: 3px; border-radius: 3px; } +.resolution table { + width: 100%; + line-height: 20px; +} +.resolution table td { + valign: middle; +}
\ No newline at end of file diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index bfcb7639a26..ce871af68c3 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -986,10 +986,14 @@ instance.web.WebClient = instance.web.Client.extend({ self.$el.on('contextmenu','.oe_logo',function(e) { instance.web.dialog($(QWeb.render('Resolution')),{ title: "OpenERP Resolution" }); - $('.resolution a').click(function() { - self.$el.find('.oe_logo').css('width', $(this).text()+"px"); - self.$el.find('.oe_logo img').css('width', $(this).text()+"px"); - }) + $('.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.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 956d5164729..90dc55cb29a 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -11,19 +11,25 @@ </div> </t> <t t-name="Resolution"> -<div class="resolution"> - <label style="font-size:20px;font-weight:bold;">Resolution:</label> - <table width="100%" > - <tr> - <td valign="middle"><a class="whiteres" href="#">100</a>px</td> - <td valign="middle"><a class="whiteres" href="#" >200</a>px</td> - </tr> - <tr> - <td valign="middle"><a class="whiteres" href="#">250</a>px</td> - <td valign="middle"><a class="whiteres" href="#" >300</a>px</td> - </tr> - </table> -</div> + <div class="resolution"> + <table> + <tr> + <td colspan="2"><label>Resolution:</label></td> + </tr> + <tr> + <td><a>100</a>px</td> + <td><a>200</a>px</td> + </tr> + <tr> + <td><a>250</a>px</td> + <td><a>300</a>px</td> + </tr> + <tr> + <td></td> + <td style="float:right;"><a>Original</a></td> + </tr> + </table> + </div> </t> <t t-name="Notification"> <div class="oe_notification" t-translation="off"> |