From d31003fc4c96df3104b2e414d29870bda60d39fa Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 29 Oct 2012 10:44:36 +0530 Subject: [PATCH] [IMP]Improved code for image set in old password and new password field bzr revid: ggh@tinyerp.com-20121029051436-r2j03sdzwg155beb --- addons/web/static/src/css/base.css | 12 ++++++++++-- addons/web/static/src/css/base.sass | 7 +++++++ addons/web/static/src/js/chrome.js | 2 ++ addons/web/static/src/xml/base.xml | 16 ++++++++-------- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index cbbd8e37f6c..5311a844f2f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,7 +25,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; } @@ -45,7 +44,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -527,6 +526,15 @@ .openerp .oe_grey { color: #aaaaaa; } +.openerp .oe_placeImage_old input { + background: url(/web/static/src/img/old_key.png) no-repeat 4px; +} +.openerp .oe_placeImage_new input { + background: url(/web/static/src/img/new_key.png) no-repeat 4px; +} +.openerp .oe_padding_left input { + padding-left: 22px; +} .openerp .oe_tag { border: 1px solid #afafb6; font-size: 11px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2ef9a8a451d..3b91693ba8c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -462,6 +462,13 @@ $sheet-max-width: 860px // }}} + .oe_placeImage_old input + background: url(/web/static/src/img/old_key.png) no-repeat 4px + .oe_placeImage_new input + background: url(/web/static/src/img/new_key.png) no-repeat 4px + .oe_padding_left input + padding-left: 22px + // Tags (for many2many tags, among others) {{{ .oe_tag border: 1px solid $tag-border diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6cf35a14e92..48a95e98f1a 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -329,6 +329,8 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.$el.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop }); self.$el.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup }); self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore }); + self.$el.find("form td input[name=old_pwd]").css('background','url(/web/static/src/img/old_key.png) no-repeat 4px'); + self.$el.find("form td input[name=new_pwd]").css('background','url(/web/static/src/img/new_key.png) no-repeat 4px'); self.$el.find("form[name=change_pwd_form]").validate({ messages: { old_pwd: "Please enter your previous password", diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9880abd20f7..530365a800f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -255,15 +255,15 @@ - + - + - +
@@ -291,17 +291,17 @@ - + - + -