From 1090ead83024c25b1141c096a05eb1b71836a7ba Mon Sep 17 00:00:00 2001
From: Sjur Hernes <sjurher@ifi.uio.no>
Date: Tue, 22 May 2012 06:49:25 +0200
Subject: [PATCH] randomfix and lol

---
 wp-content/plugins/neuf-artist.php       |  4 ++--
 wp-content/themes/studio12/functions.php | 11 ++++-----
 wp-content/themes/studio12/style.css     | 30 +++++++++++-------------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/wp-content/plugins/neuf-artist.php b/wp-content/plugins/neuf-artist.php
index 3f72950..848bf4c 100644
--- a/wp-content/plugins/neuf-artist.php
+++ b/wp-content/plugins/neuf-artist.php
@@ -112,8 +112,8 @@ Create the fields the post type should have
 
     foreach ($events as $event) {
       if ($event->post_title != '' ){
-	echo '<option value="'.$event->guid.'"';
-	if($event->guid == $artist_event)
+	echo '<option value="'.$event->ID.'"';
+	if($event->ID == $artist_event)
 	  echo ' selected="selected"';
 	echo '>'.$event->post_title.'</option>';
       }
diff --git a/wp-content/themes/studio12/functions.php b/wp-content/themes/studio12/functions.php
index 73243bd..7cb9aed 100644
--- a/wp-content/themes/studio12/functions.php
+++ b/wp-content/themes/studio12/functions.php
@@ -2,19 +2,21 @@
 add_theme_support('nav-menus');
 add_theme_support( 'automatic-feed-links' ); //automatic_feed_links();
 add_theme_support( 'post-thumbnails' ); // Makes it easier with image-links :D
-set_post_thumbnail_size(250,250,false);
+set_post_thumbnail_size(200,200,false);
 add_image_size('firstpost', 540, 999, false);
 register_nav_menus( array('header-menu' => 'Header Menu' ) );
 add_filter( 'excerpt_length', 'custom_excerpt_length', 999 );
 // Custom background :)
 add_custom_background();
 
-if ( !is_admin() ) {
+function studio2012_enqueue_scripts() {
   wp_deregister_script('jquery');
   wp_register_script('jquery', ("http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.min.js"), false);
   wp_enqueue_script('jquery');
 }
 
+add_action('wp_enqueue_scripts', 'studio2012_enqueue_scripts');
+
 if (function_exists('register_sidebar')) {
   register_sidebar(array(
 			 'name' => 'Sidebar Widgets',
@@ -79,10 +81,7 @@ class Artist_Widget extends WP_Widget {
 	// event-lenka
 	$event = get_post_meta($post->ID, 'studio_artist_event', true);
 	// ekstern lenke for artisten
-	if (get_post_meta($post->ID, 'studio_artist_link', true))
-	  $link = ' <a href="'.get_post_meta($post->ID, 'studio_artist_link', true).'">ekst</a>';
-	else $link = "";
-	echo '<p class="artist '.get_post_meta($post->ID, 'studio_artist_type', true).'"><a href="' . $event . '">' . get_the_title() . '</a>'.$link.'</p>';
+	echo '<p class="artist '.get_post_meta($post->ID, 'studio_artist_font', true).' '.get_post_meta($event, 'neuf_events_type', true)."\"><a href=\"" . get_post($event)->guid . "\">" . get_the_title() . '</a></p>';
 
       }
     } echo "<hr />";
diff --git a/wp-content/themes/studio12/style.css b/wp-content/themes/studio12/style.css
index 7d613ce..3e7160e 100644
--- a/wp-content/themes/studio12/style.css
+++ b/wp-content/themes/studio12/style.css
@@ -138,28 +138,26 @@ hr { width: 60%; }
 }
  
 .widget .artist a {
-    font-size: 30px;
     font-family: 'Lobster', cursive;
     text-decoration: none;
 }
 .widget .artist :hover {
     text-decoration: underline;
 }
-.widget .liten a {
-    color: #000;
-}
-.widget .normalliten a {
-    color: #333;
-}
-.widget .normalstor a {
-    color: #666;
-}
-.widget .stor a {
-    color: #999;
-}
-.widget .mega a {
-color: #CCC;
-}
+.widget .liten a { font-size: 18px;}
+.widget .normalliten a { font-size: 21px; }
+.widget .normalstor a { font-size: 24px; }
+.widget .stor a { font-size: 27px; }
+.widget .mega a { font-size: 30px; }
+.widget .Konsert a { color: blue; }
+.widget .Annet a { color: red; }
+.widget .Foredrag a { color: yellow; }
+.widget .Klub a { color: green; }
+.widget .Quiz a { color: purple; }
+.widget .Stand-up a { color: pink; }
+.widget .Konkurranse a { color: cyan; }
+.widget .Lyntale a { color: magenta; }
+
 
 .post, .event {
     padding: 1em 2em 0 2em;