From 15af66ce3fdafc4a5cdfee1d32c35e1b6adb6b1e Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Mon, 30 Jul 2018 18:05:32 +0200 Subject: [PATCH] [FIX] web: BS4, restore database manager The database manager was broken with BS4, this commit restores it. The old BS3 layout was not perfect either, so this commit redesigns the forms with BS4 too. --- addons/web/views/database_manager.html | 678 +++++++++++++------------ 1 file changed, 342 insertions(+), 336 deletions(-) diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html index e0c35a1fc3e..32282098397 100644 --- a/addons/web/views/database_manager.html +++ b/addons/web/views/database_manager.html @@ -1,357 +1,363 @@ - - - Odoo - - - - - - - - - + + + Odoo + -{% macro master_input() -%} -
- {% if insecure %} - - {% else %} - - - {% endif %} -
-{%- endmacro %} + + -{% macro create_form() -%} -

Odoo is up and running!
- Fill out this form to create a new database. You will install your first app afterwards.

- {{ master_input() }} -
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - - -
-
-
-
- - -
-
- - -
-
-
-
-
- -
-
-{%- endmacro %} + - - -
-
-
- -
- {% if not list_db %} -
- The database manager has been disabled by the administrator -
- {% elif insecure and databases %} -
- Warning, your Odoo database manager is not protected. - Please set a master password - to secure it. -
- {% endif %} - {% if error %} -
{{ error }}
- {% endif %} - {% if list_db and databases %} -
- {% for db in databases %} - - {% if db in incompatible_databases %} - + + + + + + + + + + + + + + + + + + + {% macro master_input() -%} +
+ {% if insecure %} + + {% else %} + + {% endif %} - {{ db }} - {% if manage %} -
- Backup - Duplicate - Delete -
- {% endif %} - - {% endfor %}
- {% if manage %} -
- - - + {%- endmacro %} + + {% macro create_form() -%} +

Odoo is up and running!
+ Fill out this form to create a new database. You will install your first app afterwards.

+ {{ master_input() }} +
+ +
+ +
- {% else %} -
- Manage databases +
+ +
+ +
- {% endif %} - {% elif list_db %} -
- {{ create_form() }} - -
- - or restore a database - - {% endif %} -
-
- - - - - -