Farid Ghanchi (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-improve-little-big-details-set-image-password-field-ggh
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-big-details-set-image-password-field-ggh/+merge/131816
Hello,
Add Image in Password field
Like old password >>> old model key
new password >>> new model key
master password >>> old model key
new master password >>> new model key
Thanks...
[GGH]
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-little-big-details-set-image-password-field-ggh/+merge/131816
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-web/trunk-improve-little-big-details-set-image-password-field-ggh
into lp:~openerp-dev/openerp-web/trunk-improve-little-big-details.
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2012-10-29 05:23:25 +0000
+++ addons/web/static/src/css/base.css 2012-10-29 05:45:30 +0000
@@ -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;
@@ -532,6 +531,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;
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2012-10-29 05:23:25 +0000
+++ addons/web/static/src/css/base.sass 2012-10-29 05:45:30 +0000
@@ -466,6 +466,13 @@
// }}}
+ .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
=== added file 'addons/web/static/src/img/new_key.png'
Binary files addons/web/static/src/img/new_key.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/new_key.png 2012-10-29 05:45:30 +0000 differ
=== added file 'addons/web/static/src/img/old_key.png'
Binary files addons/web/static/src/img/old_key.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/old_key.png 2012-10-29 05:45:30 +0000 differ
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-10-25 12:50:37 +0000
+++ addons/web/static/src/js/chrome.js 2012-10-29 05:45:30 +0000
@@ -329,6 +329,8 @@
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",
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-10-25 12:50:37 +0000
+++ addons/web/static/src/xml/base.xml 2012-10-29 05:45:30 +0000
@@ -276,15 +276,15 @@
<table align="center" class="db_option_table">
<tr>
<td><label for="old_pwd">Master password:</label></td>
- <td><input type="password" name="old_pwd" class="required" minlength="1" autofocus="autofocus"/></td>
+ <td class="oe_placeImage_old oe_padding_left"><input type="password" name="old_pwd" placeholder=" Password..." class="required" minlength="1" autofocus="autofocus"/></td>
</tr>
<tr>
<td><label for="new_pwd">New master password:</label></td>
- <td><input type="password" name="new_pwd" class="required" minlength="1"/></td>
+ <td class="oe_placeImage_new oe_padding_left"><input type="password" name="new_pwd" placeholder=" Password..." class="required" minlength="1"/></td>
</tr>
<tr>
<td><label for="confirm_pwd">Confirm new master password:</label></td>
- <td><input type="password" name="confirm_pwd" class="required" equalTo="input[name=new_pwd]" minlength="1"/> </td>
+ <td class="oe_padding_left"><input type="password" name="confirm_pwd" class="required" equalTo="input[name=new_pwd]" minlength="1"/> </td>
</tr>
</table>
</form>
@@ -312,17 +312,17 @@
<table align="center">
<tr>
<td><label for="old_pwd">Old Password:</label></td>
- <td><input type="password" name="old_pwd"
- minlength="1" autofocus="autofocus"/></td>
+ <td class="oe_placeImage_old oe_padding_left"><input type="password" name="old_pwd"
+ minlength="1" placeholder=" Password..." autofocus="autofocus"/></td>
</tr>
<tr>
<td><label for="new_password">New Password:</label></td>
- <td><input type="password" name="new_password"
- minlength="1"/></td>
+ <td class="oe_placeImage_new oe_padding_left"><input type="password" name="new_password"
+ placeholder=" Password..." minlength="1"/></td>
</tr>
<tr>
<td><label for="confirm_pwd">Confirm Password:</label></td>
- <td><input type="password" name="confirm_pwd"
+ <td class="oe_padding_left"><input type="password" name="confirm_pwd"
minlength="1"/></td>
</tr>
<tr>
_______________________________________________
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
