Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/README.txt,v
retrieving revision 1.1.4.1
diff -u -p -r1.1.4.1 README.txt
--- README.txt	11 Nov 2010 13:52:44 -0000	1.1.4.1
+++ README.txt	14 Jan 2011 20:45:57 -0000
@@ -3,7 +3,7 @@ Superfish Drop Menu:
 1) Build a standard drupal menu. Set the correct levels to "expanded" (the parent item).
 
 2) Disable Main menu in the Danland theme settings.
-	 
+
 3) Place the Main menu block in the Superfish menu region. Your menu will be automatically rendered as a Drop menu.
-	 
-4) To modify the animation style and speed please see the following site for a full run down on configuring the Superfish plugin: http://users.tpg.com.au/j_birch/plugins/superfish/
\ No newline at end of file
+
+4) To modify the animation style and speed please see the following site for a full run down on configuring the Superfish plugin: http://users.tpg.com.au/j_birch/plugins/superfish/
Index: local_sample.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/local_sample.css,v
retrieving revision 1.1
diff -u -p -r1.1 local_sample.css
--- local_sample.css	8 Apr 2010 17:16:16 -0000	1.1
+++ local_sample.css	14 Jan 2011 20:45:57 -0000
@@ -4,7 +4,7 @@
 /* LOCAL CSS                */
 /****************************/
 
-/* Put your custom css and css overrides in this file and  */ 
+/* Put your custom css and css overrides in this file and  */
 /* rename it local.css.  By restricting your css changes   */
 /* to local.css, your changes will not be overwritten when */
 /* upgrading to a new version of this theme.               */
@@ -12,7 +12,7 @@
 /* Steps to activate local.css:                       */
 /* 1. Add your custom css to this file                */
 /* 2. Rename this file to local.css                   */
-/* 3. Uncomment (remove leading semicolon from ) the  */ 
+/* 3. Uncomment (remove leading semicolon from ) the  */
 /*    following line in your theme's .info file:      */
 /*    ;stylesheets[all][] = local.css                 */
 /* 4. Clear cached data at admin/settings/performance */
Index: maintenance-page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/Attic/maintenance-page.tpl.php,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 maintenance-page.tpl.php
--- maintenance-page.tpl.php	6 Jan 2011 07:45:39 -0000	1.1.2.2
+++ maintenance-page.tpl.php	14 Jan 2011 20:45:57 -0000
@@ -14,70 +14,70 @@
 
 <div>
 <div id="header">
-<div id="header-wrapper">
-	<?php if ($logo): ?> 
-		<div id="logo-wrapper">
-			<div class="logo">
-				<a href="<?php print $base_path ?>" title="<?php print t('Home') ?>"><img src="<?php print $logo ?>" alt="<?php print t('Home') ?>" /></a>
-			</div>
-		</div><!-- end logo wrapper -->
-	<?php endif; ?>
-	<?php if ($site_name || $site_slogan) : ?>
-		<div id="branding-wrapper">
-			<?php if ($site_name) : ?>
-					<h2 class="site-name"><a href="<?php print $base_path ?>" title="<?php print $site_name ?>"><?php print $site_name ?></a></h2>
-			<?php endif; ?>
-			<?php if ($site_slogan) : ?>
-				<div class='site-slogan'><?php print $site_slogan; ?></div>
-			<?php endif; ?>
-        	</div><!-- end branding wrapper -->
-	<?php endif; ?>
-
-	<?php if ($feed_icons): ?>
-		<div class="feed-wrapper">
-			<?php print $feed_icons; ?>
-		</div>
-	<?php endif; ?>
-
-	<?php if (!$is_admin): ?>
-		<div id="authorize">
-      		      <ul><?php global $user; if ($user->uid != 0) { print '<li class="first">' .t('Logged in as '). '<a href="' .url('user/'.$user->uid). '">' .$user->name. '</a></li>'; print '<li><a href="' .url('user/logout'). '">' .t('Logout'). '</a></li>'; } else { print '<li class="first"><a href="' .url('user'). '">' .t('Login'). '</a></li>'; print '<li><a href="' .url('user/register'). '">' .t('Register'). '</a></li>'; } ?></ul>
-		</div>
-	<?php endif; ?>
+  <div id="header-wrapper">
+    <?php if ($logo): ?>
+      <div id="logo-wrapper">
+        <div class="logo">
+          <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" /></a>
+        </div>
+      </div><!-- end logo wrapper -->
+    <?php endif; ?>
+    <?php if ($site_name || $site_slogan): ?>
+      <div id="branding-wrapper">
+        <?php if ($site_name): ?>
+          <h2 class="site-name"><a href="<?php print $base_path; ?>" title="<?php print $site_name; ?>"><?php print $site_name; ?></a></h2>
+        <?php endif; ?>
+        <?php if ($site_slogan): ?>
+          <div class='site-slogan'><?php print $site_slogan; ?></div>
+        <?php endif; ?>
+      </div><!-- end branding wrapper -->
+    <?php endif; ?>
+
+    <?php if ($feed_icons): ?>
+      <div class="feed-wrapper">
+        <?php print $feed_icons; ?>
+      </div>
+    <?php endif; ?>
+
+    <?php if (!$is_admin): ?>
+      <div id="authorize">
+        <ul><?php global $user; if ($user->uid != 0) { print '<li class="first">' .t('Logged in as '). '<a href="' .url('user/'.$user->uid). '">' .$user->name. '</a></li>'; print '<li><a href="' .url('user/logout'). '">' .t('Logout'). '</a></li>'; } else { print '<li class="first"><a href="' .url('user'). '">' .t('Login'). '</a></li>'; print '<li><a href="' .url('user/register'). '">' .t('Register'). '</a></li>'; } ?></ul>
+      </div>
+    <?php endif; ?>
 
-      </div><!-- end header-wrapper -->
+  </div><!-- end header-wrapper -->
 </div> <!-- /header -->
 <div style="clear:both"></div>
 
 <div id="menu">
-<div id="rounded-menu-left"></div>
-<div id="rounded-menu-right"></div>
+  <div id="rounded-menu-left"></div>
+  <div id="rounded-menu-right"></div>
 </div> <!-- end menu -->
 <div style="clear:both"></div>
 
 <div id="slideshow-wrapper">
-<div class="slideshow-inner">
-<div id="slideshow-preface">
-<?php if ($title): ?>
-          <div id="preface">
-                <h1 class="title" id="page-title">
-         			 <?php print $title; ?>
-        		</h1>
-          </div><!-- end preface -->
- <?php endif; ?>
-</div>
-<?php if ($content): ?><div id="slideshow-bottom">
-<div id="content-maintenance"><?php print $content; ?></div></div><?php endif; ?>
-<div class="slideshow">
-<img src="<?php print $base_path . $directory; ?>/images/slideshows/sea.jpg" width="950" height="355" alt="slideshow 1"/>
-<img src="<?php print $base_path . $directory; ?>/images/slideshows/noon.jpg" width="950" height="355" alt="slideshow 2"/>
-<img src="<?php print $base_path . $directory; ?>/images/slideshows/snow.jpg" width="950" height="355" alt="slideshow 3"/>
-</div>
-</div>
+  <div class="slideshow-inner">
+    <div id="slideshow-preface">
+      <?php if ($title): ?>
+        <div id="preface">
+            <h1 class="title" id="page-title">
+            <?php print $title; ?>
+          </h1>
+        </div><!-- end preface -->
+      <?php endif; ?>
+    </div>
+    <?php if ($content): ?><div id="slideshow-bottom">
+    <div id="content-maintenance"><?php print $content; ?></div></div><?php endif; ?>
+    <div class="slideshow">
+      <img src="<?php print $base_path . $directory; ?>/images/slideshows/sea.jpg" width="950" height="355" alt="slideshow 1"/>
+      <img src="<?php print $base_path . $directory; ?>/images/slideshows/noon.jpg" width="950" height="355" alt="slideshow 2"/>
+      <img src="<?php print $base_path . $directory; ?>/images/slideshows/snow.jpg" width="950" height="355" alt="slideshow 3"/>
+    </div>
+  </div>
 </div>
 
 <div style="clear:both"></div>
-<?php if ($show_messages) { print $messages; }; ?>
+<?php if ($show_messages) { print $messages; } ?>
 
 <div style="clear:both"></div>
 <div id="notice"><p>Theme by <a href="http://www.danetsoft.com">Danetsoft</a> and <a href="http://www.danpros.com">Danang Probo Sayekti</a> inspired by <a href="http://www.maksimer.no">Maksimer</a></p></div>
Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/page.tpl.php,v
retrieving revision 1.17.2.4
diff -u -p -r1.17.2.4 page.tpl.php
--- page.tpl.php	19 Nov 2010 14:42:44 -0000	1.17.2.4
+++ page.tpl.php	14 Jan 2011 20:45:57 -0000
@@ -2,226 +2,224 @@
 // $Id: page.tpl.php,v 1.17.2.4 2010/11/19 14:42:44 danprobo Exp $
 ?>
 <div <?php print danland_page_class($page['sidebar_first'], $page['sidebar_second']); ?>>
-<div id="header">
-<div id="header-wrapper">
-	<?php if ($logo): ?> 
-		<div id="logo-wrapper">
-			<div class="logo">
-				<a href="<?php print $base_path ?>" title="<?php print t('Home') ?>"><img src="<?php print $logo ?>" alt="<?php print t('Home') ?>" /></a>
-			</div>
-		</div><!-- end logo wrapper -->
-	<?php endif; ?>
-	<?php if ($site_name || $site_slogan) : ?>
-		<div id="branding-wrapper">
-			<?php if ($site_name) : ?>
-				<?php if ($is_front) : ?>
-					<h1 class="site-name"><a href="<?php print $base_path ?>" title="<?php print $site_name ?>"><?php print $site_name ?></a></h1>
-				<?php endif; ?>
-				<?php if (!$is_front) : ?>
-					<h2 class="site-name"><a href="<?php print $base_path ?>" title="<?php print $site_name ?>"><?php print $site_name ?></a></h2>
-				<?php endif; ?>
-			<?php endif; ?>
-			<?php if ($site_slogan) : ?>
-				<div class='site-slogan'><?php print $site_slogan; ?></div>
-			<?php endif; ?>
-        	</div><!-- end branding wrapper -->
-	<?php endif; ?>
-	
-	<?php if ($page['search_box']): ?>
-		<div id="search-box">
-			<?php print render ($page['search_box']); ?>
-		</div><!-- /search-box -->
-	<?php endif; ?>
-
-	<?php if ($feed_icons): ?>
-		<div class="feed-wrapper">
-			<?php print $feed_icons; ?>
-		</div>
-	<?php endif; ?>
-
-	<?php if (!$is_admin): ?>
-		<div id="authorize">
-      		      <ul><?php global $user; if ($user->uid != 0) { print '<li class="first">' .t('Logged in as '). '<a href="' .url('user/'.$user->uid). '">' .$user->name. '</a></li>'; print '<li><a href="' .url('user/logout'). '">' .t('Logout'). '</a></li>'; } else { print '<li class="first"><a href="' .url('user'). '">' .t('Login'). '</a></li>'; print '<li><a href="' .url('user/register'). '">' .t('Register'). '</a></li>'; } ?></ul>
-		</div>
-	<?php endif; ?>
-
-      </div><!-- end header-wrapper -->
-</div> <!-- /header -->
-<div style="clear:both"></div>
-
-<div id="menu">
-<div id="rounded-menu-left"></div>
- <?php if ($main_menu || $page['superfish_menu']): ?>
-      <div id="<?php print $main_menu ? 'nav' : 'superfish' ; ?>">
-        <?php 
-					     if ($main_menu) {
-		          print theme('links__system_main_menu', array('links' => $main_menu));  
-				      }
-				      elseif (!empty($page['superfish_menu'])) {
-				        print render ($page['superfish_menu']);
-				      }
-        ?>
-      </div> <!-- end primary -->
-    <?php endif; ?>
-<div id="rounded-menu-right"></div>
-</div> <!-- end menu -->
-<div style="clear:both"></div>
-
-<?php if($is_front): ?>
-<div id="slideshow-wrapper">
-<div class="slideshow-inner">
-<div id="slideshow-preface">
- <?php if ($page['preface']): ?>
-          <div id="preface">
-            <?php print render ($page['preface']); ?>
-          </div><!-- end preface -->
- <?php endif; ?>
-</div>
-<?php if ($page['highlighted']) : ?><div id="slideshow-bottom">
-<div id="mission"><?php print render ($page['highlighted']); ?></div></div><?php endif; ?>
-<div class="slideshow">
-<img src="<?php print $base_path . $directory; ?>/images/slideshows/sea.jpg" width="950" height="355" alt="slideshow 1"/>
-<img src="<?php print $base_path . $directory; ?>/images/slideshows/noon.jpg" width="950" height="355" alt="slideshow 2"/>
-<img src="<?php print $base_path . $directory; ?>/images/slideshows/snow.jpg" width="950" height="355" alt="slideshow 3"/>
-</div>
-</div>
-</div>
-<?php endif; ?>
+  <div id="header">
+    <div id="header-wrapper">
+      <?php if ($logo): ?>
+        <div id="logo-wrapper">
+          <div class="logo">
+            <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" /></a>
+          </div>
+        </div><!-- end logo wrapper -->
+      <?php endif; ?>
+      <?php if ($site_name || $site_slogan): ?>
+        <div id="branding-wrapper">
+          <?php if ($site_name): ?>
+            <?php if ($is_front): ?>
+              <h1 class="site-name"><a href="<?php print $base_path; ?>" title="<?php print $site_name; ?>"><?php print $site_name; ?></a></h1>
+             <?php endif; ?>
+             <?php if (!$is_front): ?>
+               <h2 class="site-name"><a href="<?php print $base_path; ?>" title="<?php print $site_name; ?>"><?php print $site_name; ?></a></h2>
+             <?php endif; ?>
+          <?php endif; ?>
+          <?php if ($site_slogan): ?>
+            <div class='site-slogan'><?php print $site_slogan; ?></div>
+          <?php endif; ?>
+        </div><!-- end branding wrapper -->
+      <?php endif; ?>
+
+      <?php if ($page['search_box']): ?>
+        <div id="search-box">
+          <?php print render($page['search_box']); ?>
+        </div><!-- /search-box -->
+      <?php endif; ?>
+
+      <?php if ($feed_icons): ?>
+        <div class="feed-wrapper">
+          <?php print $feed_icons; ?>
+        </div>
+      <?php endif; ?>
+
+      <?php if (!$is_admin): ?>
+        <div id="authorize">
+          <ul><?php global $user; if ($user->uid != 0) { print '<li class="first">' .t('Logged in as '). '<a href="' .url('user/'.$user->uid). '">' .$user->name. '</a></li>'; print '<li><a href="' .url('user/logout'). '">' .t('Logout'). '</a></li>'; } else { print '<li class="first"><a href="' .url('user'). '">' .t('Login'). '</a></li>'; print '<li><a href="' .url('user/register'). '">' .t('Register'). '</a></li>'; } ?></ul>
+        </div>
+      <?php endif; ?>
+
+    </div><!-- end header-wrapper -->
+  </div> <!-- /header -->
+  <div style="clear:both"></div>
+
+  <div id="menu">
+    <div id="rounded-menu-left"></div>
+      <?php if ($main_menu || $page['superfish_menu']): ?>
+        <div id="<?php print $main_menu ? 'nav' : 'superfish'; ?>">
+          <?php 
+            if ($main_menu) {
+              print theme('links__system_main_menu', array('links' => $main_menu));  
+            }
+            elseif (!empty($page['superfish_menu'])) {
+              print render($page['superfish_menu']);
+            }
+          ?>
+        </div> <!-- end primary -->
+      <?php endif; ?>
+    <div id="rounded-menu-right"></div>
+  </div> <!-- end menu -->
+  <div style="clear:both"></div>
+
+  <?php if ($is_front): ?>
+    <div id="slideshow-wrapper">
+      <div class="slideshow-inner">
+        <div id="slideshow-preface">
+          <?php if ($page['preface']): ?>
+            <div id="preface">
+              <?php print render($page['preface']); ?>
+            </div><!-- end preface -->
+          <?php endif; ?>
+        </div>
+        <?php if ($page['highlighted']): ?><div id="slideshow-bottom">
+        <div id="mission"><?php print render($page['highlighted']); ?></div></div><?php endif; ?>
+          <div class="slideshow">
+            <img src="<?php print $base_path . $directory; ?>/images/slideshows/sea.jpg" width="950" height="355" alt="slideshow 1"/>
+            <img src="<?php print $base_path . $directory; ?>/images/slideshows/noon.jpg" width="950" height="355" alt="slideshow 2"/>
+            <img src="<?php print $base_path . $directory; ?>/images/slideshows/snow.jpg" width="950" height="355" alt="slideshow 3"/>
+          </div>
+      </div>
+    </div>
+  <?php endif; ?>
 
- <?php if($page['preface_first'] || $page['preface_middle'] || $page['preface_last']) : ?>
+  <?php if ($page['preface_first'] || $page['preface_middle'] || $page['preface_last']): ?>
     <div style="clear:both"></div>
     <div id="preface-wrapper" class="in<?php print (bool) $page['preface_first'] + (bool) $page['preface_middle'] + (bool) $page['preface_last']; ?>">
-          <?php if($page['preface_first']) : ?>
-          <div class="column A">
-            <?php print render ($page['preface_first']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['preface_middle']) : ?>
-          <div class="column B">
-            <?php print render ($page['preface_middle']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['preface_last']) : ?>
-          <div class="column C">
-            <?php print render ($page['preface_last']); ?>
-          </div>
-          <?php endif; ?>
-      <div style="clear:both"></div>
+    <?php if ($page['preface_first']): ?>
+    <div class="column A">
+      <?php print render($page['preface_first']); ?>
+    </div>
+    <?php endif; ?>
+    <?php if ($page['preface_middle']): ?>
+    <div class="column B">
+      <?php print render($page['preface_middle']); ?>
+    </div>
+    <?php endif; ?>
+    <?php if ($page['preface_last']): ?>
+    <div class="column C">
+      <?php print render($page['preface_last']); ?>
     </div>
     <?php endif; ?>
+    <div style="clear:both"></div>
+  </div>
+  <?php endif; ?>
 
-<div style="clear:both"></div>
-<div id="wrapper">
+  <div style="clear:both"></div>
+  <div id="wrapper">
 
     <?php if ($page['sidebar_first']): ?>
       <div id="sidebar-left" class="column sidebar"><div class="section">
         <?php print render($page['sidebar_first']); ?>
       </div></div> <!-- end sidebar-first -->
     <?php endif; ?>
-<div id="content">
-			<a id="main-content"></a>
-			<?php if ($page['content_top']) : ?><div class="content-top"><?php print render ($page['content_top']); ?></div>
-			<?php endif; ?>
-			<?php if (!$is_front) print $breadcrumb; ?>
-			<?php if ($show_messages) { print $messages; }; ?>
-      		<?php print render($title_prefix); ?>
-      			<?php if ($title): ?>
-        				<h1 class="title" id="page-title">
-         			 		<?php print $title; ?>
-        				</h1>
-     				 <?php endif; ?>
-      		<?php print render($title_suffix); ?>
-      		<?php if ($tabs): ?>
-        			<div class="tabs">
-          				<?php print render($tabs); ?>
-        			</div>
-      		<?php endif; ?>
-      		<?php print render($page['help']); ?>
-      		<?php if ($action_links): ?>
-        			<ul class="action-links">
-          				<?php print render($action_links); ?>
-        			</ul>
-      		<?php endif; ?>
-		      <?php if ($page['content']) : ?><div class="content-middle"><?php print render ($page['content']); ?></div>
-			<?php endif; ?>
-			<?php if ($page['content_bottom']) : ?><div class="content-bottom"><?php print render ($page['content_bottom']); ?></div>
-			<?php endif; ?>
 
-</div> <!-- end content -->
+    <div id="content">
+      <a id="main-content"></a>
+      <?php if ($page['content_top']): ?><div class="content-top"><?php print render($page['content_top']); ?></div>
+      <?php endif; ?>
+      <?php if (!$is_front) print $breadcrumb; ?>
+      <?php if ($show_messages) { print $messages; } ?>
+      <?php print render($title_prefix); ?>
+      <?php if ($title): ?>
+        <h1 class="title" id="page-title">
+          <?php print $title; ?>
+        </h1>
+       <?php endif; ?>
+      <?php print render($title_suffix); ?>
+      <?php if ($tabs): ?>
+        <div class="tabs">
+          <?php print render($tabs); ?>
+        </div>
+      <?php endif; ?>
+      <?php print render($page['help']); ?>
+      <?php if ($action_links): ?>
+        <ul class="action-links">
+          <?php print render($action_links); ?>
+        </ul>
+      <?php endif; ?>
+      <?php if ($page['content']): ?><div class="content-middle"><?php print render($page['content']); ?></div>
+      <?php endif; ?>
+      <?php if ($page['content_bottom']): ?><div class="content-bottom"><?php print render($page['content_bottom']); ?></div>
+      <?php endif; ?>
+    </div> <!-- end content -->
 
     <?php if ($page['sidebar_second']): ?>
       <div id="sidebar-right" class="column sidebar"><div class="section">
         <?php print render($page['sidebar_second']); ?>
       </div></div> <!-- end sidebar-second -->
     <?php endif; ?>
-<div style="clear:both"></div>
-</div> <!-- end wrapper -->
-
+    <div style="clear:both"></div>
+  </div> <!-- end wrapper -->
 
-<?php if($page['bottom_first'] || $page['bottom_middle'] || $page['bottom_last']) : ?>
+  <?php if ($page['bottom_first'] || $page['bottom_middle'] || $page['bottom_last']): ?>
     <div style="clear:both"></div>
     <div id="bottom-teaser" class="in<?php print (bool) $page['bottom_first'] + (bool) $page['bottom_middle'] + (bool) $page['bottom_last']; ?>">
-          <?php if($page['bottom_first']) : ?>
-          <div class="column A">
-            <?php print render ($page['bottom_first']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_middle']) : ?>
-          <div class="column B">
-            <?php print render ($page['bottom_middle']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_last']) : ?>
-          <div class="column C">
-            <?php print render ($page['bottom_last']); ?>
-          </div>
-          <?php endif; ?>
-      <div style="clear:both"></div>
-    </div> <!-- end bottom first etc. -->
+    <?php if ($page['bottom_first']): ?>
+      <div class="column A">
+        <?php print render($page['bottom_first']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_middle']): ?>
+      <div class="column B">
+        <?php print render($page['bottom_middle']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_last']): ?>
+      <div class="column C">
+        <?php print render($page['bottom_last']); ?>
+      </div>
     <?php endif; ?>
+    <div style="clear:both"></div>
+  </div> <!-- end bottom first etc. -->
+  <?php endif; ?>
 
-
- <?php if($page['bottom_1'] || $page['bottom_2'] || $page['bottom_3'] || $page['bottom_4']) : ?>
+  <?php if ($page['bottom_1'] || $page['bottom_2'] || $page['bottom_3'] || $page['bottom_4']): ?>
     <div style="clear:both"></div><!-- Do not touch -->
     <div id="bottom-wrapper" class="in<?php print (bool) $page['bottom_1'] + (bool) $page['bottom_2'] + (bool) $page['bottom_3'] + (bool) $page['bottom_4']; ?>">
-          <?php if($page['bottom_1']) : ?>
-          <div class="column A">
-            <?php print render ($page['bottom_1']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_2']) : ?>
-          <div class="column B">
-            <?php print render ($page['bottom_2']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_3']) : ?>
-          <div class="column C">
-            <?php print render ($page['bottom_3']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_4']) : ?>
-          <div class="column D">
-            <?php print render ($page['bottom_4']); ?>
-          </div>
-          <?php endif; ?>
-      <div style="clear:both"></div>
-    </div><!-- end bottom -->
+    <?php if ($page['bottom_1']): ?>
+      <div class="column A">
+        <?php print render($page['bottom_1']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_2']): ?>
+      <div class="column B">
+        <?php print render($page['bottom_2']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_3']): ?>
+      <div class="column C">
+        <?php print render($page['bottom_3']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_4']): ?>
+      <div class="column D">
+        <?php print render($page['bottom_4']); ?>
+      </div>
     <?php endif; ?>
+    <div style="clear:both"></div>
+  </div><!-- end bottom -->
+  <?php endif; ?>
 
-<div style="clear:both"></div>
-<div id="footer-wrapper">
-<?php if($page['footer']): ?>
-<div id="footer">
- <?php print render ($page['footer']); ?>
-</div>
-<?php endif; ?>
-<?php if($secondary_menu) : ?>
-<div id="subnav-wrapper">
-<?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'subnav', 'class' => array('links', 'clearfix')))); ?>
-</div>
-<?php endif; ?>
-</div> <!-- end footer wrapper -->
+  <div style="clear:both"></div>
+  <div id="footer-wrapper">
+    <?php if ($page['footer']): ?>
+      <div id="footer">
+        <?php print render($page['footer']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($secondary_menu): ?>
+      <div id="subnav-wrapper">
+        <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'subnav', 'class' => array('links', 'clearfix')))); ?>
+      </div>
+    <?php endif; ?>
+  </div> <!-- end footer wrapper -->
 
-<div style="clear:both"></div>
-<div id="notice"><p>Theme by <a href="http://www.danetsoft.com">Danetsoft</a> and <a href="http://www.danpros.com">Danang Probo Sayekti</a> inspired by <a href="http://www.maksimer.no">Maksimer</a></p></div>
-</div>
\ No newline at end of file
+  <div style="clear:both"></div>
+  <div id="notice"><p>Theme by <a href="http://www.danetsoft.com">Danetsoft</a> and <a href="http://www.danpros.com">Danang Probo Sayekti</a> inspired by <a href="http://www.maksimer.no">Maksimer</a></p></div>
+</div>
Index: style.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/style.css,v
retrieving revision 1.44.2.16
diff -u -p -r1.44.2.16 style.css
--- style.css	6 Jan 2011 09:45:33 -0000	1.44.2.16
+++ style.css	14 Jan 2011 20:45:57 -0000
@@ -60,7 +60,7 @@ margin-left: 10px;
 
 code, tt, pre {
 background-color:#EDF1F3;
-font-family:"Bitstream Vera Sans Mono",Monaco,"Lucida Console",monospace;
+font-family:"Bitstream Vera Sans Mono", Monaco, "Lucida Console", monospace;
 font-size:0.9em;
 line-height:1.2em;
 }
@@ -74,7 +74,7 @@ font-size: 1.6em;
 
 h2 {
 font-size: 1.5em;
-  
+
 }
 
 h3 {
@@ -93,7 +93,7 @@ h6 {
 font-size: 1em;
 }
 
-h1,h2,h3,h4,h5,h6 {
+h1, h2, h3, h4, h5, h6 {
 padding:0;
 margin:0;
 }
@@ -145,7 +145,7 @@ margin-top: 25px;
 }
 
 .site-name {
-display: inline; 
+display: inline;
 font-weight: bold;
 font-size: 25px;
 margin-left: 15px;
@@ -155,7 +155,7 @@ font-style: italic;
 }
 
 .site-slogan {
-display: inline;                       
+display: inline;
 font-weight: bold;
 position: relative;
 margin-left: 10px;
@@ -248,7 +248,7 @@ padding:0;
 -------------------------------------------------------------- */
 
 #superfish {
-height:35px; 
+height:35px;
 float:left;
 }
 
@@ -370,10 +370,10 @@ top: 0px;
 outline:0;
 }
 
-#superfish .menu li:hover, 
+#superfish .menu li:hover,
 #superfish .menu li.sfHover,
-#superfish .menu a:focus, 
-#superfish .menu a:hover, 
+#superfish .menu a:focus,
+#superfish .menu a:hover,
 #superfish .menu a:active {
 z-index:10;
 }
@@ -409,7 +409,7 @@ text-indent:-999em;
 overflow:hidden;
 background:url(images/arrows-ffffff.png) no-repeat -10px -100px;
 }
-a > .sf-sub-indicator { 
+a > .sf-sub-indicator {
 top:.8em;
 background-position: 0 -100px;
 }
@@ -433,7 +433,7 @@ background-position: -10px 0;
 }
 
 #superfish .sf-shadow ul {
-background:	url(images/shadow.png) no-repeat bottom right;
+background: url(images/shadow.png) no-repeat bottom right;
 padding: 0 8px 9px 0;
 }
 
@@ -592,14 +592,14 @@ float: left;
 #layout-type-1 #sidebar-left {
 width: 26%;
 float: left;
-font-size:12px;	
+font-size:12px;
 }
 
 #layout-type-2 #sidebar-left {
 width: 21%;
 float: left;
 margin-right: 2%;
-font-size:12px;	
+font-size:12px;
 }
 
 .one-sidebar #content{
@@ -616,13 +616,13 @@ float: left;
 #layout-type-1 #sidebar-right {
 width: 26%;
 float: right;
-font-size:12px;	      
+font-size:12px;
 }
 
 #layout-type-2 #sidebar-right {
 width: 21%;
 float: right;
-font-size:12px;	      
+font-size:12px;
 }
 
 #sidebar-left h2.block-title,
@@ -1320,31 +1320,31 @@ margin-top:10px;
 /* Login + Register + RSS
 -------------------------------------------------------------- */
 
-#authorize { 
+#authorize {
 float: right;
 margin: 5px 10px 0;
 }
 
-#authorize ul { 
+#authorize ul {
 display: inline;
 }
 
-#authorize ul li { 
-margin: 0 10px 0 0; 
-padding: 0 0 0 10px; 
-display: inline; 
-list-style: none;  
+#authorize ul li {
+margin: 0 10px 0 0;
+padding: 0 0 0 10px;
+display: inline;
+list-style: none;
 border-left: 1px #5a5a5a solid;
 background-image: none;
 }
 
-#authorize ul li.first { 
+#authorize ul li.first {
 border: 0;
 }
 
-#authorize ul li, #authorize ul li a { 
-font-size: 12px; 
-line-height: 13px; 
+#authorize ul li, #authorize ul li a {
+font-size: 12px;
+line-height: 13px;
 }
 
 .feed-wrapper {
@@ -1483,20 +1483,20 @@ color: #cc6600;
 text-align:right;
 }
 
-#subnav-wrapper ul { 
+#subnav-wrapper ul {
 display: inline;
 }
 
-#subnav-wrapper ul li {  
-display: inline; 
-list-style: none;  
+#subnav-wrapper ul li {
+display: inline;
+list-style: none;
 background-image: none;
 padding-left: 5px;
 }
 
-#subnav-wrapper ul li,#subnav-wrapper ul li a { 
-font-size: 12px; 
-line-height: 13px; 
+#subnav-wrapper ul li, #subnav-wrapper ul li a {
+font-size: 12px;
+line-height: 13px;
 }
 
 /* Overlay
@@ -1512,4 +1512,4 @@ width:98%;
 
 .theme-info ul {
 list-style-image:none;
-}
\ No newline at end of file
+}
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/template.php,v
retrieving revision 1.10.4.3
diff -u -p -r1.10.4.3 template.php
--- template.php	14 Dec 2010 03:30:39 -0000	1.10.4.3
+++ template.php	14 Jan 2011 20:45:57 -0000
@@ -1,21 +1,21 @@
 <?php
 // $Id: template.php,v 1.10.4.3 2010/12/14 03:30:39 danprobo Exp $
 function danland_page_class($sidebar_first, $sidebar_second) {
-	if ($sidebar_first && $sidebar_second) {
-		$id = 'layout-type-2';	
-	}
-	else if ($sidebar_first || $sidebar_second) {
-		$id = 'layout-type-1';
-	}
+  if ($sidebar_first && $sidebar_second) {
+    $id = 'layout-type-2';
+  }
+  else if ($sidebar_first || $sidebar_second) {
+    $id = 'layout-type-1';
+  }
 
-	if(isset($id)) {
-		print ' id="'. $id .'"';
-	}
+  if (isset($id)) {
+    print ' id="'. $id .'"';
+  }
 }
 
 function danland_preprocess_html(&$vars) {
   // Add conditional CSS for IE6.
-drupal_add_css(path_to_theme() . '/style.ie6.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'IE 6', '!IE' => FALSE), 'preprocess' => FALSE));
+  drupal_add_css(path_to_theme() . '/style.ie6.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'IE 6', '!IE' => FALSE), 'preprocess' => FALSE));
 }
 
 function danland_preprocess_maintenance_page(&$variables) {
@@ -28,4 +28,4 @@ function danland_preprocess_maintenance_
 
 if (drupal_is_front_page()) {
   drupal_add_js(drupal_get_path('theme', 'danland') . '/scripts/jquery.cycle.all.js');
-}
\ No newline at end of file
+}
Index: danblog/danblog.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/danblog/danblog.css,v
retrieving revision 1.11.2.2
diff -u -p -r1.11.2.2 danblog.css
--- danblog/danblog.css	19 Nov 2010 14:42:44 -0000	1.11.2.2
+++ danblog/danblog.css	14 Jan 2011 20:45:57 -0000
@@ -1,6 +1,6 @@
 /* $Id: danblog.css,v 1.11.2.2 2010/11/19 14:42:44 danprobo Exp $ */
 
-/* Put your custom css and css overrides in this file */ 
+/* Put your custom css and css overrides in this file */
 
 body {
 font-size: 84%;
@@ -11,7 +11,7 @@ padding: 0;
 line-height: 1.5em;
 }
 
-h1,h2,h3,h4,h5,h6 {
+h1, h2, h3, h4, h5, h6 {
 font-family: Arial, Helvetica, sans-serif;
 }
 
@@ -85,7 +85,7 @@ color: #005a8c;/*#e87e17*/
 #mission-wrapper {
 width:950px;
 margin:0 auto;
-} 
+}
 
 #mission {
 font-size:1.4em;
Index: danblog/danblog.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/danblog/danblog.info,v
retrieving revision 1.4.2.3
diff -u -p -r1.4.2.3 danblog.info
--- danblog/danblog.info	25 Nov 2010 01:16:24 -0000	1.4.2.3
+++ danblog/danblog.info	14 Jan 2011 20:45:57 -0000
@@ -27,4 +27,4 @@ regions[bottom_3] = Bottom 3
 regions[bottom_4] = Bottom 4
 regions[footer] = Footer
 regions[page_bottom] = Page bottom
-core = "7.x"
\ No newline at end of file
+core = "7.x"
Index: danblog/page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/danblog/page.tpl.php,v
retrieving revision 1.8.2.4
diff -u -p -r1.8.2.4 page.tpl.php
--- danblog/page.tpl.php	19 Nov 2010 14:42:44 -0000	1.8.2.4
+++ danblog/page.tpl.php	14 Jan 2011 20:45:57 -0000
@@ -2,97 +2,97 @@
 // $Id: page.tpl.php,v 1.8.2.4 2010/11/19 14:42:44 danprobo Exp $
 ?>
 <div <?php print danland_page_class($page['sidebar_first'], $page['sidebar_second']); ?>>
-<div id="header">
-<div id="header-wrapper">
-	<?php if ($logo): ?> 
-		<div id="logo-wrapper">
-			<div class="logo">
-				<a href="<?php print $base_path ?>" title="<?php print t('Home') ?>"><img src="<?php print $logo ?>" alt="<?php print t('Home') ?>" /></a>
-			</div>
-		</div><!-- end logo wrapper -->
-	<?php endif; ?>
-	<?php if ($site_name || $site_slogan) : ?>
-		<div id="branding-wrapper">
-			<?php if ($site_name) : ?>
-				<?php if ($is_front) : ?>
-					<h1 class="site-name"><a href="<?php print $base_path ?>" title="<?php print $site_name ?>"><?php print $site_name ?></a></h1>
-				<?php endif; ?>
-				<?php if (!$is_front) : ?>
-					<h2 class="site-name"><a href="<?php print $base_path ?>" title="<?php print $site_name ?>"><?php print $site_name ?></a></h2>
-				<?php endif; ?>
-			<?php endif; ?>
-			<?php if ($site_slogan) : ?>
-				<div class='site-slogan'><?php print $site_slogan; ?></div>
-			<?php endif; ?>
-        	</div><!-- end branding wrapper -->
-	<?php endif; ?>
-	
-	<?php if ($page['search_box']): ?>
-		<div id="search-box">
-			<?php print render ($page['search_box']); ?>
-		</div><!-- /search-box -->
-	<?php endif; ?>
-
-	<?php if ($feed_icons): ?>
-		<div class="feed-wrapper">
-			<?php print $feed_icons; ?>
-		</div>
-	<?php endif; ?>
-
-	<?php if (!$is_admin): ?>
-		<div id="authorize">
-      		      <ul><?php global $user; if ($user->uid != 0) { print '<li class="first">' .t('Logged in as '). '<a href="' .url('user/'.$user->uid). '">' .$user->name. '</a></li>'; print '<li><a href="' .url('user/logout'). '">' .t('Logout'). '</a></li>'; } else { print '<li class="first"><a href="' .url('user'). '">' .t('Login'). '</a></li>'; print '<li><a href="' .url('user/register'). '">' .t('Register'). '</a></li>'; } ?></ul>
-		</div>
-	<?php endif; ?>
-
-      </div><!-- end header-wrapper -->
-</div> <!-- /header -->
-<div style="clear:both"></div>
-
-<div id="menu">
-<div id="rounded-menu-left"></div>
- <?php if ($main_menu || $page['superfish_menu']): ?>
-      <div id="<?php print $main_menu ? 'nav' : 'superfish' ; ?>">
-        <?php 
-					     if ($main_menu) {
-		          print theme('links__system_main_menu', array('links' => $main_menu));  
-				      }
-				      elseif (!empty($page['superfish_menu'])) {
-				        print render ($page['superfish_menu']);
-				      }
+  <div id="header">
+    <div id="header-wrapper">
+      <?php if ($logo): ?>
+        <div id="logo-wrapper">
+          <div class="logo">
+            <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" /></a>
+          </div>
+        </div><!-- end logo wrapper -->
+      <?php endif; ?>
+      <?php if ($site_name || $site_slogan): ?>
+        <div id="branding-wrapper">
+          <?php if ($site_name): ?>
+            <?php if ($is_front): ?>
+              <h1 class="site-name"><a href="<?php print $base_path; ?>" title="<?php print $site_name; ?>"><?php print $site_name; ?></a></h1>
+             <?php endif; ?>
+             <?php if (!$is_front): ?>
+               <h2 class="site-name"><a href="<?php print $base_path; ?>" title="<?php print $site_name; ?>"><?php print $site_name; ?></a></h2>
+             <?php endif; ?>
+          <?php endif; ?>
+          <?php if ($site_slogan): ?>
+            <div class='site-slogan'><?php print $site_slogan; ?></div>
+          <?php endif; ?>
+        </div><!-- end branding wrapper -->
+      <?php endif; ?>
+
+      <?php if ($page['search_box']): ?>
+        <div id="search-box">
+          <?php print render($page['search_box']); ?>
+        </div><!-- /search-box -->
+      <?php endif; ?>
+
+      <?php if ($feed_icons): ?>
+        <div class="feed-wrapper">
+          <?php print $feed_icons; ?>
+        </div>
+      <?php endif; ?>
+
+      <?php if (!$is_admin): ?>
+        <div id="authorize">
+          <ul><?php global $user; if ($user->uid != 0) { print '<li class="first">' .t('Logged in as '). '<a href="' .url('user/'.$user->uid). '">' .$user->name. '</a></li>'; print '<li><a href="' .url('user/logout'). '">' .t('Logout'). '</a></li>'; } else { print '<li class="first"><a href="' .url('user'). '">' .t('Login'). '</a></li>'; print '<li><a href="' .url('user/register'). '">' .t('Register'). '</a></li>'; } ?></ul>
+        </div>
+      <?php endif; ?>
+
+    </div><!-- end header-wrapper -->
+  </div> <!-- /header -->
+  <div style="clear:both"></div>
+
+  <div id="menu">
+    <div id="rounded-menu-left"></div>
+    <?php if ($main_menu || $page['superfish_menu']): ?>
+      <div id="<?php print $main_menu ? 'nav' : 'superfish'; ?>">
+        <?php
+          if ($main_menu) {
+            print theme('links__system_main_menu', array('links' => $main_menu));
+          }
+          elseif (!empty($page['superfish_menu'])) {
+            print render($page['superfish_menu']);
+          }
         ?>
       </div> <!-- end primary -->
     <?php endif; ?>
-<div id="rounded-menu-right"></div>
-</div> <!-- end menu -->
-<div style="clear:both"></div>
+    <div id="rounded-menu-right"></div>
+  </div> <!-- end menu -->
+  <div style="clear:both"></div>
 
-<?php if ($page['highlighted']): ?><div id="mission-wrapper"><div id="mission"><?php print render ($page['highlighted']); ?></div></div><?php endif; ?>
+  <?php if ($page['highlighted']): ?><div id="mission-wrapper"><div id="mission"><?php print render($page['highlighted']); ?></div></div><?php endif; ?>
 
- <?php if($page['preface_first'] || $page['preface_middle'] || $page['preface_last']) : ?>
+  <?php if ($page['preface_first'] || $page['preface_middle'] || $page['preface_last']): ?>
     <div style="clear:both"></div>
     <div id="preface-wrapper" class="in<?php print (bool) $page['preface_first'] + (bool) $page['preface_middle'] + (bool) $page['preface_last']; ?>">
-          <?php if($page['preface_first']) : ?>
-          <div class="column A">
-            <?php print render ($page['preface_first']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['preface_middle']) : ?>
-          <div class="column B">
-            <?php print render ($page['preface_middle']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['preface_last']) : ?>
-          <div class="column C">
-            <?php print render ($page['preface_last']); ?>
-          </div>
-          <?php endif; ?>
-      <div style="clear:both"></div>
+    <?php if ($page['preface_first']): ?>
+    <div class="column A">
+      <?php print render($page['preface_first']); ?>
+    </div>
+    <?php endif; ?>
+    <?php if ($page['preface_middle']): ?>
+    <div class="column B">
+      <?php print render($page['preface_middle']); ?>
+    </div>
+    <?php endif; ?>
+    <?php if ($page['preface_last']): ?>
+    <div class="column C">
+      <?php print render($page['preface_last']); ?>
     </div>
     <?php endif; ?>
+    <div style="clear:both"></div>
+  </div>
+  <?php endif; ?>
 
-<div style="clear:both"></div>
-<div id="wrapper">
+  <div style="clear:both"></div>
+  <div id="wrapper">
 
     <?php if ($page['sidebar_first']): ?>
       <div id="sidebar-left" class="column sidebar"><div class="section">
@@ -100,110 +100,107 @@
       </div></div> <!-- end sidebar-first -->
     <?php endif; ?>
 
-<div id="content">
-			<a id="main-content"></a>
-			<?php if ($page['content_top']) : ?><div class="content-top"><?php print render ($page['content_top']); ?></div>
-			<?php endif; ?>
-			<?php if (!$is_front) print $breadcrumb; ?>
-			<?php if ($show_messages) { print $messages; }; ?>
-      		<?php print render($title_prefix); ?>
-      			<?php if ($title): ?>
-        				<h1 class="title" id="page-title">
-         			 		<?php print $title; ?>
-        				</h1>
-     				 <?php endif; ?>
-      		<?php print render($title_suffix); ?>
-      		<?php if ($tabs): ?>
-        			<div class="tabs">
-          				<?php print render($tabs); ?>
-        			</div>
-      		<?php endif; ?>
-      		<?php print render($page['help']); ?>
-      		<?php if ($action_links): ?>
-        			<ul class="action-links">
-          				<?php print render($action_links); ?>
-        			</ul>
-      		<?php endif; ?>
-		      <?php if ($page['content']) : ?><div class="content-middle"><?php print render ($page['content']); ?></div>
-			<?php endif; ?>
-			<?php if ($page['content_bottom']) : ?><div class="content-bottom"><?php print render ($page['content_bottom']); ?></div>
-			<?php endif; ?>
-
-</div> <!-- end content -->
+    <div id="content">
+      <a id="main-content"></a>
+      <?php if ($page['content_top']): ?><div class="content-top"><?php print render($page['content_top']); ?></div>
+      <?php endif; ?>
+      <?php if (!$is_front) print $breadcrumb; ?>
+      <?php if ($show_messages) { print $messages; } ?>
+      <?php print render($title_prefix); ?>
+      <?php if ($title): ?>
+        <h1 class="title" id="page-title">
+          <?php print $title; ?>
+        </h1>
+       <?php endif; ?>
+      <?php print render($title_suffix); ?>
+      <?php if ($tabs): ?>
+        <div class="tabs">
+          <?php print render($tabs); ?>
+        </div>
+      <?php endif; ?>
+      <?php print render($page['help']); ?>
+      <?php if ($action_links): ?>
+        <ul class="action-links">
+          <?php print render($action_links); ?>
+        </ul>
+      <?php endif; ?>
+      <?php if ($page['content']): ?><div class="content-middle"><?php print render($page['content']); ?></div>
+      <?php endif; ?>
+      <?php if ($page['content_bottom']): ?><div class="content-bottom"><?php print render($page['content_bottom']); ?></div>
+      <?php endif; ?>
+    </div> <!-- end content -->
 
     <?php if ($page['sidebar_second']): ?>
       <div id="sidebar-right" class="column sidebar"><div class="section">
         <?php print render($page['sidebar_second']); ?>
       </div></div> <!-- end sidebar-second -->
     <?php endif; ?>
-<div style="clear:both"></div>
-</div> <!-- end wrapper -->
-
+    <div style="clear:both"></div>
+  </div> <!-- end wrapper -->
 
-<?php if($page['bottom_first'] || $page['bottom_middle'] || $page['bottom_last']) : ?>
+  <?php if ($page['bottom_first'] || $page['bottom_middle'] || $page['bottom_last']): ?>
     <div style="clear:both"></div>
     <div id="bottom-teaser" class="in<?php print (bool) $page['bottom_first'] + (bool) $page['bottom_middle'] + (bool) $page['bottom_last']; ?>">
-          <?php if($page['bottom_first']) : ?>
-          <div class="column A">
-            <?php print render ($page['bottom_first']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_middle']) : ?>
-          <div class="column B">
-            <?php print render ($page['bottom_middle']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_last']) : ?>
-          <div class="column C">
-            <?php print render ($page['bottom_last']); ?>
-          </div>
-          <?php endif; ?>
-      <div style="clear:both"></div>
-    </div> <!-- end bottom first etc. -->
+    <?php if ($page['bottom_first']): ?>
+      <div class="column A">
+        <?php print render($page['bottom_first']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_middle']): ?>
+      <div class="column B">
+        <?php print render($page['bottom_middle']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_last']): ?>
+      <div class="column C">
+        <?php print render($page['bottom_last']); ?>
+      </div>
     <?php endif; ?>
+    <div style="clear:both"></div>
+  </div> <!-- end bottom first etc. -->
+  <?php endif; ?>
 
-
- <?php if($page['bottom_1'] || $page['bottom_2'] || $page['bottom_3'] || $page['bottom_4']) : ?>
+  <?php if ($page['bottom_1'] || $page['bottom_2'] || $page['bottom_3'] || $page['bottom_4']): ?>
     <div style="clear:both"></div><!-- Do not touch -->
     <div id="bottom-wrapper" class="in<?php print (bool) $page['bottom_1'] + (bool) $page['bottom_2'] + (bool) $page['bottom_3'] + (bool) $page['bottom_4']; ?>">
-          <?php if($page['bottom_1']) : ?>
-          <div class="column A">
-            <?php print render ($page['bottom_1']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_2']) : ?>
-          <div class="column B">
-            <?php print render ($page['bottom_2']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_3']) : ?>
-          <div class="column C">
-            <?php print render ($page['bottom_3']); ?>
-          </div>
-          <?php endif; ?>
-          <?php if($page['bottom_4']) : ?>
-          <div class="column D">
-            <?php print render ($page['bottom_4']); ?>
-          </div>
-          <?php endif; ?>
-      <div style="clear:both"></div>
-    </div><!-- end bottom -->
+    <?php if ($page['bottom_1']): ?>
+      <div class="column A">
+        <?php print render($page['bottom_1']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_2']): ?>
+      <div class="column B">
+        <?php print render($page['bottom_2']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_3']): ?>
+      <div class="column C">
+        <?php print render($page['bottom_3']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($page['bottom_4']): ?>
+      <div class="column D">
+        <?php print render($page['bottom_4']); ?>
+      </div>
+    <?php endif; ?>
+    <div style="clear:both"></div>
+  </div><!-- end bottom -->
+  <?php endif; ?>
+
+  <div style="clear:both"></div>
+  <div id="footer-wrapper">
+    <?php if ($page['footer']): ?>
+      <div id="footer">
+        <?php print render($page['footer']); ?>
+      </div>
+    <?php endif; ?>
+    <?php if ($secondary_menu): ?>
+      <div id="subnav-wrapper">
+        <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'subnav', 'class' => array('links', 'clearfix')))); ?>
+      </div>
     <?php endif; ?>
+  </div> <!-- end footer wrapper -->
 
-<div style="clear:both"></div>
-<div id="footer-wrapper">
-<?php if ($page['footer']): ?>
-<div id="footer">
- <?php print render ($page['footer']); ?>
+  <div style="clear:both"></div>
+  <div id="notice"><p>Theme by <a href="http://www.danetsoft.com">Danetsoft</a> and <a href="http://www.danpros.com">Danang Probo Sayekti</a> inspired by <a href="http://www.maksimer.no">Maksimer</a></p></div>
 </div>
-<?php endif; ?>
-<?php if($secondary_menu) : ?>
-<div id="subnav-wrapper">
-<?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'subnav', 'class' => array('links', 'clearfix')))); ?>
-</div>
-<?php endif; ?>
-</div> <!-- end footer wrapper -->
-
-<div style="clear:both"></div>
-<div id="notice"><p>Theme by <a href="http://www.danetsoft.com">Danetsoft</a> and <a href="http://www.danpros.com">Danang Probo Sayekti</a> inspired by <a href="http://www.maksimer.no">Maksimer</a></p></div>
-</div>
\ No newline at end of file
Index: scripts/hoverIntent.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/scripts/hoverIntent.js,v
retrieving revision 1.1
diff -u -p -r1.1 hoverIntent.js
--- scripts/hoverIntent.js	19 Jul 2010 22:25:16 -0000	1.1
+++ scripts/hoverIntent.js	14 Jan 2011 20:45:57 -0000
@@ -81,5 +81,5 @@
 		// bind the function to the two event listeners
 		return this.mouseover(handleHover).mouseout(handleHover);
 	};
-	
-})(jQuery);
\ No newline at end of file
+
+})(jQuery);
Index: scripts/jquery.cycle.all.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/scripts/jquery.cycle.all.js,v
retrieving revision 1.1.4.1
diff -u -p -r1.1.4.1 jquery.cycle.all.js
--- scripts/jquery.cycle.all.js	11 Nov 2010 13:58:25 -0000	1.1.4.1
+++ scripts/jquery.cycle.all.js	14 Jan 2011 20:45:57 -0000
@@ -29,7 +29,7 @@ if ($.support == undefined) {
 function debug(s) {
 	if ($.fn.cycle.debug)
 		log(s);
-}		
+}
 function log() {
 	if (window.console && window.console.log)
 		window.console.log('[cycle] ' + Array.prototype.join.call(arguments,' '));
@@ -69,7 +69,7 @@ $.fn.cycle = function(options, arg2) {
 			return;
 
 		opts.updateActivePagerLink = opts.updateActivePagerLink || $.fn.cycle.updateActivePagerLink;
-		
+
 		// stop existing slideshow for this container (if there is one)
 		if (this.cycleTimeout)
 			clearTimeout(this.cycleTimeout);
@@ -169,7 +169,7 @@ function handleArguments(cont, options, 
 		return false;
 	}
 	return options;
-	
+
 	function checkInstantResume(isPaused, arg2, cont) {
 		if (!isPaused && arg2 === true) { // resume now!
 			var options = $(cont).data('cycle.opts');
@@ -199,7 +199,7 @@ function destroy(opts) {
 		$(opts.next).unbind(opts.prevNextEvent);
 	if (opts.prev)
 		$(opts.prev).unbind(opts.prevNextEvent);
-	
+
 	if (opts.pager || opts.pagerAnchorBuilder)
 		$.each(opts.pagerAnchors || [], function() {
 			this.unbind().remove();
@@ -351,7 +351,7 @@ function buildOptions($cont, $slides, el
 			opts.speed = $.fx.speeds[opts.speed] || parseInt(opts.speed);
 		if (!opts.sync)
 			opts.speed = opts.speed / 2;
-		
+
 		var buffer = opts.fx == 'shuffle' ? 500 : 250;
 		while((opts.timeout - opts.speed) < buffer) // sanitize timeout
 			opts.timeout += opts.speed;
@@ -589,7 +589,7 @@ function go(els, opts, manual, fwd) {
 		};
 
 		debug('tx firing; currSlide: ' + opts.currSlide + '; nextSlide: ' + opts.nextSlide);
-		
+
 		// get ready to perform the transition
 		opts.busy = 1;
 		if (opts.fxFn) // fx function provided?
@@ -619,7 +619,7 @@ function go(els, opts, manual, fwd) {
 	}
 	if (changed && opts.pager)
 		opts.updateActivePagerLink(opts.pager, opts.currSlide, opts.activePagerClass);
-	
+
 	// stage the next transition
 	var ms = 0;
 	if (opts.timeout && !opts.continuous)
@@ -710,7 +710,7 @@ $.fn.cycle.createPagerAnchor = function(
 	}
 	else
 		a = '<a href="#">'+(i+1)+'</a>';
-		
+
 	if (!a)
 		return;
 	var $a = $(a);
@@ -746,10 +746,10 @@ $.fn.cycle.createPagerAnchor = function(
 		go(els,opts,1,opts.currSlide < i); // trigger the trans
 //		return false; // <== allow bubble
 	});
-	
+
 	if ( ! /^click/.test(opts.pagerEvent) && !opts.allowPagerClickBubble)
 		$a.bind('click.cycle', function(){return false;}); // suppress click
-	
+
 	if (opts.pauseOnPagerHover)
 		$a.hover(function() { opts.$cont[0].cyclePause++; }, function() { opts.$cont[0].cyclePause--; } );
 };
Index: scripts/superfish.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/danland/scripts/superfish.js,v
retrieving revision 1.1.4.1
diff -u -p -r1.1.4.1 superfish.js
--- scripts/superfish.js	11 Nov 2010 13:58:25 -0000	1.1.4.1
+++ scripts/superfish.js	14 Jan 2011 20:45:57 -0000
@@ -11,12 +11,12 @@
  */
 
  jQuery(document).ready(function($) {
-    $("#superfish ul.menu").superfish({ 
-            delay:       100,                           
-            animation:   {opacity:'show',height:'show'},  
-            speed:       'fast',                          
-            autoArrows:  true,                           
-            dropShadows: true                   
+    $("#superfish ul.menu").superfish({
+            delay:       100,
+            animation:   {opacity:'show',height:'show'},
+            speed:       'fast',
+            autoArrows:  true,
+            dropShadows: true
         });
   });
 
@@ -38,7 +38,7 @@
 					o.retainPath=($.inArray($$[0],o.$path)>-1);
 					$$.hideSuperfishUl();
 					if (o.$path.length && $$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path);}
-				},o.delay);	
+				},o.delay);
 			},
 			getMenu = function($menu){
 				var menu = $menu.parents(['ul.',c.menuClass,':first'].join(''))[0];
@@ -46,7 +46,7 @@
 				return menu;
 			},
 			addArrow = function($a){ $a.addClass(c.anchorClass).append($arrow.clone()); };
-			
+
 		return this.each(function() {
 			var s = this.serial = sf.o.length;
 			var o = $.extend({},sf.defaults,op);
@@ -55,20 +55,20 @@
 					.filter('li:has(ul)').removeClass(o.pathClass);
 			});
 			sf.o[s] = sf.op = o;
-			
+
 			$('li:has(ul)',this)[($.fn.hoverIntent && !o.disableHI) ? 'hoverIntent' : 'hover'](over,out).each(function() {
 				if (o.autoArrows) addArrow( $('>a:first-child',this) );
 			})
 			.not('.'+c.bcClass)
 				.hideSuperfishUl();
-			
+
 			var $a = $('a',this);
 			$a.each(function(i){
 				var $li = $a.eq(i).parents('li');
 				$a.eq(i).focus(function(){over.call($li);}).blur(function(){out.call($li);});
 			});
 			o.onInit.call(this);
-			
+
 		}).each(function() {
 			var menuClasses = [c.menuClass];
 			if (sf.op.dropShadows  && !($.browser.msie && $.browser.version < 7)) menuClasses.push(c.shadowClass);