From 9fce53c3e41223bda94933e6f3dafbf6df3f08dc Mon Sep 17 00:00:00 2001
From: Sjur Hernes <sjurher@ifi.uio.no>
Date: Mon, 28 May 2012 05:50:02 +0200
Subject: [PATCH] frivilligfix

---
 wp-content/themes/studio12/functions.php | 2 +-
 wp-content/themes/studio12/index.php     | 8 ++++++--
 wp-content/themes/studio12/style.css     | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/studio12/functions.php b/wp-content/themes/studio12/functions.php
index 917fb45..7cb9aed 100644
--- a/wp-content/themes/studio12/functions.php
+++ b/wp-content/themes/studio12/functions.php
@@ -93,7 +93,7 @@ register_widget('Program_Widget');
 register_widget('Artist_Widget'); 
 
 function custom_excerpt_length( $length ) {
-  return 35;
+  return 25;
 }
 
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/studio12/index.php b/wp-content/themes/studio12/index.php
index 0fc368f..0a17500 100644
--- a/wp-content/themes/studio12/index.php
+++ b/wp-content/themes/studio12/index.php
@@ -15,7 +15,8 @@ $c++; ?>
    <div class="entry">
      <?php the_excerpt(25); ?>
    </div>
-
+  <a href="<?php the_permalink() ?>">
+  <img class="lesmer" src="<?php echo get_template_directory_uri(); ?>/images/knapp_opp_lesmer.png" alt="Les Mer" onmouseover=" this.src='<?php echo get_template_directory_uri(); ?>/images/knapp_ned_lesmer.png'" onmouseout=" this.src='<?php echo get_template_directory_uri(); ?>/images/knapp_opp_lesmer.png'"  /> <br /><br />
        <hr />
 </article>
        <?php else : ?>
@@ -25,7 +26,10 @@ $c++; ?>
    <div class="entry">
      <?php the_excerpt(25); ?>
    </div>
-  <br />
+  <a href="<?php the_permalink() ?>">
+  <img class="lesmer" src="<?php echo get_template_directory_uri(); ?>/images/knapp_opp_lesmer.png" alt="Les Mer" onmouseover=" this.src='<?php echo get_template_directory_uri(); ?>/images/knapp_ned_lesmer.png'" onmouseout=" this.src='<?php echo get_template_directory_uri(); ?>/images/knapp_opp_lesmer.png'"  /> <br /><br />
+
+
        <hr />
 </article>
 
diff --git a/wp-content/themes/studio12/style.css b/wp-content/themes/studio12/style.css
index 583037d..4da0a93 100644
--- a/wp-content/themes/studio12/style.css
+++ b/wp-content/themes/studio12/style.css
@@ -282,4 +282,8 @@ input#saveForm {
 
 #blimed_tilbake_fail {
     background-color: red;
+}
+
+.lesmer {
+    float: right;
 }
\ No newline at end of file