Merge lp:~unifield-team/unifield-web/web_aio_4 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/database.py'
--- addons/openerp/controllers/database.py	2012-12-03 13:29:03 +0000
+++ addons/openerp/controllers/database.py	2013-03-04 13:40:38 +0000
@@ -67,7 +67,7 @@
     submit_text = _('Create')
     strip_name = True
     form_attrs = {'onsubmit': 'return on_create()'}
-    fields = [openobject.widgets.PasswordField(name='password', label=_('Super admin password:'), validator=formencode.validators.NotEmpty(), help=_("This is the password of the user that have the rights to administer databases. This is not a OpenERP user, just a super administrator. If you did not changed it, the password is 'admin' after installation.")),
+    fields = [openobject.widgets.PasswordField(name='password', label=_('Super admin password:'), validator=formencode.validators.NotEmpty(), help=_("This is the password of the user that have the rights to administer databases. This is not a OpenERP user, just a super administrator.")),
               openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), help=_("Choose the name of the database that will be created. The name must not contain any special character. Exemple: 'terp'.")),
 #              openobject.widgets.CheckBox(name='demo_data', label=_('Load Demonstration data:'), default=False, validator=validators.Bool(if_empty=False), help=_("Check this box if you want demonstration data to be installed on your new database. These data will help you to understand OpenERP, with predefined products, partners, etc.")),
               openobject.widgets.SelectField(name='language', options=get_lang_list, validator=validators.String(), label=_('Default Language:'), help=_("Choose the default language that will be installed for this database. You will be able to install new languages after installation through the administration menu.")),
@@ -254,7 +254,7 @@
             return self.backup()
         raise redirect('/openerp/login')
 
-    @expose(template="/openerp/controllers/templates/database_restore.mako")
+    @expose(template="/openerp/controllers/templates/database.mako")
     def restore(self, tg_errors=None, **kw):
         form = _FORMS['restore']
         error = self.msg

=== modified file 'addons/openerp/controllers/templates/database.mako'
--- addons/openerp/controllers/templates/database.mako	2010-11-10 13:11:32 +0000
+++ addons/openerp/controllers/templates/database.mako	2013-03-04 13:40:38 +0000
@@ -63,11 +63,23 @@
             </table>
         </div>
         <hr style="margin: 0 0 !important; background-color: #5A5858;">
-        % if form.name == 'create':
-            <div>${form.display(value=dict(password = "admin"))}</div>
-        % else:
-            <div>${form.display()}</div>
-        % endif
+        <div>${form.display()}</div>
+
+	%if form.name == 'restore':
+        <script type="text/javascript">
+            jQuery('#filename').change(function() {
+                var choosen_filename = jQuery(this).val();
+                var matches = /^(.*)-[0-9]{8}-[0-9]{6}.dump$/.exec(choosen_filename);
+                if (!matches) {
+                    // show jquery alert
+                    alert('${_('The choosen file in not a valid database file')}');
+                } else {
+                    jQuery('#dbname').val(matches[1]);
+                }
+            });
+        </script>
+	%endif
+
     </div>
 <%include file="footer.mako"/>    
 </%def>

=== removed file 'addons/openerp/controllers/templates/database_restore.mako'
--- addons/openerp/controllers/templates/database_restore.mako	2012-11-15 08:31:02 +0000
+++ addons/openerp/controllers/templates/database_restore.mako	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-<%inherit file="/openerp/controllers/templates/base_dispatch.mako"/>
-<%def name="current_for(name)"><%
-    if form.name == name: context.write('current')
-%></%def>
-<%def name="header()">
-    <title>${form.string}</title>
-
-    <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.waitbox.js"></script>
-    
-    <link rel="stylesheet" type="text/css" href="/openerp/static/css/waitbox.css"/>
-    <link rel="stylesheet" type="text/css" href="/openerp/static/css/database.css"/>
-
-    <script type="text/javascript">
-        function on_create() {
-            new openerp.ui.WaitBox().showAfter(2000);
-            return true;
-        }
-    </script>
-    % if error:
-        <script type="text/javascript">
-            var $error_tbl = jQuery('<table class="errorbox">');
-            $error_tbl.append('<tr><td style="padding: 4px 2px;" width="10%"><img src="/openerp/static/images/warning.png"></td><td class="error_message_content">${error["message"]}</td></tr>');
-            $error_tbl.append('<tr><td style="padding: 0 8px 5px 0; vertical-align:top;" align="right" colspan="2"><a class="button-a" id="error_btn" onclick="$error_tbl.dialog(\'close\');">OK</a></td></tr>');
-
-            jQuery(document).ready(function () {
-                jQuery(document.body).append($error_tbl);
-                $error_tbl.dialog({
-                    modal: true,
-                    resizable: false,
-                    title: '<div class="error_message_header">${error.get("title", "Warning")}</div>'
-                });
-            })
-        </script>
-    % endif
-</%def>
-
-<%def name="content()">
-	<table width="100%">
-        <tr><%include file="header.mako"/></tr>
-    </table>
-    <div class="db-form">
-        <div>
-            <table width="100%" class="titlebar">
-                <tr>
-                    <td width="32px" align="center">
-                        <img alt="" src="/openerp/static/images/stock/stock_person.png">
-                    </td>
-                    <td class="action">${form.string}</td>
-                    <td class="links">
-                        <a class="button static_boxes" href="${py.url('/')}">${_("Login")}</a>
-                        <a class="button static_boxes ${current_for('create')}"
-                           href="${py.url('/openerp/database/create')}">${_("Create")}</a>
-                        <a class="button static_boxes ${current_for('drop')}"
-                           href="${py.url('/openerp/database/drop')}">${_("Drop")}</a>
-                        <a class="button static_boxes ${current_for('backup')}"
-                           href="${py.url('/openerp/database/backup')}">${_("Backup")}</a>
-                        <a class="button static_boxes ${current_for('restore')}"
-                           href="${py.url('/openerp/database/restore')}">${_("Restore")}</a>
-                        <a class="button static_boxes ${current_for('password')}"
-                           href="${py.url('/openerp/database/password')}">${_("Password")}</a>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <hr style="margin: 0 0 !important; background-color: #5A5858;">
-        % if form.name == 'create':
-            <div>${form.display(value=dict(password = "admin"))}</div>
-        % else:
-            <div>${form.display()}</div>
-        % endif
-
-        <script type="text/javascript">
-            jQuery('#filename').change(function() {
-                var choosen_filename = jQuery(this).val();
-                var matches = /^(.*)-[0-9]{8}-[0-9]{6}.dump$/.exec(choosen_filename);
-                if (!matches) {
-                    // show jquery alert
-                    alert('${_('The choosen file in not a valid database file')}');
-                } else {
-                    jQuery('#dbname').val(matches[1]);
-                }
-            });
-        </script>
-    </div>
-<%include file="footer.mako"/>    
-</%def>