From 39f5683bcb40f9739e3f7f63c31bcaf9129ee37e Mon Sep 17 00:00:00 2001
From: Thomas Misund <thomas@hemmeligadresse.com>
Date: Sat, 30 Jan 2010 15:08:36 +0100
Subject: [PATCH] =?UTF-8?q?Oppdaterer=20utseendet=20til=20=C3=A5=20matche?=
 =?UTF-8?q?=20studentersamfundet-web=201.1=20bedre.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inside/Page.php   | 109 ++++++++++++++++-----------
 inside/screen.css | 183 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 194 insertions(+), 98 deletions(-)

diff --git a/inside/Page.php b/inside/Page.php
index ba920da..5b24724 100644
--- a/inside/Page.php
+++ b/inside/Page.php
@@ -27,62 +27,87 @@ class Page {
   public function display(){
     $this->_displayHeader();
     ?>
-  <body>
+  <body class="dns section-inside">
     <div id="container">
       <div id="header">
         <span class="site-title"><a href="http://studentersamfundet.no/"><?php print $this->page_title; ?></a></span>
 
+        <div id="quick-menu">
+            Om Studentersamfundet | <a href="http://studentersamfundet.no/kart.php">Kart</a> | <a href="http://studentersamfundet.no/kontakt.php">Kontakt</a>
+        </div>
+
+        <div class="aapningstider"> 
+            <table> 
+                <tr><td>Mandag-onsdag</td><td>13-01</td></tr> 
+                <tr><td>Torsdag-fredag</td><td>13-03</td></tr> 
+                <tr><td>L&oslash;rdag</td><td>16-03</td></tr> 
+                <tr><td>Kjøkkenet</td><td>Til 19</td></tr> 
+            </table> 
+        </div>
+
 <?php /*
-This menu thing is pretty much copied and pasted from functions.php. Could we possibly include it instead? --Thomas Misund, 26. Oct 2009
+This menu thing is pretty much copied and pasted from functions.php in the studentersamfundet-web project. Could we
+possibly include it instead? --Thomas Misund, 26. Oct 2009
  */ ?>
         <div id="menu">
             <ul>
+                <li id="forside-meny"><a href="http://studentersamfundet.no/">Forside</a>
+                    <div class="sub-menu">
+                        <ul>
+                            <li><a href="http://studentersamfundet.no/lokaler.php">Lokaler</a></li>
+                            <li><a href="http://studentersamfundet.no/historie.php">Historie</a></li>
+                            <li><a href="http://studentersamfundet.no/billetter.php">Billetter</a></li>
+                            <li><a href="http://studentersamfundet.no/medlemmer.php">Bli medlem</a></li>
+                            <li><a href="http://studentersamfundet.no/medlem/index.php">Registrere medlemskort</a></li>
+                        </ul>
+                    </div>
+                </li>
                 <li id="program-meny"><a href="http://studentersamfundet.no/prog.php">Program</a>
-                    <ul>
-                        <li><!--a href="http://studentersamfundet.no/prog.php">Alle</a></li>
-                        <li><a href="http://studentersamfundet.no/prog.php?type=konsert">Konsert</a></li>
-                        <li><a href="http://studentersamfundet.no/prog.php?type=debatt">Debatt</a></li>
-                        <li><a href="http://studentersamfundet.no/prog.php?type=film">Film</a></li>
-                        <li><a href="http://studentersamfundet.no/prog.php?type=fest">Fest</a></li>
-                        <li><a href="http://studentersamfundet.no/prog.php?type=teater">Teater</a></li>
-                        <li><a href="http://studentersamfundet.no/prog.php?type=annet">Annet</a></li>
-                        <li><a href="http://studentersamfundet.no/konsepter.php">Konsepter</a></li>
-                        <li><a href="http://studentersamfundet.no/booking.php">Booking</a--> </li>
-                    </ul>
+                    <div class="sub-menu">
+                        <ul>
+                            <li><a href="http://studentersamfundet.no/prog.php">Alle</a></li>
+                            <li><a href="http://studentersamfundet.no/prog.php?type=konsert">Konsert</a></li>
+                            <li><a href="http://studentersamfundet.no/prog.php?type=debatt">Debatt</a></li>
+                            <li><a href="http://studentersamfundet.no/prog.php?type=film">Film</a></li>
+                            <li><a href="http://studentersamfundet.no/prog.php?type=fest">Fest</a></li>
+                            <li><a href="http://studentersamfundet.no/prog.php?type=teater">Teater</a></li>
+                            <li><a href="http://studentersamfundet.no/prog.php?type=annet">Annet</a></li>
+                            <li><a href="http://studentersamfundet.no/konsepter.php">Konsepter</a></li>
+                            <li><a href="http://studentersamfundet.no/booking.php">Booking</a></li>
+                        </ul>
+                    </div>
                 </li>
-                <li id="informasjon-meny"><a href="http://studentersamfundet.no/lokaler.php">Informasjon</a>
-                    <ul>
-                        <li><!--a href="http://studentersamfundet.no/lokaler.php">Huset</a></li>
-                        <li><a href="http://studentersamfundet.no/foreninger.php">Foreninger</a></li>
-                        <li><a href="http://studentersamfundet.no/historie.php">Historie</a></li>
-                        <li><a href="http://studentersamfundet.no/jobb.php">Jobb</a></li>
-                        <li><a href="http://studentersamfundet.no/billetter.php">Billetter</a></li>
-                        <li><a href="http://studentersamfundet.no/kart.php">Kart</a--> </li>
-                    </ul>
-                </li>
-                <li id="medlem-meny"><a href="http://studentersamfundet.no/medlemmer.php">Medlem</a>
-                    <ul>
-                        <li><!--a href="https://studentersamfundet.no/inside/index.php">Medlemsider</a></li>
-                        <li><a href="http://studentersamfundet.no/fordeler.php">Fordeler</a></li>
-                        <li><a href="http://studentersamfundet.no/medlemmer.php">Bli medlem</a></li>
-                        <li><a href="http://studentersamfundet.no/aktive.php">Aktive</a></li>
-                        <li><a href="/medlem/index.php">Registrere medlemskort</a--> </li>
-                    </ul>
+                <li id="foreninger-meny"><a href="http://studentersamfundet.no/foreninger.php">Foreninger</a>
+                    <div class="sub-menu">
+                        <ul>
+                            <li><a href="http://studentersamfundet.no/foreninger.php">Foreninger</a></li>
+                        </ul>
+                    </div>
                 </li>
                 <li id="forum-meny"><a href="http://studentersamfundet.no/forum/index.php">Forum</a>
-                    <ul>
-                        <li><!--Ingen undermenypunkter--> </li>
-                    </ul>
+                    <div class="sub-menu">
+                        <ul>
+                            <li><a href="http://studentersamfundet.no/forum/viewforum.php?f=68">Musikk</a></li>
+                            <li><a href="http://studentersamfundet.no/forum/viewforum.php?f=69">Debatt</a></li>
+                            <li><a href="http://studentersamfundet.no/forum/viewforum.php?f=70">Fritt forum</a></li>
+                        </ul>
+                    </div>
                 </li>
-                <li id="inside-meny" class="current"><a href="https://studentersamfundet.no/inside">Inside</a>
-                    <ul>
-                        <li><!--Ingen undermenypunkter--> </li>
-                    </ul>
+                <li id="inside-meny" class="current"><a href="https://www.studentersamfundet.no/inside">For medlemmer</a>
+                    <div class="sub-menu">
+                        <ul>
+                            <li><a href="https://www.studentersamfundet.no/inside/">Inside</a></li>
+                            <li><a href="http://studentersamfundet.no/viteboka/?page_id=3">Viteboka</a></li>
+                            <li><a href="https://www.studentersamfundet.no/inside/index.php?page=display-barshifts-calendar">Tappet&aring;rnets vaktliste</a>
+                            <li><a href="http://studentersamfundet.no/aktive.php">Andre ressurser</a></li>
+                        </ul>
+                    </div>
                 </li>
-                <li id="kontakt-meny"><a href="http://studentersamfundet.no/kontakt.php">Kontakt</a>
-                    <ul>
-                        <li><!--Ingen undermenypunkter--> </li>
-                    </ul>
+                <li id="nyheter-meny"><a href="http://studentersamfundet.no/nyheter.php">Nyheter</a>
+                    <div class="sub-menu">
+                        <ul>
+                        </ul>
+                    </div>
                 </li>
             </ul>
         </div> <!-- #menu -->
diff --git a/inside/screen.css b/inside/screen.css
index 19cca55..ad25c82 100644
--- a/inside/screen.css
+++ b/inside/screen.css
@@ -355,8 +355,19 @@ h4 {
 }
 /* =header
 *********************************************************************/
+
+#menu li {
+    font-size:14px;
+}
+.aapningstider table {
+    border:none;
+}
+.aapningstider table td {
+    background:transparent;
+}
+
 #header { 
-  background: url("http://studentersamfundet.no/img/header-210x.png") repeat-x bottom;
+  background: #191919 url("http://studentersamfundet.no/img/header-210x.png") repeat-x bottom;
   border: none;
 }
 .site-title a {
@@ -367,17 +378,55 @@ h4 {
     width:400px;
     margin-top:15px;
 }
-#header {
+/*#header {
     height:120px;
     overflow:hidden;
     position:relative;
+}*/
+
+#header {
+    height:175px;
+    margin-bottom:10px;
+    overflow:hidden;
+    position:relative;
 }
+.site-title {
+    z-index:999
+}
+.site-title a {
+    background: url('http://studentersamfundet.no/img/bannerindex-400.png') no-repeat -20px 0;
+    display:block;
+    height:63px;
+    margin-top:20px;
+    text-indent:-9999px;
+    width:400px;
+}
+
+#quick-menu {
+    color:#cccccc;
+    font-size:13px;
+    left:50%;
+    margin-left:100px;
+    position:absolute;
+    text-align:right;
+    top:5px;
+    width:375px;
+}
+#quick-menu a {
+    color:#ffffff;
+}
+
 #menu {
     position:absolute;
-    bottom:14px;
+    bottom:35px;
     width:100%;
-    padding-left:40%;
-
+/*    padding-left:23%;*/
+}
+#header .site-title,
+#header #menu ul ul,
+#menu > ul {
+    width:975px;
+    margin:auto;
 }
 #menu ul,#menu li {
     list-style-type:none;
@@ -391,83 +440,105 @@ h4 {
     height:22px;
     padding:5px 13px 3px;
     text-decoration:none;
-    color: #f5f5f5;
+    color:#ffffff;
 }
-#menu ul ul {
-    bottom:-45px;
+#menu ul div {
+    bottom:-25px;
     left:0;
     position:absolute;
     margin:0;
     width:100%;
-    border-top:4px solid;
+    border-top:none;
+}
+#menu ul ul li,
+#menu ul ul li a {
+    color:#ffffff;
 }
 #menu ul ul li a {
     padding-top:1px;
-    color:#444444;
 }
 
 #menu > ul > li {
     -moz-border-radius-topleft:8px;
     -moz-border-radius-topright:8px;
     -webkit-border-top-left-radius:8px;
-}
-#menu ul ul {
-    -moz-border-radius-bottomleft:8px;
-    -moz-border-radius-bottomright:8px;
-    -webkit-border-bottom-left-radius:8px;
+    -webkit-border-top-right-radius:8px;
+    border-top-left-radius:8px;
+    border-top-right-radius:8px;
 }
 
-#menu li ul {
+#menu li div {
     display:none;
-    height:41px;
+    height:25px;
 }
-#menu li.current ul {
+#menu li.current div {
     display:block;
 }
-#menu li:hover ul {
+#menu li:hover div,
+#menu li:focus div
+{
     display:block;
-    background:url('img/gradient-200x.png') repeat-x 0 -204px;
+    background:url('http://studentersamfundet.no/img/gradient-200x.png') repeat-x 0 -204px;
     z-index:9;
 }
-#menu li#program-meny{
-    background:#945FB9;
-}
-#menu li#program-meny ul {
-    border-color:#945FB9;
-}
-#menu li#informasjon-meny {
-    background:#D83E00;
-}
-#menu li#informasjon-meny ul {
-    border-color:#D83E00;
-}
-#menu li#medlem-meny {
-    background:#094f71;
-}
-#menu li#medlem-meny ul {
-    border-color:#094f71;
-}
-#menu li#forum-meny {
-    background:#187105;
-}
-#menu li#forum-meny ul {
-    border-color:#187105;
-}
-#menu li#inside-meny {
-    background: #9D2F2F;
-}
-#menu li#inside-meny ul {
-    border-color: #9D2F2F;
-}
-#menu li#kontakt-meny {
-    background: #444444;
-}
-#menu li#kontakt-meny ul {
-    border-color: #444444;
+
+#menu li div {
+    background-image: url(http://studentersamfundet.no/img/fade-to-black.png) !important;
 }
 
+#menu > ul > li,
+#menu li div {
+    background-color:#999999;
+}
+.section-forside #menu li#forside-meny,
+#menu li#forside-meny:hover,
+#menu li#forside-meny div {
+    background:#2c69a6 url(http://studentersamfundet.no/img/gradient-white-to-transparent-x30.png) repeat-x 0 top;
+}
+.section-program #menu li#program-meny,
+#menu li#program-meny:hover,
+#menu li#program-meny div {
+    background:#b64484 url(http://studentersamfundet.no/img/gradient-white-to-transparent-x30.png) repeat-x 0 top;
+}
+.section-foreninger #menu li#foreninger-meny,
+#menu li#foreninger-meny:hover,
+#menu li#foreninger-meny div {
+    background:#23905b url(http://studentersamfundet.no/img/gradient-white-to-transparent-x30.png) repeat-x 0 top;
+}
+.section-forum #menu li#forum-meny,
+#menu li#forum-meny:hover,
+#menu li#forum-meny div {
+    background:#ba3939 url(http://studentersamfundet.no/img/gradient-white-to-transparent-x30.png) repeat-x 0 top;
+}
+.section-inside #menu li#inside-meny,
+#menu li#inside-meny:hover,
+#menu li#inside-meny div {
+    background: #6b43a2 url(http://studentersamfundet.no/img/gradient-white-to-transparent-x30.png) repeat-x 0 top;
+}
+.section-nyheter #menu li#nyheter-meny,
+#menu li#nyheter-meny:hover,
+#menu li#nyheter-meny div {
+    background: #1c8a8e url(http://studentersamfundet.no/img/gradient-white-to-transparent-x30.png) repeat-x 0 top;
+}
 
-
+#header .aapningstider {
+    color:#CCCCCC;
+    font-size:12px;
+    height:100px;
+    left:50%;
+    margin-left:300px;
+    overflow:hidden;
+    position:absolute;
+    text-align:right;
+    top:25px;
+    width:175px;
+}
+#header .aapningstider table {
+    position:absolute;
+    right:0;
+    bottom:0;
+    text-align:left;
+}
 
 /* =navigation
  *********************************************************************/