diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index fd2f0db381d..1ced67b5402 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -976,6 +976,10 @@ color: black; text-align: left; } +.openerp .db_option_table{ + position: relative; + top: 10px; +} .openerp .oe_database_manager .oe_database_manager_menu { color: black; } diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 45cbaf46bfb..a5f9c249f74 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -300,6 +300,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }, start: function() { var self = this; + $('.oe_secondary_menus_container,.oe_user_menu_placeholder').empty(); var fetch_db = this.rpc("/web/database/get_list", {}).pipe( function(result) { self.db_list = result.db_list; @@ -315,11 +316,19 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }, do_render: function() { var self = this; - self.$element.html(QWeb.render("DatabaseManager", { widget : self })); - self.$element.find(".oe_database_manager_menu").tabs({ - show: function(event, ui) { - $('*[autofocus]:first', ui.panel).focus(); - } + $('.oe_topbar,.oe_leftbar').show(); + self.$element.html(QWeb.render("DatabaseManager",{ widget : self })); + $('.oe_secondary_menus_container').append($('.datamanager_menu')); + $('.oe_user_menu_placeholder').append($('.oe_user_menu')); + $('ul.oe_secondary_submenu > li').bind('click', function (event) { + $(this).addClass('oe_active').siblings().removeClass('oe_active'); + var $new = $(this); + var submenu = $('ul.oe_secondary_submenu > li > a'); + submenu.each(function () { + $($(this).attr('href')).hide(); + }); + $($new.find('a').attr('href')).show(); + event.preventDefault(); }); self.$element.find("form[name=create_db_form]").validate({ submitHandler: self.do_create }); self.$element.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop }); @@ -336,7 +345,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }, submitHandler: self.do_change_password }); - self.$element.find("#back_to_login").click(self.do_exit); + $('#back-to-login').click(self.do_exit); }, destroy: function () { this.$element.find('#db-create, #db-drop, #db-backup, #db-restore, #db-change-password, #back-to-login').unbind('click').end().empty(); @@ -407,7 +416,6 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }; self.do_action(client_action); }); - }, do_drop: function(form) { var self = this; @@ -486,11 +494,14 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.display_error(result); return; } + self.unblockUI(); self.do_notify("Changed Password", "Password has been changed successfully"); }); }, do_exit: function () { - this.do_action("login"); + this.$element.remove(); + $('.oe_topbar,.oe_leftbar').hide(); + this.do_action('login'); } }); instance.web.client_actions.add("database_manager", "instance.web.DatabaseManager"); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a742432b416..a5f309b625b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -122,218 +122,297 @@ - - - - - - Back to Login - - - - - - - d.url = '/' + (window.location.search || ''); - - - - - Database Management + + + + Back to Login + + + + Database Management - Create + Create Drop Backup Restore Password - - - - - - - - - - - - - - - - Database Management - - - - - - - - - - - - - - - - - - - - - - - - CREATE DATABASE - - - Master password: - - - - New database name: - - - - Load Demonstration data: - - - - Default language: - - - - - - - - - - Admin password: - - - - Confirm password: - - - - Create - - - - - - - DROP DATABASE - - - Database: - - - - - - - - - - - Master Password: - - - - Drop - - - - - - - - BACKUP DATABASE - - - Database: - - - - - - - - - - - Master Password: - - - - Backup - - - - - - - RESTORE DATABASE - - - File: - - - - Master Password: - - - - New database name: - - - - Restore - - - - - - - CHANGE MASTER PASSWORD - - - Master password: - - - - New master password: - - - - Confirm new master password: - - - - Change Password - - - - + + + + + + + + + + Create Database + + + + + + + Create - - - + + + - + + + + Master password: + + + + + + + + New database name: + + + + + + + + Load Demonstration data: + + + + + + + + + + Default language: + + + + + + + + + + + + + + Admin password: + + + + + + + + Confirm password: + + + + + + + + + + + + + + Drop Database + + + + + + + Drop + + + + + + + + + Database: + + + + + + + + + + + + + + + Master Password: + + + + + + + + + + + + + + Backup Database + + + + + + + Backup + + + + + + + + + + Database: + + + + + + + + + + + + + + + Master Password: + + + + + + + + + + + + + + Restore Database + + + + + + + Restore + + + + + + + + + File: + + + + + + + + Master Password: + + + + + + + + New database name: + + + + + + + + + + + + + + Change Master Password + + + + + + + Change Password + + + + + + + + + Master password: + + + + + + + + New master password: + + + + + + + + Confirm new master password: + + + + + + + - - - - - +