Merge branch 'master' of github.com:neuf/studio11-theme

header.php

@@ -181,7 +181,7 @@ $j(".content .post,#header [href]").live('click',function(e)
 					
 						<div id="countdown" style="position:absolute;top:10px;left:400px;color:#C32083;">Bare <?php echo ceil((strtotime('2011-08-15') - time()) / 60 / 60 / 24) ?> dager igjen!</div>
 						
-						<img style="position:absolute;left:460px;bottom:-5px;"http://nintendo.neuf.no/oyvinbak/studio11/wp-content/themes/studio11/img/bjornenmskilt.png  src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/bjornenmskilt.png" alt="STUDiO11" usemap="#blifrivillig" />
+						<img style="position:absolute;left:460px;bottom:-5px;" src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/bjornenmskilt.png" alt="STUDiO11" usemap="#blifrivillig" />
 						<map name="blifrivillig">  
         <area shape="poly" coords="1,144,15,46,50,50,41,66,49,87,61,51,29,39,49,0,111,20,97,64,67,55,52,99,62,124,53,149,31,149," href="/bli-med" alt="Bli frivillig!" title="Bli frivillig!"   />
     </map> 

loop-index.php

@@ -13,7 +13,7 @@ if ($news->have_posts()) : while ($news->have_posts()) : $news->the_post(); ?>
   
 <h2><a href="#"><span class="frontbox" src="#hidpos-<?php the_ID(); ?>" height="420" title="<?php the_title(); ?>"></span><?php the_title(); ?></a><a href="<?php the_permalink(); ?>" rel="bookmark" ></a></h2>
   <p class="meta">Posted on <?php the_time('F jS, Y'); ?></p>
-<div id="hidpos-<?php the_ID(); ?>" style="display:none"><a href="#"><span class="frontbox" src="#hidpos-<?php the_ID(); ?>" height="420" title="<?php the_title(); ?>"></span><?php the_content("lol", true); ?></a></div>
+<div id="hidpos-<?php the_ID(); ?>" style="display:none"><?php the_content(); ?></div>
   
   <p><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', '); ?> | <?php edit_post_link('Edit', '', ' | '); ?> <?php comments_popup_link('No Comments &#187;', '1 Com &#187;', '% Comments &#187;'); ?></p>
 </div>

loop.php

@@ -0,0 +1,20 @@
+<?php while ( have_posts() ) : the_post(); ?>
+
+<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+			<h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
+			<div class="loop-image">
+				<?php echo get_the_post_thumbnail( $post->ID, array (525, 9999) ); ?>
+			</div>
+
+			<div class="entry-meta">
+				<?php twentyten_posted_on(); ?>
+			</div><!-- .entry-meta -->
+
+			<div class="entry-content">
+
+						<?php the_excerpt(); ?>
+
+			</div><!-- .entry-content -->
+
+		</div><!-- #post-## -->
+<?php endwhile; ?>

studio_header.php

@@ -0,0 +1,40 @@
+<div id="header" style="position:relative;">
+		<div id="masthead">
+			<div id="branding" role="banner">
+				<?php $heading_tag = ( is_home() || is_front_page() ) ? 'h1' : 'div'; ?>
+				<<?php echo $heading_tag; ?> id="site-title" style="width:100%;margin:0px;float:none;">
+					<span>
+						<a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
+						
+						<?php //bloginfo( 'name' ); ?>
+						<img style="position:absolute;left:10px;top:10px;" height="120"  src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/STUDiO_logo_gra.png" alt="STUDiO11" />
+						<img style="position:absolute;left:180px;top:55px;" height="100"  src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/Kvalen.png" alt="STUDiO11" />
+						<img style="position:absolute;left:230px;bottom:0px;" width="150"  src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/Slangen.png" alt="STUDiO11" />
+						
+						<img style="position:absolute;left:400px;bottom:0px;" width="50"  src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/Pingvinen.png" alt="STUDiO11" />
+						<img style="position:absolute;left:150px;bottom:0px;" width="50"  src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/Ugla.png" alt="STUDiO11" />
+						<img style="position:absolute;left:0px;bottom:0px;" width="75"  src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/Kua.png" alt="STUDiO11" />
+					
+						<div id="countdown" style="position:absolute;top:10px;left:400px;color:#C32083;">Bare <?php echo ceil((strtotime('2011-08-15') - time()) / 60 / 60 / 24) ?> dager igjen!</div>
+						
+						<img style="position:absolute;left:460px;bottom:-5px;" src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/bjornenmskilt.png" alt="STUDiO11" usemap="#blifrivillig" />
+						<map name="blifrivillig">  
+        <area shape="poly" coords="1,144,15,46,50,50,41,66,49,87,61,51,29,39,49,0,111,20,97,64,67,55,52,99,62,124,53,149,31,149," href="/bli-med" alt="Bli frivillig!" title="Bli frivillig!"   />
+    </map> 
+
+	<img style="position:absolute;left:550px;bottom:0px;" width="40"  src="<?php echo get_bloginfo('stylesheet_directory') ?>/img/Grisen.png" alt="STUDiO11" />
+						</a>
+						
+
+					</span>
+				</<?php echo $heading_tag; ?>
+			</div><!-- #branding -->
+
+			<div id="access" role="navigation">
+			  <?php /*  Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
+				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
+				<?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
+			</div><!-- #access -->
+		</div><!-- #masthead -->
+		</div><!-- #header -->
+</div><!-- skjønner ikke hvorfor denne trengs -->