From 6394d9a0a5aaf2bae84c07496df6386dfb084cab Mon Sep 17 00:00:00 2001
From: Sjur Hernes <sjurher@ulrik.uio.no>
Date: Thu, 16 Aug 2012 03:30:54 +0200
Subject: [PATCH] flickr show

---
 wp-content/themes/studio12/sidebar.php | 12 ++++++++++++
 wp-content/themes/studio12/style.css   |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/wp-content/themes/studio12/sidebar.php b/wp-content/themes/studio12/sidebar.php
index efd0c06..e2ab05f 100644
--- a/wp-content/themes/studio12/sidebar.php
+++ b/wp-content/themes/studio12/sidebar.php
@@ -5,6 +5,18 @@
 	<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 />
+
+    <div class="flickr-show" id="flickr">
+        <p>Please enable Javascript to view this slideshow</p>
+    </div>
+
+    <script src="http://www.flickrshow.co.uk/static/scripts/flickrshow-7.2.min.js"></script>
+    <script>
+   var robin = new flickrshow('flickr', {
+     'set':'72157631088130384'
+	 });
+    </script>
+
    <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>
diff --git a/wp-content/themes/studio12/style.css b/wp-content/themes/studio12/style.css
index bfbd66b..324ad48 100644
--- a/wp-content/themes/studio12/style.css
+++ b/wp-content/themes/studio12/style.css
@@ -463,4 +463,9 @@ button:hover {
 
 img {
     border: none;
+}
+
+.flickr-show {
+    margin-top: 1em;
+    height: 200px;
 }
\ No newline at end of file