Index: aurora.info
===================================================================
RCS file: aurora.info
diff -N aurora.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ aurora.info	6 Jul 2008 11:32:06 -0000
@@ -0,0 +1,25 @@
+; $Id$
+name = Aurora
+description = Tableless, CSS-based blue theme.
+version = VERSION
+screenshot = screenshot.png
+features[] = logo
+features[] = name
+features[] = slogan
+features[] = mission
+features[] = node_user_picture
+features[] = comment_user_picture
+features[] = search
+features[] = favicon
+features[] = primary_links
+features[] = secondary_links
+core = 6.x
+engine = phptemplate
+regions[left] = Left sidebar
+regions[right] = Right sidebar
+regions[content_top] = Content top
+regions[content_bottom] = Content bottom
+regions[header] = Header
+regions[footer] = Footer
+stylesheets[all][] = style.css
+stylesheets[all][] = layout.css
Index: block.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/aurora/block.tpl.php,v
retrieving revision 1.1
diff -u -p -r1.1 block.tpl.php
--- block.tpl.php	16 Mar 2007 06:00:44 -0000	1.1
+++ block.tpl.php	6 Jul 2008 11:32:06 -0000
@@ -1,6 +1,5 @@
 <div class="block block-<?php print $block->module; ?>" id="block-<?php print $block->module; ?>-<?php print $block->delta; ?>">
   <div class="blockinner">
-
     <?php if ($block->subject) { ?><h2 class="title"> <?php print $block->subject; ?> </h2><?php } ?>
 
     <div class="content">
Index: comment.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/aurora/comment.tpl.php,v
retrieving revision 1.1
diff -u -p -r1.1 comment.tpl.php
--- comment.tpl.php	16 Mar 2007 06:00:44 -0000	1.1
+++ comment.tpl.php	6 Jul 2008 11:32:06 -0000
@@ -4,5 +4,10 @@
 <?php if ($picture) print $picture; ?>
     <div class="submitted"><?php print t('On ') . format_date($comment->timestamp, 'custom', 'F jS, Y'); ?> <?php print theme('username', $comment) . t(' says:'); ?></div>
     <div class="content"><?php print $content; ?></div>
+    <?php if ($signature): ?>
+      <div class="user-signature clear-block">
+        <?php print $signature ?>
+      </div>
+    <?php endif; ?>
     <div class="links"><?php print $links; ?></div>
 </div>
Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/aurora/page.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 page.tpl.php
--- page.tpl.php	25 Mar 2007 13:38:52 -0000	1.2
+++ page.tpl.php	6 Jul 2008 11:32:06 -0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language ?>" xml:lang="<?php print $language ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language ?>" xml:lang="<?php print $language->language ?>">
 
 <head>
   <title><?php print $head_title ?></title>
@@ -10,7 +10,7 @@
   </head>
 
 <body id="<?php if ($is_front) { print 'home'; } else { print 'second'; } ?>">
-  <div id="page" class="<?php if ($sidebar_left || $sidebar_right) { print "one-sidebar"; } if ($sidebar_right && $sidebar_left) { print " two-sidebars"; }?>">
+  <div id="page" class="<?php if ($left || $right) { print "one-sidebar"; } if ($right && $left) { print " two-sidebars"; }?>">
   
     <div id="header">
     
@@ -40,7 +40,7 @@
       <div class="menu <?php if ($primary_links) { print "withprimary"; } if ($secondary_links) { print " withsecondary"; } ?> ">          
           <?php if ($secondary_links): ?>
             <div id="secondary" class="clear-block">
-              <?php print theme('menu_links', $secondary_links) ?>
+              <?php print aurora_tabs($secondary_links, array('class' => 'secondary')) ?>
             </div>
           <?php endif; ?>
 
@@ -56,14 +56,14 @@
 	
 		 <?php if ($primary_links): ?>
             <div id="primary" class="clear-block">
-              <?php print theme('menu_links', $primary_links) ?>
+              <?php print aurora_tabs($primary_links, array('class' => 'primary')) ?>
             </div>
           <?php endif; ?>
 		  
 	      
 
 	
-	<div id="container" class="<?php if ($sidebar_left) { print "withleft"; } if ($sidebar_right) { print " withright"; }?> clear-block">     
+	<div id="container" class="<?php if ($left) { print "withleft"; } if ($right) { print " withright"; }?> clear-block">     
       <div id="main-wrapper">	  
       <div id="main" class="clear-block">
         <?php print $breadcrumb ?>
@@ -78,22 +78,23 @@
       </div>
       </div>
       
-      <?php if ($sidebar_left): ?>
+      <?php if ($left): ?>
         <div id="sidebar-left" class="sidebar">
           <?php print $search_box ?>     
-          <?php print $sidebar_left ?>
+          <?php print $left ?>
         </div>
       <?php endif; ?>  
 
-      <?php if ($sidebar_right): ?>
+      <?php if ($right): ?>
         <div id="sidebar-right" class="sidebar">
-          <?php print $sidebar_right ?>
+          <?php print $right ?>
         </div>
       <?php endif; ?>
 
     </div>
 
     <div id="footer">
+      <?php print $footer ?>
       <?php print $footer_message ?>
     </div>
 	<div class="copy">
@@ -103,6 +104,5 @@
     <?php print $closure ?>
     
   </div>
-
 </body>
 </html>
Index: style.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/aurora/style.css,v
retrieving revision 1.1
diff -u -p -r1.1 style.css
--- style.css	16 Mar 2007 06:00:44 -0000	1.1
+++ style.css	6 Jul 2008 11:32:06 -0000
@@ -233,8 +233,7 @@ body, #page, #front, #second {
   margin: 0 0 0 0px;
   border-top: 3px solid #2f2f2f;
   border-left: 3px solid #2f2f2f;
-  border-right: 3px solid #2f2f2f;
-  
+  border-right: 3px solid #2f2f2f; 
 }
 
 #primary ul {
@@ -251,7 +250,7 @@ body, #page, #front, #second {
   
 }
 
-#primary ul li a, #primary ul li a:visited {
+#primary ul li a, #primary a:visited {
   display: block;
   margin: 0 4px 0 0px;
   padding: 6px .8em 6px .8em;
@@ -263,7 +262,11 @@ body, #page, #front, #second {
   line-height: 12px;
   font-size: 12px;
   background-color: #2f2f2f;
-  
+
+}
+
+#primary ul li a.active {
+  background-color: #6f6f6f;
 }
 
 #primary ul li a:hover {
@@ -377,9 +380,9 @@ body, #page, #front, #second {
 #footer {
   text-align: center;
   vertical-align: middle;
-  line-height: 37px;
-  height: 37px;
-  background: url(images/bg-footer.gif) #1d1e1f repeat-x;
+  /*line-height: 37px;
+  height: 37px;*/
+  background: url(images/bg-footer.gif) #3a3a3a repeat-x bottom;
   margin: 0 0 10px 0;
   color: #a9a9a9;
   border: 3px solid #2f2f2f;
@@ -523,6 +526,10 @@ fieldset.collapsed {
   vertical-align: bottom;
 }
 
+#search label {
+  display:none; /* remove the Search this site label */
+}
+
 #search input.form-submit, #user-login-form input.form-submit  {
   width: 49px;
   margin: 0;
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/aurora/template.php,v
retrieving revision 1.2
diff -u -p -r1.2 template.php
--- template.php	17 Mar 2007 09:24:44 -0000	1.2
+++ template.php	6 Jul 2008 11:32:06 -0000
@@ -12,37 +12,6 @@
 
  
 /**
-* MODIFYING OR CREATING REGIONS
-*
-* Regions are areas in your theme where you can place blocks.
-* The default regions used in themes  are "left sidebar", "right sidebar", "header", and "footer",  although you can create
-* as many regions as you want.  Once declared, they are made available to the page.tpl.php file as a variable.  
-* For instance, we use <?php print $header ?> for the placement of the "header" region in page.tpl.php.
-* 
-* By going to  the administer > site building > blocks page you can choose which regions various blocks should be placed.
-* New regions you define here will automatically show up in the drop-down list by their human readable name.
- */
- 
- 
-/**
- * Declare the available regions implemented by this engine.
- *
- * @return
- *    An array of regions.  The first array element will be used as the default region for themes.
- *    Each array element takes the format: variable_name => t('human readable name')
- */
-function aurora_regions() {
-  return array(
-       'left' => t('left sidebar'),
-       'right' => t('right sidebar'),
-       'content_top' => t('content top'),
-       'content_bottom' => t('content bottom'),
-       'header' => t('header'),
-       'footer' => t('footer')
-  );
-} 
-
-/**
  * OVERRIDING THEME FUNCTIONS
  *
  *  The Drupal theme system uses special theme functions to generate HTML output automatically.
@@ -91,24 +60,16 @@ function aurora_regions() {
  */
 
  
-/**
- * Intercept template variables
- *
- * @param $hook
- *   The name of the theme function being executed
- * @param $vars
- *   A sequential array of variables passed to the theme function.
- */
-
-function _phptemplate_variables($hook, $vars = array()) {
-  switch ($hook) {
-    // Send a new variable, $has_terms, to see wether the current node has any terms
-    case 'node':   
-      if(count(taxonomy_node_get_terms($vars['node']->nid)))
-        $vars['has_terms'] = TRUE;
-      else
-        $vars['has_terms'] = FALSE;
-  }
-  
+function aurora_preprocess_node(&$vars) {
+  // Send a new variable, $has_terms, to see wether the current node has any terms
+  $vars['has_terms'] = count(taxonomy_node_get_terms($vars['node'])) > 0;
   return $vars;
 }
+
+function aurora_tabs($tabs, $attributes = array()) {
+  $attributes['class'] .= ' tabs';
+  $out = '<ul class="tabs">';
+  foreach ($tabs as $tab) $out .= theme('menu_local_task', theme('menu_item_link', $tab));
+  $out .= '</ul>';
+  return $out;
+}
