From 89d59f52fd2db7ccc960bf5074503f0eb4702ee8 Mon Sep 17 00:00:00 2001
From: Sjur Hernes <sjurher@ifi.uio.no>
Date: Mon, 2 Jul 2012 22:52:10 +0200
Subject: [PATCH] stylechanges

---
 wp-content/plugins/neuf-events/dagev.php     | 17 +++++++++
 wp-content/plugins/studio-blimed.php         |  2 --
 wp-content/themes/studio12/sidebar-right.php |  9 -----
 wp-content/themes/studio12/sidebar.php       |  8 +++++
 wp-content/themes/studio12/sponsorer.php     |  3 ++
 wp-content/themes/studio12/style.css         | 37 +++++++++++++-------
 6 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/wp-content/plugins/neuf-events/dagev.php b/wp-content/plugins/neuf-events/dagev.php
index 774eb83..8df8a6b 100755
--- a/wp-content/plugins/neuf-events/dagev.php
+++ b/wp-content/plugins/neuf-events/dagev.php
@@ -252,6 +252,23 @@ if (!class_exists("NeufEvents")) {
 				      ) 
 				);
 	$html = '';
+
+	$html .= '<ul id="programNavbar">';
+	$html .= '   <li class="programNavbarTab">MAN <span class="dateColor">13.08</span></li>';
+	$html .= '   <li class="programNavbarTab">TIRS <span class="dateColor">14.08</span></li>';
+	$html .= '   <li class="programNavbarTab">ONS <span class="dateColor">15.08</span></li>';
+	$html .= '   <li class="programNavbarTab">TORS <span class="dateColor">16.08</span></li>';
+	$html .= '   <li class="programNavbarTab">FRE <span class="dateColor">17.08</span></li>';
+	$html .= '   <li class="programNavbarTab">LØR <span class="dateColor">18.08</span></li>';
+	$html .= '   <li class="programNavbarTab">SØN <span class="dateColor">19.08</span></li>';
+	$html .= '   <li class="programNavbarTab">MAN <span class="dateColor">20.08</span></li>';
+	$html .= '   <li class="programNavbarTab">TIRS <span class="dateColor">21.08</span></li>';
+	$html .= '   <li class="programNavbarTab">ONS <span class="dateColor">22.08</span></li>';
+	$html .= '   <li class="programNavbarTab">TORS <span class="dateColor">23.08</span></li>';
+	$html .= '   <li class="programNavbarTab">FRE <span class="dateColor">24.08</span></li>';
+	$html .= '   <li class="programNavbarTab">LØR <span class="dateColor">25.08</span></li>';
+	$html .= '   <li class="programNavbarTab">SØN <span class="dateColor">26.08</span></li>';
+	$html .= '</ul><hr />';
 	
 	if ( $events->have_posts() ) :
 	  $date = "";
diff --git a/wp-content/plugins/studio-blimed.php b/wp-content/plugins/studio-blimed.php
index 9424b74..fb9884b 100644
--- a/wp-content/plugins/studio-blimed.php
+++ b/wp-content/plugins/studio-blimed.php
@@ -82,8 +82,6 @@ Template Name: blimed
       if ($settinnidb) {
 	echo '<div id="blimed_tilbake_ok"><p>Du er nå registrert</p></div>';
 	
-	// TODO MAILER!!
-
       } else echo '<div id="blimed_tilbake_fail"><p>Beklager teknisk feil, sjekk verdiene og prøv på nytt</p></div>';
     } else echo '<div id="blimed_tilbake_fail"><p>Du må oppgi navn, epost, tlf og et arbeidsområde</p></div>';    
 
diff --git a/wp-content/themes/studio12/sidebar-right.php b/wp-content/themes/studio12/sidebar-right.php
index 7e30711..b608e00 100644
--- a/wp-content/themes/studio12/sidebar-right.php
+++ b/wp-content/themes/studio12/sidebar-right.php
@@ -1,14 +1,5 @@
 <div id="sidebar-right" class="sidebar">
 
-   <div class="countdown">
-   <h2><?php echo (int)(((mktime (0,0,0,8,13,2012) - time())/3600)/24); ?> dager igjen! </h2>
-
-</div>
-   <div class="countdown" style="margin-top: 1em;">
-   <h2><a href="<?php echo get_permalink(get_page_by_title('Det Norske Studentersamfund')->ID); ?>">Det Norske Studentersamfund</a></h2>
-
-</div>
-
    <?php if (function_exists('dynamic_sidebar') && dynamic_sidebar('Sidebar Widgets2')) : else : ?>
     
         <!-- All this stuff in here only shows up if you DON\'T have any widgets active in this zone -->
diff --git a/wp-content/themes/studio12/sidebar.php b/wp-content/themes/studio12/sidebar.php
index f4eddce..6ce2b9d 100644
--- a/wp-content/themes/studio12/sidebar.php
+++ b/wp-content/themes/studio12/sidebar.php
@@ -4,6 +4,14 @@
    <a href="<?php echo get_permalink(get_page_by_title('Frivillig!')->ID); ?>">
 	<img id="frivilligknapp" src="<?php echo get_template_directory_uri(); ?>/images/knapp_frivillig.png" alt="blimed" onmouseover=" this.src='<?php echo get_template_directory_uri(); ?>/images/knapp_frivillig_mouseover.png'" onmouseout=" this.src='<?php echo get_template_directory_uri(); ?>/images/knapp_frivillig.png'" />
    </a>
+   <br /><br />
+   <div class="countdown">
+   <h2><?php echo (int)(((mktime (0,0,0,8,13,2012) - time())/3600)/24); ?> dager igjen! </h2>
+
+</div>
+   <div class="countdown" style="margin-top: 1em;">
+   <h2><a href="<?php echo get_permalink(get_page_by_title('Det Norske Studentersamfund')->ID); ?>">Det Norske Studentersamfund</a></h2>
+</div>
 
    <?php if (function_exists('dynamic_sidebar') && dynamic_sidebar('Sidebar Widgets')) : else : ?>
     
diff --git a/wp-content/themes/studio12/sponsorer.php b/wp-content/themes/studio12/sponsorer.php
index 1c84f04..bf2e69e 100644
--- a/wp-content/themes/studio12/sponsorer.php
+++ b/wp-content/themes/studio12/sponsorer.php
@@ -13,6 +13,9 @@ $args=array(
 	    'post_status' => 'publish',
 	    'paged' => $paged,
 	    'ignore_sticky_posts'=> 1
+	    'meta_key' => 'dagen_bedrift_type',
+	    'orderby' => 'meta_value',
+	    'order' => 'ASC'
 	    );
 $temp = $wp_query;  // assign orginal query to temp variable for later use   
 $wp_query = null;
diff --git a/wp-content/themes/studio12/style.css b/wp-content/themes/studio12/style.css
index b78d6d4..dace9ab 100644
--- a/wp-content/themes/studio12/style.css
+++ b/wp-content/themes/studio12/style.css
@@ -57,7 +57,7 @@ body {
 
 .menu-item {
     float: left;
-    margin-left: 2.8em;
+    margin-left: 2.5em;
     list-style: none;
 /*
     width: 125px;
@@ -71,8 +71,7 @@ body {
     color: #FFF;
     line-height: 40px;
     font-family: 'Lobster', cursive;
-    font-weight: bold;
-    font-size: 1.1em;
+    font-size: 1.5em;
     padding: 0 1em 0 1em;
 }
 .menu-item a:hover {
@@ -122,7 +121,9 @@ hr { width: 60%; }
     width: 20%;
     margin: 1em 0em 0 0;
 }
-
+.sidebar h2 {
+    margin: 0;
+}
 #sidebar-left{ 
     float:left;
 }
@@ -145,6 +146,8 @@ hr { width: 60%; }
 }
 
 .countdown h2 {
+    font-weight: normal;
+    font-size: 1.7em;
     color: #FFF;
     text-shadow: 1px 2px #000;
     margin: 0;
@@ -183,18 +186,17 @@ hr { width: 60%; }
  
 .widget .artist a {
     font-family: 'Lobster', cursive;
-
     text-decoration: none;
 }
 .widget .artist :hover {
     text-decoration: underline;
 }
-.widget .str1 a { font-size: 16px;}
-.widget .str2 a { font-size: 19px; }
-.widget .str3 a { font-size: 22px; }
-.widget .str4 a { font-size: 25px; }
-.widget .str5 a { font-size: 28px; }
-.widget .str6 a { font-size: 31px; }
+.widget .str1 a { font-size: 18px;}
+.widget .str2 a { font-size: 21px; }
+.widget .str3 a { font-size: 24px; }
+.widget .str4 a { font-size: 27px; }
+.widget .str5 a { font-size: 30px; }
+.widget .str6 a { font-size: 33px; }
 .widget .blueart a   { color: rgb(0, 186, 192)  ; }
 .widget .redart a    { color: rgb(228, 44, 122) ; }
 .widget .greenart a  { color: rgb(14, 174, 91)  ; }
@@ -354,4 +356,15 @@ tbody .Foredrag, tbody .Lyntale {  /* lysest Blå */
 }
 tbody .Foredrag:hover, tbody .Lyntale:hover { background-color: #ade3d4; } /* lys blå */
 
-
+#programNavbar {
+    margin-left: -2.5em;
+    height: 4em;
+}
+.programNavbarTab {
+    font-family: Oswald, sans-serif;
+    font-weight: bold;
+    float: left;
+    margin-right: 0.5em;
+    list-style-position: inside;
+}
+.dateColor { color: #33a39e; }
\ No newline at end of file