From 1dcf921ffa65c78d3b2c5cd5188cb1f7c466a650 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 4 Jan 2012 11:41:06 +0100 Subject: [PATCH] [imp] improved design of database manager bzr revid: nicolas.vanhoren@openerp.com-20120104104106-mithtsta4apwfccq --- addons/web/static/src/css/base.css | 22 ++++++++++---------- addons/web/static/src/js/chrome.js | 1 - addons/web/static/src/xml/base.xml | 33 ++++++++++++------------------ 3 files changed, 24 insertions(+), 32 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 132efa33888..0a64a562339 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -264,20 +264,20 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio .login.database_block .oe-database-manager { display: block; } -.login .db_options_row { - width: 100%; - height: 100%; - display: table-row; -} -.login .db_options_row .db_right_pane { - width: 100%; - height: 100%; -} -.db_container { +.login .database { + float: left; width: 196px; + height: 100%; background: #666666; } +.login .oe_db_options { + margin-left: 196px; + width: 100%; + height: 100%; + color: black; +} + ul.db_options li { padding: 5px 0 10px 5px; @@ -300,7 +300,7 @@ ul.db_options li { margin: 1px; color: #EEEEEE; cursor: pointer; - width: 196px; + width: 189px; font-size: 12px; } diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 6d300db9c31..bd95d304174 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -289,7 +289,6 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database }); $.when(fetch_db, fetch_langs).then(function () {self.do_create();}); - this.$element.find('#db-back').click(_.bind(function() {this.hide();}, this)); this.$element.find('#db-create').click(this.do_create); this.$element.find('#db-drop').click(this.do_drop); this.$element.find('#db-backup').click(this.do_backup); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 670b1a377fb..108504c6636 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -313,26 +313,19 @@ - - - - - -
-
-
    -
  • Back
  • -
  • Create
  • -
  • Drop
  • -
  • Backup
  • -
  • Restore
  • -
  • Password
  • -
  • Back to Login
  • -
-
-
-
-
+
+
+
    +
  • Create
  • +
  • Drop
  • +
  • Backup
  • +
  • Restore
  • +
  • Password
  • +
  • Back to Login
  • +
+
+
+