From 5615421ddf8ca2e405b57648beec8a715d2b6681 Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Sat, 2 Feb 2019 10:24:16 +0530
Subject: [PATCH] [FIX]Issue in New Db Creation

---
 odoo-debrand/__init__.py                      |   1 +
 odoo-debrand/__manifest__.py                  |   6 +-
 odoo-debrand/controllers/controllers.py       |   1 +
 odoo-debrand/doc/changelog.rst                |   3 +
 odoo-debrand/models/models.py                 |   1 -
 odoo-debrand/static/src/xml/base.xml          |  16 +-
 .../views/database_manager_extend.html        | 676 +++++++++---------
 odoo-debrand/views/views.xml                  |   1 +
 8 files changed, 358 insertions(+), 347 deletions(-)

diff --git a/odoo-debrand/__init__.py b/odoo-debrand/__init__.py
index 9e5827f90..aa4d0fd63 100644
--- a/odoo-debrand/__init__.py
+++ b/odoo-debrand/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
+
 from . import controllers
 from . import models
diff --git a/odoo-debrand/__manifest__.py b/odoo-debrand/__manifest__.py
index d2df2e102..2f531bf84 100644
--- a/odoo-debrand/__manifest__.py
+++ b/odoo-debrand/__manifest__.py
@@ -20,9 +20,10 @@
 #    If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 {
     'name': "Odoo Debranding",
-    'version': "12.0.1.0",
+    'version': "12.0.1.0.1",
     'summary': """Debrand Odoo""",
     'description': """Debrand Odoo""",
     'author': "Cybrosys Techno Solutions",
@@ -31,7 +32,8 @@
     'category': 'Tools',
     'depends': ['base', 'im_livechat', 'website'],
     'data': [
-        'views/views.xml'],
+        'views/views.xml'
+    ],
     'demo': [],
     'qweb': ["static/src/xml/base.xml"],
     'images': ['static/description/debranding_1.gif'],
diff --git a/odoo-debrand/controllers/controllers.py b/odoo-debrand/controllers/controllers.py
index 2490cf78b..703e21dbd 100644
--- a/odoo-debrand/controllers/controllers.py
+++ b/odoo-debrand/controllers/controllers.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 import imghdr
 import json
 import io
diff --git a/odoo-debrand/doc/changelog.rst b/odoo-debrand/doc/changelog.rst
index 4d4886673..6e041335a 100644
--- a/odoo-debrand/doc/changelog.rst
+++ b/odoo-debrand/doc/changelog.rst
@@ -5,3 +5,6 @@ Changelog
 ------------
 - Initial commit
 
+`12.0.1.0.1`
+------------
+- [Fix] Issue in New Db Creation
\ No newline at end of file
diff --git a/odoo-debrand/models/models.py b/odoo-debrand/models/models.py
index 51a371293..105497d12 100644
--- a/odoo-debrand/models/models.py
+++ b/odoo-debrand/models/models.py
@@ -8,7 +8,6 @@ from odoo import models, fields, api, tools
 class OdooDebrand(models.Model):
     _inherit = "website"
 
-
     def get_company_logo(self):
         id = self.env.user.company_id.id
         self.company_logo_url ="/web/image/res.company/%s/logo"%(id)
diff --git a/odoo-debrand/static/src/xml/base.xml b/odoo-debrand/static/src/xml/base.xml
index 66a53ecd7..78c9c87cc 100644
--- a/odoo-debrand/static/src/xml/base.xml
+++ b/odoo-debrand/static/src/xml/base.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
-    <t t-extend="UserMenu">
-        <t t-jquery="div.dropdown-menu" t-operation="replace">
-            <ul class="dropdown-menu" role="menu">
-                <li class="divider"/>
-                <li><a href="#" data-menu="settings">Preferences</a></li>
-                <li><a href="#" data-menu="logout">Log out</a></li>
-            </ul>
+     <t t-extend="UserMenu">
+        <t t-jquery="div.dropdown-menu.dropdown-menu-right"
+           t-operation="replace">
+            <div class="dropdown-menu dropdown-menu-right" role="menu">
+                <a role="menuitem" href="#" data-menu="settings"
+                   class="dropdown-item">Preferences</a>
+                <a role="menuitem" href="#" data-menu="logout"
+                   class="dropdown-item">Log out</a>
+            </div>
         </t>
     </t>
 
diff --git a/odoo-debrand/views/database_manager_extend.html b/odoo-debrand/views/database_manager_extend.html
index 9a724d035..958ab407e 100644
--- a/odoo-debrand/views/database_manager_extend.html
+++ b/odoo-debrand/views/database_manager_extend.html
@@ -1,363 +1,365 @@
-<!DOCTYPE html>
 <html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>{{ website_name }}</title>
-  <link type="image/x-icon" rel="shortcut icon" href="{{ favicon }}"/>
-  <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css">
-  <link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css">
-  <script src="/web/static/lib/jquery/jquery.js" type="text/javascript"></script>
-  <script type="text/javascript" src="/web/static/lib/popper/popper.js"></script>
-  <script type="text/javascript" src="/web/static/lib/bootstrap/js/index.js"></script>
-  <script type="text/javascript" src="/web/static/lib/bootstrap/js/util.js"></script>
-  <script type="text/javascript" src="/web/static/lib/bootstrap/js/alert.js"></script>
-  <script type="text/javascript" src="/web/static/lib/bootstrap/js/button.js"></script>
-  <script type="text/javascript" src="/web/static/lib/bootstrap/js/carousel.js"></script>
-  <script type="text/javascript" src="/web/static/lib/bootstrap/js/collapse.js"></script>
-  <script src="/web/static/lib/bootstrap/js/modal.js"></script>
-  <script src="/web/static/lib/bootstrap/js/tooltip.js"></script>
-  <script src="/web/static/lib/bootstrap/js/dropdown.js"></script>
-  <script type="text/javascript" src="/web/static/lib/bootstrap/js/popover.js"></script>
-  <script type="text/javascript" src="/web/static/lib/bootstrap/js/scrollspy.js"></script>
-  <script type="text/javascript" src="/web/static/lib/bootstrap/js/tab.js"></script>
+    <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8">
+        <title>{{ website_name }}</title>
+        <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon">
 
-  <script type="text/javascript">
-  $(function() {
-      // Little eye
-      $('body').on('mousedown','.o_little_eye',function(ev) {
-          $(ev.target).siblings('input').prop('type','text');
-      });
-      $('body').on('mouseup','.o_little_eye',function(ev) {
-          $(ev.target).siblings('input').prop('type','password');
-      });
-      // db modal
-      $('body').on('click','.o_database_action', function(ev) {
-          ev.preventDefault();
-          var db = $(ev.currentTarget).data('db');
-          var target = $(ev.currentTarget).data('target');
-          $(target).find('input[name=name]').val(db);
-          $(target).modal();
-      });
-      // close modal on submit
-      $('.modal').on('click','input[type="submit"]', function(ev) {
-          var modal  = $(this).parentsUntil('body', '.modal');
-          if (modal.hasClass('o_database_backup')) {
-            $(modal).modal('hide');
-            if (!$('.alert-backup-long').length) {
-              $('.list-group').before("<div class='alert alert-info alert-backup-long'>The backup may take some time before being ready</div>");              
-            }
-          }
-      });
-  });
-  </script>
-</head>
+        <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css">
+        <link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css">
 
-{% macro master_input() -%}
-  <div class="form-group">
-    {% if insecure %}
-      <input type="hidden" name="master_pwd" class="form-control" value="admin"/>
-    {% else %}
-      <label for="master_pwd" class="control-label">Master Password</label>
-      <input id="master_pwd" type="password" name="master_pwd" class="form-control" required="required" autofocus="autofocus"/>
-    {% endif %}
-  </div>
-{%- endmacro %}
+        <script src="/web/static/lib/jquery/jquery.js" type="text/javascript"></script>
 
-{% macro create_form() -%}
-  <p>Odoo is up and running! <br />
-  Create a new database by filling out the form,
-  you'll be able to install your first app in a minute.</p>
-  {{ master_input() }}
-  <div class="form-group">
-    <div class="row">
-      <div class="col-md-12">
-        <label for="name" class="control-label">Database Name</label>
-        <input id="name" type="text" name="name" class="form-control" required="required" autocomplete="off"/>
-      </div>
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="row">
-      <div class="col-md-12">
-        <label for="login" class="control-label">Email</label>
-        <input id="login" type="text" name="login" class="form-control" required="required" autocomplete="off"/>
-      </div>
-    </div>
-  </div>
-  <div class="form-group has-feedback">
-    <label for="password" class="control-label">Password</label>
-    <input id="password" type="password" name="password" class="form-control" required="required" autocomplete="off"/>
-    <span class="fa fa-eye o_little_eye form-control-feedback" aria-hidden="true" style="cursor: pointer; pointer-events: auto"></span>
-  </div>
-  <div class="form-group">
-    <div class="row">
-      <div class="col-md-6">
-        <label for="lang" class="control-label">Language</label>
-        <select id="lang" name="lang" class="form-control" required="required" autocomplete="off">
-          {% for lang in langs %}
-              <option {% if lang[0] == "en_US" %}selected="selected" {% endif %}value="{{ lang[0] }}">{{ lang[1] }}</option>
-          {% endfor %}
-        </select>
-      </div>
-      <div class="col-md-6">
-          <label for="country" class="control-label">Country</label>
-          <select id="country" name="country_code" class="form-control" autocomplete="off">
-              <option value=""></option>
-            {% for country in countries %}
-              <option value="{{ country[0] }}">{{ country[1] }}</option>
-            {% endfor %}
-            </select>
-        </div>
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="checkbox">
-      <label>
-        <input name="demo" type="checkbox" class="pull-right" value="1">
-        <span>Load demonstration data</span>
-        <span class="text-muted"> (Check this box to evaluate Odoo)</span>
-      </label>
-    </div>
-  </div>
-{%- endmacro %}
+        <script type="text/javascript" src="/web/static/lib/popper/popper.js"></script>
 
-<body class="container">
-  <!-- Database List -->
-  <div class="row">
-    <div class="col-md-6 col-md-offset-3 o_database_list">
-      <div class="text-center">
-        <img src="{{ company_logo_url }}" class="img-responsive center-block"/>
-      </div>
-      {% if insecure and databases %}
-      <div class="alert alert-warning">
-        <!--Add your company name-->
-      Warning, {{ company_name }} database manager is not protected.
-      Please <a href="#" data-toggle="modal" data-target=".o_database_master">set a master password</a>
-      to secure it.
-      </div>
-      {% endif %}
-      {% if error %}
-      <div class="alert alert-danger">{{ error }}</div>
-      {% endif %}
-      {% if databases %}
-        <div class="list-group">
-          {% for db in databases %}
-          <a href="/web?db={{ db }}" class="list-group-item">
-            {{ db }}
-            {% if manage %}
-            <div class="text-right pull-right">
-            <span data-db="{{ db }}" data-target=".o_database_backup" class="o_database_action btn-link"><i class="fa fa-floppy-o fa-fw"></i> Backup</span>
-            <span data-db="{{ db }}" data-target=".o_database_duplicate" class="o_database_action btn-link"><i class="fa fa-files-o fa-fw"></i> Duplicate</span>
-            <span data-db="{{ db }}" data-target=".o_database_delete" class="o_database_action btn-link"><i class="fa fa-trash-o fa-fw"></i> Delete</span>
-            </div>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/index.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/util.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/alert.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/button.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/carousel.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/collapse.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/dropdown.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/modal.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/tooltip.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/popover.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/scrollspy.js"></script>
+        <script type="text/javascript" src="/web/static/lib/bootstrap/js/tab.js"></script>
+
+        <script type="text/javascript">
+            $(function() {
+                // Little eye
+                $('body').on('mousedown mouseup', '.o_little_eye', function (ev) {
+                    $(ev.target).closest('.input-group').find('.form-control').prop('type', ev.type === 'mousedown' ? 'text' : 'password');
+                });
+                // db modal
+                $('body').on('click', '.o_database_action', function (ev) {
+                    ev.preventDefault();
+                    var db = $(ev.currentTarget).data('db');
+                    var target = $(ev.currentTarget).data('target');
+                    $(target).find('input[name=name]').val(db);
+                    $(target).modal();
+                });
+                // close modal on submit
+                $('.modal').on('submit', 'form', function (ev) {
+                    var modal = $(this).parentsUntil('body', '.modal');
+                    if (modal.hasClass('o_database_backup')) {
+                        $(modal).modal('hide');
+                        if (!$('.alert-backup-long').length) {
+                            $('.list-group').before("<div class='alert alert-info alert-backup-long'>The backup may take some time before being ready</div>");
+                        }
+                    }
+                });
+            });
+        </script>
+    </head>
+
+    {% macro master_input() -%}
+        <div class="form-group">
+            {% if insecure %}
+                <input type="hidden" name="master_pwd" class="form-control" value="admin"/>
+            {% else %}
+                <label for="master_pwd" class="col-form-label">Master Password</label>
+                <input id="master_pwd" type="password" name="master_pwd" class="form-control" required="required" autofocus="autofocus"/>
             {% endif %}
-          </a>
-          {% endfor %}
         </div>
-        {% if manage %}
-        <div class="text-left">
-          <button type="button" data-toggle="modal" data-target=".o_database_create" class="btn btn-sm btn-primary">
-            Create Database
-          </button>
-          <button type="button" data-toggle="modal" data-target=".o_database_restore" class="btn btn-sm btn-primary">
-            Restore Database
-          </button>
-          <button type="button" data-toggle="modal" data-target=".o_database_master" class="btn btn-sm btn-primary">
-            Set Master Password
-          </button>
-        </div>
-        {% else %}
-        <div class="text-center">
-          <a href="/web/database/manager">Manage databases</a>
-        </div>
-        {% endif %}
-      {% else %}
-        <form role="form" action="/web/database/create" method="post">
-          {{ create_form() }}
-          <input type="submit" value="Create database" class="btn btn-primary pull-left"/>
-        </form>
-        <a role="button" data-toggle="modal" data-target=".o_database_restore" class="btn btn-link">
-          or restore a database
-        </a>
-      {% endif %}
-    </div>
-  </div>
+    {%- endmacro %}
 
-  <!-- Create -->
-  <div class="modal fade o_database_create" role="dialog">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <form role="form" action="/web/database/create" method="post">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">Create Database</h4>
-          </div>
-          <div class="modal-body">
-            {{ create_form() }}
-          </div>
-          <div class="modal-footer">
-            <input type="submit" value="Continue" class="btn btn-primary pull-right"/>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-
-  <!-- Restore -->
-  <div class="modal fade o_database_restore" role="dialog">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-          <h4 class="modal-title">Restore Database</h4>
+    {% macro create_form() -%}
+        {{ master_input() }}
+        <div class="form-group row">
+            <label for="name" class="col-md-4 col-form-label">Database Name</label>
+            <div class="col-md-8">
+                <input id="name" type="text" name="name" class="form-control" required="required" autocomplete="off" pattern="{{ pattern }}" title="Only alphanumerical characters, underscore, hyphen and dot are allowed"/>
+            </div>
         </div>
-        <form id="form_restore_db" role="form" action="/web/database/restore" method="post" enctype="multipart/form-data">
-          <div class="modal-body">
-            {{ master_input() }}
-            <div class="form-group">
-              <label for="backup_file" class="control-label">File</label>
-              <input id="backup_file" type="file" name="backup_file" class="required"/>
+        <div class="form-group row">
+            <label for="login" class="col-md-4 col-form-label">Email</label>
+            <div class="col-md-8">
+                <input id="login" type="text" name="login" class="form-control" required="required" autocomplete="off"/>
             </div>
-            <div class="form-group">
-              <label for="name" class="control-label">Database Name</label>
-              <input id="name" type="text" name="name" class="form-control" required="required"/>
+        </div>
+        <div class="form-group row">
+            <label for="password" class="col-md-4 col-form-label">Password</label>
+            <div class="col-md-8 input-group">
+                <input id="password" type="password" name="password" class="form-control" required="required" autocomplete="off"/>
+                <div class="input-group-append">
+                    <span class="fa fa-eye o_little_eye input-group-text" aria-hidden="true" style="cursor: pointer;"></span>
+                </div>
             </div>
-            <div class="form-group">
-                <label for="copy">This database might have been moved or copied.</label>
-                <p class="help-block">In order to avoid conflicts between databases, {{ company_name }} needs to know if this database was moved or copied.
-                If you don't know, answer "This database is a copy".</p>
-              <div class="radio">
-                <label>
-                  <input name="copy" type="radio" class="pull-right" value="true" checked="1">
-                  This database is a copy
-                </label>
-              </div>
-              <div class="radio">
-                <label>
-                  <input name="copy" type="radio" class="pull-right" value="false">
-                  This database was moved
-                </label>
-              </div>
+        </div>
+        <div class="form-group row">
+            <label for="phone" class="col-md-4 col-form-label">Phone number</label>
+            <div class="col-md-8 input-group">
+                <input id="phone" type="tel" name="phone" class="form-control" autocomplete="off"/>
             </div>
-          </div>
-          <div class="modal-footer">
-            <input type="submit" value="Continue" class="btn btn-primary pull-right"/>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-
-
-  <!-- Master password -->
-  <div class="modal fade o_database_master" role="dialog">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-          <h4 class="modal-title">Set Master Password</h4>
         </div>
-        <form id="form_change_pwd" role="form" action="/web/database/change_password" method="post">
-          <div class="modal-body">
-            <p>The master password is required to create, delete, dump or restore databases.</p>
-            {{ master_input() }}
-            <div class="form-group has-feedback">
-              <label for="master_pwd_new" class="control-label">New Master Password</label>
-              <input id="master_pwd_new" type="password" name="master_pwd_new" class="form-control" required="required" autocomplete="off"/>
-              <span class="fa fa-eye o_little_eye form-control-feedback" aria-hidden="true" style="cursor: pointer; pointer-events: auto"></span>
+        <div class="form-group row">
+            <label for="lang" class="col-md-4 col-form-label">Language</label>
+            <div class="col-md-8">
+                <select id="lang" name="lang" class="form-control" required="required" autocomplete="off">
+                    {% for lang in langs %}
+                        <option {% if lang[0] == "en_US" %}selected="selected" {% endif %}value="{{ lang[0] }}">{{ lang[1] }}</option>
+                    {% endfor %}
+                </select>
             </div>
-          </div>
-          <div class="modal-footer">
-            <input type="submit" value="Continue" class="btn btn-primary pull-right"/>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-
-
-  <!-- Duplicate DB -->
-  <div class="modal fade o_database_duplicate" role="dialog">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title">Duplicate Database</h4>
         </div>
-        <form id="form-duplicate-db" role="form" action="/web/database/duplicate" method="post">
-          <div class="modal-body">
-            {{ master_input() }}
-            <div class="form-group">
-              <label for="name" class="control-label">Database Name</label>
-              <input id="name" type="text" name="name" class="form-control" required="required" readonly="readonly"/>
+        <div class="form-group row">
+            <label for="country" class="col-md-4 col-form-label ">Country</label>
+            <div class="col-md-8">
+                <select id="country" name="country_code" class="form-control" autocomplete="off">
+                    <option value=""></option>
+                    {% for country in countries %}
+                        <option value="{{ country[0] }}">{{ country[1] }}</option>
+                    {% endfor %}
+                </select>
             </div>
-            <div class="form-group">
-              <label for="new_name" class="control-label">New Name</label>
-              <input id="new_name" type="text" name="new_name" class="form-control" required="required"/>
+        </div>
+        <div class="form-group row">
+            <label for="demo" class="col-md-4 col-form-label">Demo data</label>
+            <div class="col-md-8">
+                <input type="checkbox" id="load_demo_checkbox" class="form-control-sm" name="demo" value="1">
             </div>
-          </div>
-          <div class="modal-footer">
-          <input type="submit" value="Continue" class="btn btn-primary pull-right"/>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
+        </div>
+    {%- endmacro %}
 
-  <!-- Drop DB -->
-  <div class="modal fade o_database_delete" role="dialog">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-          <h4 class="modal-title">Delete Database</h4>
+    <body>
+        <div class="container">
+            <!-- Database List -->
+            <div class="row">
+                <div class="col-lg-6 offset-lg-3 o_database_list">
+                    <img src="/web/static/src/img/logo2.png" class="img-fluid d-block mx-auto"/>
+                    {% if not list_db %}
+                        <div class="alert alert-danger text-center">The database manager has been disabled by the administrator</div>
+                    {% elif insecure and databases %}
+                        <div class="alert alert-warning">
+                            Warning, your database manager is not protected.<br/>
+                            Please <a href="#" data-toggle="modal" data-target=".o_database_master">set a master password</a> to secure it.
+                        </div>
+                    {% endif %}
+                    {% if error %}
+                        <div class="alert alert-danger">{{ error }}</div>
+                    {% endif %}
+                    {% if list_db and databases %}
+                        <div class="list-group">
+                            {% for db in databases %}
+                                <div class="list-group-item d-flex align-items-center">
+                                    <a href="/web?db={{ db }}" class="d-block flex-grow-1">
+                                        {% if db in incompatible_databases %}
+                                            <i class="icon fa fa-warning float-right text-warning" title="This database may not be compatible"></i>
+                                        {% endif %}
+                                        {{ db }}
+                                    </a>
+                                    {% if manage %}
+                                        <div class="btn-group btn-group-sm float-right">
+                                            <button type="button" data-db="{{ db }}" data-target=".o_database_backup" class="o_database_action btn btn-primary">
+                                                <i class="fa fa-floppy-o fa-fw"></i> Backup
+                                            </button>
+                                            <button type="button" data-db="{{ db }}" data-target=".o_database_duplicate" class="o_database_action btn btn-secondary">
+                                                <i class="fa fa-files-o fa-fw"></i> Duplicate
+                                            </button>
+                                            <button type="button" data-db="{{ db }}" data-target=".o_database_delete" class="o_database_action btn btn-danger">
+                                                <i class="fa fa-trash-o fa-fw"></i> Delete
+                                            </button>
+                                        </div>
+                                    {% endif %}
+                                </div>
+                            {% endfor %}
+                        </div>
+                        {% if manage %}
+                            <div class="d-flex mt-2">
+                                <button type="button" data-toggle="modal" data-target=".o_database_create" class="btn btn-primary flex-grow-1">Create Database</button>
+                                <button type="button" data-toggle="modal" data-target=".o_database_restore" class="btn btn-primary flex-grow-1 ml-2">Restore Database</button>
+                                <button type="button" data-toggle="modal" data-target=".o_database_master" class="btn btn-primary flex-grow-1 ml-2">Set Master Password</button>
+                            </div>
+                        {% else %}
+                            <div class="text-center mt-2">
+                                <a href="/web/database/manager">Manage databases</a>
+                            </div>
+                        {% endif %}
+                    {% elif list_db %}
+                        <form role="form" action="/web/database/create" method="post">
+                            {{ create_form() }}
+                            <input type="submit" value="Create database" class="btn btn-primary float-left"/>
+                        </form>
+                        <a role="button" data-toggle="modal" data-target=".o_database_restore" class="btn btn-link">or restore a database</a>
+                    {% endif %}
+                </div>
+            </div>
         </div>
-        <form id="form_drop_db" role="form" action="/web/database/drop" method="post">
-          <div class="modal-body">
-            {{ master_input() }}
-            <div class="form-group">
-              <label for="name" class="control-label">Database</label>
-              <input id="name" type="text" name="name" class="form-control" required="required" readonly="readonly"/>
+
+        <!-- Create -->
+        <div class="modal fade o_database_create" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <form role="form" action="/web/database/create" method="post">
+                        <div class="modal-header">
+                            <h4 class="modal-title">Create Database</h4>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        </div>
+                        <div class="modal-body">
+                            {{ create_form() }}
+                        </div>
+                        <div class="modal-footer">
+                            <input type="submit" value="Continue" class="btn btn-primary float-right"/>
+                        </div>
+                    </form>
+                </div>
             </div>
-          </div>
-          <div class="modal-footer">
-            <input type="submit" value="Delete" class="btn btn-primary pull-right"/>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
+        </div>
+
+        <!-- Restore -->
+        <div class="modal fade o_database_restore" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title">Restore Database</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    </div>
+                    <form id="form_restore_db" role="form" action="/web/database/restore" method="post" enctype="multipart/form-data">
+                        <div class="modal-body">
+                            {{ master_input() }}
+                            <div class="form-group">
+                                <label for="backup_file" class="col-form-label">File</label>
+                                <input id="backup_file" type="file" name="backup_file" class="required"/>
+                            </div>
+                            <div class="form-group">
+                                <label for="name" class="col-form-label">Database Name</label>
+                                <input id="name" type="text" name="name" class="form-control" required="required" pattern="{{ pattern }}" title="Only alphanumerical characters, underscore, hyphen and dot are allowed"/>
+                            </div>
+                            <div class="form-group">
+                                <label for="copy">This database might have been moved or copied.</label>
+                                <p class="form-text">
+                                    In order to avoid conflicts between databases, needs to know if this database was moved or copied.<br/>
+                                    If you don't know, answer "This database is a copy".
+                                </p>
+                                <div class="custom-control custom-radio">
+                                    <input id="radio_copy_true" name="copy" type="radio" class="custom-control-input" value="true" checked="1">
+                                    <label for="radio_copy_true" class="custom-control-label">This database is a copy</label>
+                                </div>
+                                <div class="custom-control custom-radio">
+                                    <input id="radio_copy_false" name="copy" type="radio" class="custom-control-input" value="false">
+                                    <label for="radio_copy_false" class="custom-control-label">This database was moved</label>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <input type="submit" value="Continue" class="btn btn-primary float-right"/>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
 
-  <!-- Backup DB -->
-  <div class="modal fade o_database_backup" role="dialog">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title">Backup Database</h4>
+        <!-- Master password -->
+        <div class="modal fade o_database_master" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title">Set Master Password</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    </div>
+                    <form id="form_change_pwd" role="form" action="/web/database/change_password" method="post">
+                        <div class="modal-body">
+                            <p>The master password is required to create, delete, dump or restore databases.</p>
+                            {{ master_input() }}
+                            <div class="form-group">
+                                <label for="master_pwd_new" class="col-form-label">New Master Password</label>
+                                <div class="input-group">
+                                    <input id="master_pwd_new" type="password" name="master_pwd_new" class="form-control" required="required" autocomplete="off"/>
+                                    <div class="input-group-append">
+                                        <span class="fa fa-eye o_little_eye input-group-text" aria-hidden="true" style="cursor: pointer;"></span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <input type="submit" value="Continue" class="btn btn-primary float-right"/>
+                        </div>
+                    </form>
+                </div>
+            </div>
         </div>
-        <form id="form_backup_db" role="form" action="/web/database/backup" method="post">
-          <div class="modal-body">
-            {{ master_input() }}
-            <div class="form-group">
-              <label for="name" class="control-label">Database Name</label>
-              <input id="name" type="text" name="name" class="form-control" required="required" readonly="readonly"/>
+
+        <!-- Duplicate DB -->
+        <div class="modal fade o_database_duplicate" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title">Duplicate Database</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    </div>
+                    <form id="form-duplicate-db" role="form" action="/web/database/duplicate" method="post">
+                        <div class="modal-body">
+                            {{ master_input() }}
+                            <div class="form-group">
+                                <label for="name" class="col-form-label">Database Name</label>
+                                <input id="name" type="text" name="name" class="form-control" required="required" readonly="readonly"/>
+                            </div>
+                            <div class="form-group">
+                                <label for="new_name" class="col-form-label">New Name</label>
+                                <input id="new_name" type="text" name="new_name" class="form-control" required="required" pattern="{{ pattern }}" title="Only alphanumerical characters, underscore, hyphen and dot are allowed"/>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <input type="submit" value="Continue" class="btn btn-primary float-right"/>
+                        </div>
+                    </form>
+                </div>
             </div>
-            <div class="form-group">
-              <label for="backup_format" class="control-label">Backup Format</label>
-              <select id="backup_format" name="backup_format" id="backup_format" class="form-control" required="required">
-                <option value="zip">zip (includes filestore)</option>
-                <option value="dump">pg_dump custom format (without filestore)</option>
-              </select>
+        </div>
+
+        <!-- Drop DB -->
+        <div class="modal fade o_database_delete" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title">Delete Database</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    </div>
+                    <form id="form_drop_db" role="form" action="/web/database/drop" method="post">
+                        <div class="modal-body">
+                            {{ master_input() }}
+                            <div class="form-group">
+                                <label for="name" class="col-form-label">Database</label>
+                                <input id="name" type="text" name="name" class="form-control" required="required" readonly="readonly"/>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <input type="submit" value="Delete" class="btn btn-primary float-right"/>
+                        </div>
+                    </form>
+                </div>
             </div>
-          </div>
-          <div class="modal-footer">
-          <input type="submit" value="Backup" class="btn btn-primary pull-right"/>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
+        </div>
 
-</body>
+        <!-- Backup DB -->
+        <div class="modal fade o_database_backup" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title">Backup Database</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    </div>
+                    <form id="form_backup_db" role="form" action="/web/database/backup" method="post">
+                        <div class="modal-body">
+                            {{ master_input() }}
+                            <div class="form-group">
+                                <label for="name" class="col-form-label">Database Name</label>
+                                <input id="name" type="text" name="name" class="form-control" required="required" readonly="readonly"/>
+                            </div>
+                            <div class="form-group">
+                                <label for="backup_format" class="col-form-label">Backup Format</label>
+                                <select id="backup_format" name="backup_format" class="form-control" required="required">
+                                    <option value="zip">zip (includes filestore)</option>
+                                    <option value="dump">pg_dump custom format (without filestore)</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <input type="submit" value="Backup" class="btn btn-primary float-right"/>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </body>
 </html>
diff --git a/odoo-debrand/views/views.xml b/odoo-debrand/views/views.xml
index c9df26ff7..393948c6c 100644
--- a/odoo-debrand/views/views.xml
+++ b/odoo-debrand/views/views.xml
@@ -1,4 +1,5 @@
 <odoo>
+
     <template id="debranding_title" name="Debranding title JS" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
             <script type="text/javascript" src="/odoo-debrand/static/src/js/title.js"/>