summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-11-10 19:39:52 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-11-10 19:39:52 +0000
commit681b0127f678f4c0f372c9e9fde519a5f343dc7a (patch)
tree797c51a02467729952919181507282cd422312b3
parent939e069baaf4c98f1fa6161d6bde4c105f76c666 (diff)
downloadbcfg2-681b0127f678f4c0f372c9e9fde519a5f343dc7a.tar.gz
bcfg2-681b0127f678f4c0f372c9e9fde519a5f343dc7a.tar.bz2
bcfg2-681b0127f678f4c0f372c9e9fde519a5f343dc7a.zip
Reports: Stylesheet fixes from Tim Laszlo
<quote who="Tim Laszlo" address="tim.laszlo@gmail.com"> > On Tue, Nov 10, 2009 at 9:50 AM, Tim Laszlo <tim.laszlo@gmail.com> wrote: > > This is a little cleanup work. Some of the divs aren't displaying properly > and in IE the layout is offset and occasionally pushed down. With this > patch the sidebar also extends down the length of the page to match the > content. Previously it stopped sort and looked funny with large amounts of > content. Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5566 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--reports/site_media/boxypastel.css6
-rw-r--r--reports/site_media/layout.css27
-rw-r--r--src/lib/Server/Reports/reports/templates/base.html23
3 files changed, 31 insertions, 25 deletions
diff --git a/reports/site_media/boxypastel.css b/reports/site_media/boxypastel.css
index 4824270a5..4ec296f4d 100644
--- a/reports/site_media/boxypastel.css
+++ b/reports/site_media/boxypastel.css
@@ -101,12 +101,6 @@ div.nodebox {
text-align: left;
position:relative;
}
-div.header {
- background-color: #DDD;
- padding: 8px;
- text-indent:50px;
- position:relative;
- }
/*Divs For Statusbar*/
div.redbar {
border: 0px solid #660000;
diff --git a/reports/site_media/layout.css b/reports/site_media/layout.css
index c86b411fb..73f3b59af 100644
--- a/reports/site_media/layout.css
+++ b/reports/site_media/layout.css
@@ -1,18 +1,18 @@
/* Page Structure */
-#container { position:absolute; top: 3em; margin-left:1em; margin-right:2em; padding:0; margin-top:1.5em; min-width: 650px; }
+#container { float:left; padding:1em 2em 0 1em; background:#FFFFFF; min-width: 650px; min-height:500px; }
#header { width:100%; }
-#content-main { float:left; }
+#content-main { float:left; background: #000000; padding:0; }
/* HEADER */
-#header { background:#000; color:#ffc; position:absolute;}
+#header { background:#000; color:#ffc;}
#header a:link, #header a:visited { color:white; }
#header a:hover { text-decoration:underline; }
-#branding h1 { padding:0 10px; font-size:18px; margin:8px 0; font-weight:normal; color:#f4f379; }
+#branding h1 { padding:8px; font-size:18px; margin:0; font-weight:normal; color:#f4f379; }
#branding h2 { padding:0 10px; font-size:14px; margin:-8px 0 8px 0; font-weight:normal; color:#ffc; }
#user-tools { position:absolute; top:0; right:0; padding:1.2em 10px; font-size:11px; text-align:right; }
/*SIDEBAR*/
-#sidebar {float: left; position: relative; width: auto; height: 100%; margin-top: 3em; padding-right: 1.5em; padding-left: 1.5em; padding-top: 1em; padding-bottom:3em; background: #000; color:ffc; min-height:500px;}
+#sidebar {float: left; position: relative; width: auto; height: 100%; padding: 0 1em 3em 1em; color:ffc; min-height:500px;}
a.sidebar:link {color: #fff;}
a.sidebar:active {color: #fff;}
a.sidebar:visited {color: #fff;}
@@ -21,10 +21,23 @@ ul.sidebar {
color: #ffc;
text-decoration: none;
list-style-type: none;
- text-indent: -1em;
+ padding: 0 1em 0 1em;
+ margin: 12px 0 12px 0;
}
ul.sidebar-level2 {
text-indent: -2em;
list-style-type: none;
font-size: 11px;
-} \ No newline at end of file
+}
+
+/* Page Header */
+div.header {
+ background-color: #DDD;
+ padding: 1em;
+}
+div.header h1 {
+ font-size: 18px;
+ font-weight: normal;
+ padding: 0;
+ margin: 0;
+}
diff --git a/src/lib/Server/Reports/reports/templates/base.html b/src/lib/Server/Reports/reports/templates/base.html
index 81886ba75..8844e07c9 100644
--- a/src/lib/Server/Reports/reports/templates/base.html
+++ b/src/lib/Server/Reports/reports/templates/base.html
@@ -10,20 +10,21 @@
</head>
<body>
- <div id="header">
+ <div id="header">
<div id="branding">
<h1>Bcfg2 Reporting System</h1>
</div>
<div id="user-tools">...Change is Coming...</div>
- </div>
+ </div>
+ <div id="content-main">
<div id="sidebar">
{% block sidebar %}
<ul class="sidebar">
<li><a href="{% url Bcfg2.Server.Reports.reports.views.client_index %}../" class="sidebar">Home</a></li>
<li><a href="{% url Bcfg2.Server.Reports.reports.views.client_index %}" class="sidebar">Clients</a></li>
- <ul class="sidebar-level2">
- <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_detailed_list %}" class="sidebar">Detailed List</a></li>
- </ul>
+ <ul class="sidebar-level2">
+ <li><a href="{% url Bcfg2.Server.Reports.reports.views.client_detailed_list %}" class="sidebar">Detailed List</a></li>
+ </ul>
<li>
<a href="{% url Bcfg2.Server.Reports.reports.views.display_index %}" class="sidebar">Displays</a>
<ul class="sidebar-level2">
@@ -43,12 +44,10 @@
{% endblock %}
</div>
- <div id="content-main">
- <div id="container">
- {% block pagebanner %}{% endblock %}
- {% block content %}{% endblock %}
-
- </div>
- </div>
+ <div id="container">
+ {% block pagebanner %}{% endblock %}
+ {% block content %}{% endblock %}
+ </div>
+ </div>
</body>
</html>