From 0d42418698a35de7890f8917b29ea274b5603492 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 11 Apr 2011 18:22:39 +0200 Subject: [PATCH] [IMP] Updated css for sidebar. bzr revid: nicolas.vanhoren@openerp.com-20110411162239-70r6yom0hqnkbius --- addons/base/static/src/css/base.css | 45 ++++++++++++++---- .../base/static/src/img/sideheader-a-bg.png | Bin 0 -> 126 bytes addons/base/static/src/js/views.js | 6 +-- addons/base/static/src/xml/base.xml | 1 + 4 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 addons/base/static/src/img/sideheader-a-bg.png diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 4a3aea4bb52..5c619aa4fb2 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -484,6 +484,7 @@ body.openerp { margin: 0; width:100%; border-collapse:collapse; + height:100%; } .openerp .view-manager-main-table tbody { @@ -495,35 +496,59 @@ body.openerp { } .openerp .view-manager-main-sidebar { - vertical-align: top; width:0; padding:0; margin:0; } -.openerp .view-manager-main-sidebar .sidebar-main-div { +.openerp .sidebar-main-div { padding:0; margin:0; width:180px; - border-color: #1F1F1F; - border-style: solid; - border-width: 1px; + border-left-color: #D2CFCF; + border-left-style: solid; + border-left-width: 1px; height:100%; + font-family: Ubuntu, Helvetica, sans-serif; + font-size: 0.9em; } -.openerp .view-manager-main-sidebar .sidebar-sub-div { - border: solid 1px #1F1F1F; - border-bottom-width: 0; +.openerp .sidebar-main-div a { + color: #555; + text-decoration: none; +} + +.openerp .sidebar-main-div a:hover { + color: black; +} + +.openerp .view-manager-main-sidebar h2 { + margin:0; + font-family: Ubuntu, Helvetica, sans-serif; + font-size: 1.15em; + color: #8E8E8E; + text-shadow: white 0px 1px 0px; + padding-left: 10px; + padding-right: 21px; + height: 21px; + background: url(../img/sideheader-a-bg.png) repeat-x; + border-color: #D2CFCF; + border-style: solid; + border-top-width: 1px; + border-bottom-width: 1px; + border-left-width: 0; + border-right-width: 0; } .openerp .view-manager-main-sidebar ul { list-style-type: none; margin: 0; padding: 0; - border-bottom: solid 1px #1F1F1F; + display: block; } .openerp .view-manager-main-sidebar li { - padding: 3px; + display: block; + padding: 3px 3px 3px 10px; } diff --git a/addons/base/static/src/img/sideheader-a-bg.png b/addons/base/static/src/img/sideheader-a-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..ca9b64b8b01911a235e855e01b2d7c50f1b89258 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{P!2~2Z41|M$lw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlA_Y$u#}JO_jFX{{Ndj{5$`Nf80lMa&j2{ XYg_(Ua%H77P%VR}tDnm{r-UW|lLRIi literal 0 HcmV?d00001 diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 890f69448a5..12935c72132 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -188,10 +188,10 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({ set_toolbar: function(toolbar) { this.sections = []; var self = this; - _.each(["print", "action", "relate"], function(type) { - if (toolbar[type].length == 0) + _.each([["print", "Reports"], ["action", "Actions"], ["relate", "Links"]], function(type) { + if (toolbar[type[0]].length == 0) return; - var section = {elements:toolbar[type]}; + var section = {elements:toolbar[type[0]], label:type[1]}; self.sections.push(section); }); this.refresh(); diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 57f9c81559e..47e4c705364 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -530,6 +530,7 @@ +