diff options
| author | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-11-28 09:53:03 +0530 |
|---|---|---|
| committer | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-11-28 09:53:03 +0530 |
| commit | 91b19d1a7ce76d8d5a86b846f54bcf6824de705d (patch) | |
| tree | 80ccd5e6a2eab1eff55574b6b1c768d71f1a02fc /addons/web/static/src/xml/base.xml | |
| parent | 1db3fca04a217de4083a63c72dc04e943e252589 (diff) | |
| parent | f63bdc67e28692028afcb31e46009e969d11d130 (diff) | |
[Merge] Merge with trunk.
bzr revid: mdi@tinyerp.com-20121128042303-eu3ttdp9nvt99o2k
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6476462ff19..b1bd959e4fb 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -71,9 +71,9 @@ </div> <ul> <li>Username</li> - <li><input type="text" name="login" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li> + <li><input name="login" type="text" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li> <li>Password</li> - <li><input type="password" name="password" t-att-value="widget.selected_password || ''"/></li> + <li><input name="password" type="password" t-att-value="widget.selected_password || ''"/></li> <li><button name="submit">Log in</button></li> </ul> </form> @@ -98,7 +98,6 @@ </select> </t> - <t t-name="DatabaseManager"> <div class="oe_view_manager_view_form"> <div class="oe_form"> @@ -315,26 +314,32 @@ <t t-name="ChangePassword"> <form name="change_password_form" method="POST"> + <div class="oe_form"> <table align="center"> <tr> - <td><label for="old_pwd">Old Password:</label></td> - <td><input type="password" name="old_pwd" + <td class="oe_form_group_cell oe_form_group_cell_label"><label for="old_pwd" class="oe_form_label">Old Password:</label></td> + <td class="oe_form_group_cell"><input type="password" name="old_pwd" minlength="1" autofocus="autofocus"/></td> </tr> <tr> - <td><label for="new_password">New Password:</label></td> - <td><input type="password" name="new_password" + <td class="oe_form_group_cell oe_form_group_cell_label"><label for="new_password" class="oe_form_label">New Password:</label></td> + <td class="oe_form_group_cell"><input type="password" name="new_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_form_group_cell oe_form_group_cell_label"><label for="confirm_pwd" class="oe_form_label">Confirm New Password:</label></td> + <td class="oe_form_group_cell"><input type="password" name="confirm_pwd" minlength="1"/></td> </tr> <tr> - <td colspan="2" align="right"><button class="oe_button">Change Password</button></td> + <td colspan="2" align="right"> + <button class='oe_button oe_form_button'>Change Password</button> + <span class="oe_fade oe_form_button"> or </span> + <button type="button" class="oe_button oe_form_button_cancel oe_form_button oe_link" href="javascript:void(0)"><span>Cancel</span></button> + </td> </tr> </table> + </div> </form> </t> @@ -1597,10 +1602,10 @@ <span/> </t> <t t-name="SearchView.extended_search.proposition.integer"> - <input type="number" class="field_integer" step="1"/> + <input type="number" class="field_integer" value = "0" step="1"/> </t> <t t-name="SearchView.extended_search.proposition.float"> - <input type="number" class="field_float" step="0.01"/> + <input type="number" class="field_float" value = "0.0" step="0.01"/> </t> <t t-name="SearchView.extended_search.proposition.selection"> <select> |
