From 9b7e5fa7bc709a0dcdf71af7b26be9cf24e9deca Mon Sep 17 00:00:00 2001
From: Brian Moe <lars@moe.phys.uwm.edu>
Date: Tue, 22 Dec 2009 13:42:07 -0600
Subject: [PATCH] Compress header.  Play with size and arrangment of logos. 
 NOT FINISHED. There are two base templates here.  One with logos on top, one
 with them in the footer.  Need to decide which to use befmore pushing live.

---
 static/css/style.css                 | 16 +++++++++++++---
 templates/base.html                  | 25 ++++++++++++++++---------
 templates/feeds/index.html           |  2 +-
 templates/profile/notifications.html |  2 +-
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/static/css/style.css b/static/css/style.css
index e263b2ff7..03bdc0a66 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -22,16 +22,26 @@ tr.even td {background-color:#fff;}
     padding: 5px;
 }
 
+/*
 #header {
   height: 80px;
-  /* width: 777px; */
+  / * width: 777px; * /
   width: 95%;
   padding: 10px;
-  /* background: blue URL('../images/header_inner.png') no-repeat; */
+  / * background: blue URL('../images/header_inner.png') no-repeat; * /
   border-left: 1px solid #aaa;
   border-right: 1px solid #aaa;
   margin: 0 auto 0 auto;
 }
+*/
+
+#header h1,h2,h3 {
+    padding: 0px;
+    margin-left: 0px;
+    margin-right: 0px;
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
 
 a.link, a, a.active {
   color: #369;
@@ -47,7 +57,7 @@ a.link, a, a.active {
   margin: 0 auto 0 auto;
   border-left: 1px solid #aaa;
   border-right: 1px solid #aaa;
-  padding: 0px 10px 0px 10px;
+  padding: 10px 10px 0px 10px;
 }
 
 #content {
diff --git a/templates/base.html b/templates/base.html
index 893af0f37..63ae0e748 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -26,34 +26,39 @@ function changeTime(obj, label) {
 <!-- Header -->
  <table width="100%%">
   <tr>
+   <td align="left" valign="bottom">
+       <h1>GraceDB</h1>
+   </td>
+
    <td align="center">
-    <img width="69" height="50" src="/gracedb-static/images/LIGO_logo50.png">
+    <img width="52" height="37" src="/gracedb-static/images/ligo-blue.gif">
     <!-- 673px 487px -->
    </td>
 
    <td align="center">
-    <img width="273" height="50" src="/gracedb-static/images/Virgo_logo50.png">
+    <img width="164" height="30" src="/gracedb-static/images/Virgo_logo50.png">
     <!-- 4,829px 884px -->
    </td>
 
    <td align="center">
-    <img width="144" height="50" src="/gracedb-static/images/anim2.gif">
+    <img width="107" height="37" src="/gracedb-static/images/anim2.gif">
     <!-- 287px 101px -->
    </td>
 
    <td align="center">
-    <img width="118" height="50" src="/gracedb-static/images/LSC_logo50.png">
+    <img width="87" height="37" src="/gracedb-static/images/LSC_logo50.png">
     <!-- 6,261px 2,652px -->
    </td>
   </tr>
+  <tr>
+   <td colspan="5" align="left">
+    <h2>Gravitational-Wave Candidate Event Database</h2>
+  </tr>
  </table>
 <!-- End Header -->
 </div>
 
 <div id="content">
- <center>
- <h1>GraceDB: Gravitational-Wave Candidate Event Database</h1>
- </center>
 
 {% block nav %}
 <ul id="nav">
@@ -82,8 +87,10 @@ function changeTime(obj, label) {
     </div>
 
     <div id="footer">
-        <table><tr><td><img width="50" height="37"
-             src="/gracedb-static/images/ligo-blue.gif" alt="LIGO" /></td>
+        <table><tr><td><img
+             width="50" height="36"
+             src="/gracedb-static/images/ligo-blue.gif"
+             alt="LIGO" /></td>
         <td width="50%">&nbsp;</td>
         <td>
            <!--<p>GraceDB is a product of the LIGO Scientific Collaboration</p>-->
diff --git a/templates/feeds/index.html b/templates/feeds/index.html
index c7a550911..59fd87da9 100644
--- a/templates/feeds/index.html
+++ b/templates/feeds/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base2.html" %}
 
 {% block title %}RSS Feeds{% endblock %}
 {% block heading %}RSS Feeds{% endblock %}
diff --git a/templates/profile/notifications.html b/templates/profile/notifications.html
index ea4105918..6b42d35f6 100644
--- a/templates/profile/notifications.html
+++ b/templates/profile/notifications.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base2.html" %}
 
 {% block title %}Options | Notifications{% endblock %}
 {% block heading %}Notifications{% endblock %}
-- 
GitLab