From 4571448bd0d0f9237151cfe92106a52363da6a66 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Thu, 19 Jul 2012 15:52:04 +0530 Subject: [PATCH 1/9] [IMP] Start to improve DB management looks same as other views of apps. bzr revid: jra@tinyerp.com-20120719102204-3eg2fmjdweouyjxl --- addons/web/static/src/xml/base.xml | 363 +++++++++++++++++------------ 1 file changed, 216 insertions(+), 147 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 70b0cd85cc5..50cec55014f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -115,153 +115,222 @@ -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CREATE DATABASE
- -
-
-
- - - - - - - - - - - - - - - -
DROP DATABASE
- - -
-
-
- - - - - - - - - - - - - - - - -
BACKUP DATABASE
- - -
-
-
- - - - - - - - - - - - - - - - - - - -
RESTORE DATABASE
-
-
- - - - - - - - - - - - - - - - - - - -
CHANGE MASTER PASSWORD
-
-
-
+ + + + + + + + + +
+ + Back to Login + +
+ + d.url = '/' + (window.location.search || ''); + + +
+
+
Database Management
+ +
+
+
+ Powered by OpenERP +
+ 		+
+ + + + + + + + + + + +
+

+ + Database Management + +

+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CREATE DATABASE
+ +
+
+
+ + + + + + + + + + + + + + + +
DROP DATABASE
+ + +
+
+
+ + + + + + + + + + + + + + + + +
BACKUP DATABASE
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + +
RESTORE DATABASE
+
+
+ + + + + + + + + + + + + + + + + + + +
CHANGE MASTER PASSWORD
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + From e15e32feb2d7b50ca5aa9c0f96b066df203ed45c Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 24 Jul 2012 11:48:14 +0530 Subject: [PATCH 2/9] [IMP] Remove form sheet width and background. bzr revid: jra@tinyerp.com-20120724061814-d0y5ujh3q13e5faj --- addons/web/static/src/xml/base.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 07e92ffa915..b8ca09b1186 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -174,8 +174,6 @@
-
-
@@ -315,8 +313,6 @@ -
-
From 1bc2b532a5209174033d95c0d64ec66241411701 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 7 Aug 2012 12:20:51 +0530 Subject: [PATCH 3/9] [FIX]Improve DB management bzr revid: vja@tinyerp.com-20120807065051-7r7qlvcwthz6m9ai --- addons/web/static/src/js/chrome.js | 25 +- addons/web/static/src/xml/base.xml | 436 +++++++++++++++++++---------- 2 files changed, 306 insertions(+), 155 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 45cbaf46bfb..5dab5c81d18 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -289,10 +289,10 @@ instance.web.Loading = instance.web.Widget.extend({ } } }); - instance.web.DatabaseManager = instance.web.Widget.extend({ init: function(parent) { this._super(parent); + self.$('.oe_topbar,.oe_leftbar').show(); this.unblockUIFunction = instance.web.unblockUI; $.validator.addMethod('matches', function (s, _, re) { return new RegExp(re).test(s); @@ -315,11 +315,18 @@ 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(); - } + self.$element.html(QWeb.render("DatabaseManager",{ widget : self })); + $('.oe_secondary_menus_container').replaceWith($('.datamanager_menu')); + $('.oe_user_menu_placeholder').replaceWith($('.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 +343,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 +414,6 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }; self.do_action(client_action); }); - }, do_drop: function(form) { var self = this; @@ -490,7 +496,8 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }); }, do_exit: function () { - this.do_action("login"); + this.do_action('reload'); + //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 601fe165f81..dc900d2c0c0 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -122,153 +122,297 @@ -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CREATE DATABASE
- -
-
-
- - - - - - - - - - - - - - - -
DROP DATABASE
- - -
-
-
- - - - - - - - - - - - - - - - -
BACKUP DATABASE
- - -
-
-
- - - - - - - - - - - - - - - - - - - -
RESTORE DATABASE
-
-
- - - - - - - - - - - - - - - - - - - -
CHANGE MASTER PASSWORD
-
-
+
+
+ + Back to Login +
+
+
Database Management
+ +
+
+
+
+
+ + + + + + + +
+

+ CREATE DATABASE +

+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + + + +
+ + + +
+ + + +
+ + + +
+
+ + + + +
+
+
From 4c1baa3e9bd77cbd1785dd39622ae3d73d1342af Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 7 Aug 2012 15:10:55 +0530 Subject: [PATCH 4/9] [FIX]Improve code bzr revid: vja@tinyerp.com-20120807094055-31ybiab12idv3o62 --- addons/web/static/src/js/chrome.js | 12 +++++++----- addons/web/static/src/xml/base.xml | 10 +++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 5dab5c81d18..ca0051a4d82 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -292,7 +292,6 @@ instance.web.Loading = instance.web.Widget.extend({ instance.web.DatabaseManager = instance.web.Widget.extend({ init: function(parent) { this._super(parent); - self.$('.oe_topbar,.oe_leftbar').show(); this.unblockUIFunction = instance.web.unblockUI; $.validator.addMethod('matches', function (s, _, re) { return new RegExp(re).test(s); @@ -315,9 +314,10 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }, do_render: function() { var self = this; + $('.oe_topbar,.oe_leftbar').show(); self.$element.html(QWeb.render("DatabaseManager",{ widget : self })); - $('.oe_secondary_menus_container').replaceWith($('.datamanager_menu')); - $('.oe_user_menu_placeholder').replaceWith($('.oe_user_menu')); + $('.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); @@ -496,8 +496,10 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }); }, do_exit: function () { - this.do_action('reload'); - //this.do_action('login'); + this.$element.remove(); + $('.oe_secondary_menus_container,.oe_user_menu_placeholder').empty(); + $('.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 dc900d2c0c0..88f7adfafb8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -131,11 +131,11 @@
Database Management
From 729570b06ed098ac85bc229c133df5933247b9c4 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 7 Aug 2012 17:03:43 +0530 Subject: [PATCH 5/9] [FIX]changes in title bzr revid: vja@tinyerp.com-20120807113343-dy3s17gsn0qwfc2a --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/js/chrome.js | 2 +- addons/web/static/src/xml/base.xml | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 029b3ef4f10..39382f1abce 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 ca0051a4d82..a2e5763c700 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -430,7 +430,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ return; } self.do_notify("Dropping database", "The database '" + db + "' has been dropped"); - self.start(); + self.unblockUI(); }); }, do_backup: function(form) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 88f7adfafb8..a5f309b625b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -146,7 +146,7 @@

- CREATE DATABASE + Create Database

@@ -227,7 +227,7 @@

- DROP DATABASE + Drop Database

@@ -273,7 +273,7 @@

- BACKUP DATABASE + Backup Database

@@ -320,7 +320,7 @@

- RESTORE DATABASE + Restore Database

@@ -367,7 +367,7 @@

- CHANGE MASTER PASSWORD + Change Master Password

From e29d386dcb0b26821efb923c5b5184d92efca0d3 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 7 Aug 2012 17:52:28 +0530 Subject: [PATCH 6/9] [FIX]unblockUI for change password bzr revid: vja@tinyerp.com-20120807122228-7ilrywn74w845p69 --- addons/web/static/src/js/chrome.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index a2e5763c700..6ced07d0694 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -492,6 +492,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.display_error(result); return; } + self.unblockUI(); self.do_notify("Changed Password", "Password has been changed successfully"); }); }, From 652a741e40dbcf458bc038e6826d59dcc5332a35 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 7 Aug 2012 18:20:37 +0530 Subject: [PATCH 7/9] [FIX]Minor chnages bzr revid: vja@tinyerp.com-20120807125037-jzfy3g5n36xde6px --- addons/web/static/src/js/chrome.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6ced07d0694..a5f9c249f74 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -289,6 +289,7 @@ instance.web.Loading = instance.web.Widget.extend({ } } }); + instance.web.DatabaseManager = instance.web.Widget.extend({ init: function(parent) { this._super(parent); @@ -299,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; @@ -430,7 +432,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ return; } self.do_notify("Dropping database", "The database '" + db + "' has been dropped"); - self.unblockUI(); + self.start(); }); }, do_backup: function(form) { @@ -498,7 +500,6 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ }, do_exit: function () { this.$element.remove(); - $('.oe_secondary_menus_container,.oe_user_menu_placeholder').empty(); $('.oe_topbar,.oe_leftbar').hide(); this.do_action('login'); } From 76decd658c51a3df010c869e3ab72b936f54c4ec Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Tue, 7 Aug 2012 18:46:35 +0530 Subject: [PATCH 8/9] [IMP] Improve indentation on xml view. bzr revid: jra@tinyerp.com-20120807131635-w84czwmi71mu1p9l --- addons/web/static/src/xml/base.xml | 574 ++++++++++++++--------------- 1 file changed, 287 insertions(+), 287 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a5f309b625b..03e5e813e0b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -122,297 +122,297 @@ -
-
+
+
Back to Login -
-
-
Database Management
- -
-
-
-
-
- - - - - - - -
-

- Create Database -

-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - - - -
- - - -
- - - -
- - - -
-
- - - - -
-
+
+
Database Management
+ +
+
+
+
+
+ + + + + + + +
+

+ Create Database +

+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + + + +
+ + + +
+ + + +
+ + + +
+
+ + + + +
+
+
From 1f7d10e6d4ff34dab4a7ab8d873ffded5c47d8e0 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Wed, 8 Aug 2012 12:18:11 +0530 Subject: [PATCH 9/9] Improve indentation. bzr revid: jra@tinyerp.com-20120808064811-3g74m9jhqht07p4a --- addons/web/static/src/xml/base.xml | 574 ++++++++++++++--------------- 1 file changed, 287 insertions(+), 287 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9c58fda4426..dba786125e8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -122,297 +122,297 @@ -
-
+
+
Back to Login -
-
-
Database Management
- -
-
-
-
-
- - - - - - - -
-

- Create Database -

-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - - - -
- - - -
- - - -
- - - -
-
- - - - -
-
+
+
Database Management
+ +
+
+
+
+
+ + + + + + + +
+

+ Create Database +

+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + + + +
+ + + +
+ + + +
+ + + +
+
+ + + + +
+
+