| 
					
				 | 
			
			
				@@ -70,10 +70,14 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   <hgroup class="logo"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   <?php 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	if ($site_title) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  	print $site_title; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  	print '<h1>'.$site_title.'</h1>'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  if ($site_slogan) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  	print '<h2>'.$site_slogan.'</h2>'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  </hgroup>		 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  </hgroup> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	<?php if ($page['headerblock_left'] || $page['headerblock_middle'] || $page['headerblock_right']): ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		<div id="header-blocks"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -82,30 +86,30 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			<?php print render($page['headerblock_right']); ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	<?php endif; ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	<?php if ($breadcrumb): ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <section id="breadcrumb"><?php print $breadcrumb; ?></section> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   <?php endif; ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-</header>  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!-- /header -->		 		 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+</header> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!-- /header --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <div id="main"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <?php if ($method == 0 || $method == 2): ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <?php print render($page['sidebar_first']); ?>	       	 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <?php endif; ?>	 					 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <?php print render($page['sidebar_first']); ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <?php endif; ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <?php if ($method == 2): ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <?php print render($page['sidebar_second']) ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <?php endif; ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		<?php if(isset($page['sidebar_first']) || isset($page['sidebar_second'])): ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		<section id="center">	 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		<section id="center"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		<?php endif; ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				<?php if ($primary_local_tasks || $secondary_local_tasks || $action_links): ?> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -135,32 +139,32 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				</section> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				<?php print render($page['content_bottom']); ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		<?php if(isset($page['sidebar_first']) || isset($page['sidebar_second'])): ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		</section> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		<?php endif; ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		    <!-- /center -->					 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		    <!-- /center --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <?php if ($method == 1): ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <?php print render($page['sidebar_first']); ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <?php endif; ?>	 					 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <?php endif; ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <?php if ($method == 0 || $method == 1): ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <?php print render($page['sidebar_second']) ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <?php endif; ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-           
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-</div><!-- /main -->	 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    		 			 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+</div><!-- /main --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <footer id="footer"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		<?php print render($page['footer_top']); ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		<?php if ($page['footer_left'] || $page['footer_middle_left'] || $page['footer_middle_right'] || $page['footer_right']): ?> 	         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <div class="footer-block">					 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		<?php if ($page['footer_left'] || $page['footer_middle_left'] || $page['footer_middle_right'] || $page['footer_right']): ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <div class="footer-block"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				<?php print render($page['footer_left']); ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				<?php print render($page['footer_middle-left']); ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				<?php print render($page['footer_midle-right']); ?> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -169,7 +173,6 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		<?php endif; ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		<?php print render($page['footer_bottom']); ?> 		 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-</footer>  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!-- /footer -->	 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		<?php print render($page['footer_bottom']); ?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+</footer> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!-- /footer --> 
			 |