diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-03-19 10:01:53 +0100 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-03-19 10:01:53 +0100 |
| commit | 8ac730074ac87a2e79aeaa51fc9bac3de9c81816 (patch) | |
| tree | 2417ebf2aaf60f5b75e5f44514ce471033d5ae28 /addons/web/static/src/xml/base.xml | |
| parent | f4cfed3f0e89f8841b16ad578dd2c360f01d18ec (diff) | |
| parent | a2f9619e267a45d0959e7a942ba4e520d91fbb94 (diff) | |
[MERGE] merge from trunk into local branch
bzr revid: ged@openerp.com-20140319090153-aczgy9uqqw72702x
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e35d0c977b3..1a5721d28f8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -231,17 +231,24 @@ </div> <table align="center" class="db_option_table"> <tr> - <td><label for="restore_db">File:</label></td> - <td><input type="file" name="db_file" class="required" autofocus="autofocus"/></td> + <td><label for="restore_pwd">Master Password:</label></td> + <td><input type="password" name="restore_pwd" class="required" autofocus="autofocus"/></td> </tr> <tr> - <td><label for="restore_pwd">Master Password:</label></td> - <td><input type="password" name="restore_pwd" class="required"/></td> + <td><label for="restore_db">File:</label></td> + <td><input type="file" name="db_file" class="required"/></td> </tr> <tr> <td><label for="new_db">New database name:</label></td> <td><input type="text" name="new_db" class="required"/></td> </tr> + <tr> + <td><label for="mode">Mode:</label></td> + <td><select name="mode" class="required"> + <option value="restore">Backup Restore</option> + <option value="copy">Copy of an existing database</option> + </select></td> + </tr> </table> </form> <form id="db_change_password" name="change_pwd_form" style="display: none;"> |