Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/civicspace/page.tpl.php,v
retrieving revision 1.20
diff -u -r1.20 page.tpl.php
--- page.tpl.php	11 Nov 2005 19:22:25 -0000	1.20
+++ page.tpl.php	12 Nov 2005 11:36:09 -0000
@@ -17,7 +17,7 @@
     <meta name="description" content="<?php print check_plain(strip_tags($mission)) ?>" />
   <?php endif; ?>
   <meta name="revisit-after" content="1 days" />
-  <meta name="robots" content="<?php if (civicspace_is_admin()): ?>no-follow<?php else: ?>follow<?php endif;?>" />
+  <meta name="robots" content="follow" />
 
 <?php 
   print $head;
@@ -27,28 +27,8 @@
     print phptemplate_stylesheet_import($directory .'/global/print/print.css','print, screen');
   }
   else {
-    print '<link href="'. $directory .'/global/styles/utility.css" rel="stylesheet" media="all" />'. "\n";    
-    // implemenation of universal admin theme
-    if (civicspace_is_admin()) {
-      // pseude code:
-      // if file_exists(current_style/admin/style.css) {
-      //   link to custom admin styles;
-      // }
-      // else {
-      //   use the default admin styles;
-      // }
-
-      $file = civicspace_path_to_style() . '/admin/admin.css';
-      if (file_exists($file)) {
-        print phptemplate_stylesheet_import($file,'screen');    
-      }
-      else {
-        print phptemplate_stylesheet_import($directory .'/admin/admin.css','screen');    
-      }
-    }
-    else {
-      print $styles ."\n";
-    }
+    print '<link href="'. $directory .'/global/styles/utility.css" rel="stylesheet" media="all" />'. "\n";
+    print $styles ."\n";
   }
 
 ?>
@@ -92,55 +72,6 @@
 <div class="hide skiplink">
   <?php print l(t('Skip to the main content'), $_GET['q'],array('title' =>'Skip directly to the main content'), NULL, 'body_content', FALSE) ."\n" ?>
 </div>
-
-<?php if (civicspace_is_admin()) { ?>
-
-  <div id="admin-header">
-    <h1 id="site-name">
-      <?php print $site?>
-      <span>
-        <a href="<?php print url('') ?>">View site &raquo;</a>
-      </span>
-    </h1>
-    <div id="admin-help">
-      <ul>
-        <li><a href="http://drupal.org/handbook" title="Drupal handbook">Drupal Handbook</a></li>
-
-<?php
-        $help_loc = check_plain(arg(1));
-        if ($help_loc) {
-          if ($help_loc == "settings" && check_plain(arg(2))) {
-            $help_loc = check_plain(arg(2));
-            $help_print = ucfirst($help_loc) .' Help';
-            $help_loc = '/'. $help_loc;
-          }
-          elseif ($help_loc == "help") {
-            $help_loc = "";
-            $help_print = "Help Index";
-          }
-          else {
-          $help_print = ucfirst($help_loc) .' Help';
-          $help_loc = '/'. $help_loc;
-          }
-        } else {
-          $help_print = "Admin Help";
-        }
-        ?>
-
-        <li><a href="?q=admin/help<?php print $help_loc; ?>"><?php print 
-$help_print; ?></a></li>
-        <li class="last"><a 
-href="?q=logout">Logoff</a></li>
-      </ul>
-    </div>
-    <div class="clearing"></div>
-  </div>
-  
-
-<?php 
-  } 
-  else {
-?>
   <!-- START: HEADER 
        |||||||||||||||||||||||||||||||||||||||||||||||||||||||| -->
 
@@ -227,9 +158,6 @@
   <?php 
     } // close primary/secondary links 
   ?>
-<?php 
-  } // close admin header 
-?>
 
 
 <!-- BEGIN: Content top -->
@@ -243,12 +171,6 @@
               <a name="body_content" id="body_content"></a>
               <!-- END: Content top -->
 
-              <?php if (civicspace_is_admin()): /* breadcrumbs are above title in admin section */ ?>
-                <div class="breadcrumb-container no-print">
-                  You are here: <?php print $breadcrumb ?> 
-                </div>
-              <?php endif; ?>
-
               <?php if ($title != ""): ?>
               <h1 class="page-title <?php if ($tabs != "") { print 'page-title-withtabs'; } ?>"><?php print $title ?></h1> 
               <?php endif; ?>
@@ -314,12 +236,7 @@
     <div class="left sidebar" id="div_column_left">
       <div class="container-left">
 
-        <?php
-          print(civicspace_word_split($sidebar_left));
-          
-          // we only use one left hand column for the admin section
-          if (civicspace_is_admin()) : print(civicspace_word_split($sidebar_right)); endif;
-        ?>
+        <?php print(civicspace_word_split($sidebar_left)); ?>
 
     </div> <!-- end container-left div -->
   </div> <!-- end left div -->
@@ -329,12 +246,12 @@
   </div> <!-- end float-wrap div -->
 <!-- end left sidebar content -->
 
-<?php if (($sidebar_right != '') && !civicspace_is_admin()) { ?>
+<?php if (($sidebar_right != '')) { ?>
 <!-- begin right sidebar content -->
   <div class="right sidebar" id="div_column_right">
     <div class="container-right">
 
-      <?php if (!civicspace_is_admin()) : print(civicspace_word_split($sidebar_right)); endif; ?>
+      <?php print(civicspace_word_split($sidebar_right)); ?>
 
     </div> <!-- end container-right div -->
     <div class="clear"></div>
@@ -351,7 +268,6 @@
 
 <div class="clearing"></div>
 
-<?php if (!civicspace_is_admin()) { ?>
 <!-- START: FOOTER     |||||||||||||||||||||||||||||||||||||||||||||||||||||||| -->
 <?php if (($_GET['q']) != variable_get('site_frontpage','node') && $breadcrumb): /* this prevents breadcrumb from showing up on homepage */ ?>
   <div class="breadcrumb-container no-print">
@@ -388,13 +304,11 @@
 </div>
 <!-- END: FOOTER      |||||||||||||||||||||||||||||||||||||||||||||||||||||||| -->
 
-<?php } ?>
-
 <?php print $closure ?>
 
 <?php
   // focus for certain pages
-  if (((arg(0) . '-' . arg(1)) == 'user-login') && !civicspace_is_admin()) {
+  if (((arg(0) . '-' . arg(1)) == 'user-login')) {
     print '<script>if ( document.getElementById ) {window.onload = document.getElementById(\'edit-name\').focus();}</script>';
   }
 ?>
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/civicspace/template.php,v
retrieving revision 1.17
diff -u -r1.17 template.php
--- template.php	11 Nov 2005 15:22:24 -0000	1.17
+++ template.php	12 Nov 2005 11:36:09 -0000
@@ -273,6 +273,10 @@
         }
       }
     }
+    // Set admin theme
+    if (civicspace_is_admin()) {
+    	$vars['template_file'] = 'page_admin';
+    }
   }
   return $vars;
 }
Index: page_admin.tpl.php
===================================================================
RCS file: page_admin.tpl.php
diff -N page_admin.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ page_admin.tpl.php	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,281 @@
+<?php /* $Id: page.tpl.php,v 1.20 2005/11/11 19:22:25 occy Exp $ */ ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	   "http://http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language ?>" xml:lang="<?php print $language ?>">
+
+<head>
+  <title>
+  <?php
+    if ($head_title == ""):
+      print $site.' - '.t($site_slogan);
+    else:
+      print $head_title;
+    endif;
+  ?>
+  </title>
+  <?php if ($mission != ""): ?>
+    <meta name="description" content="<?php print check_plain(strip_tags($mission)) ?>" />
+  <?php endif; ?>
+  <meta name="revisit-after" content="1 days" />
+  <meta name="robots" content="no-follow" />
+
+<?php 
+  print $head;
+
+  // simple way of offering print previews: just append &print to your URL
+  if( isset( $_GET['print'] ) ) { 
+    print phptemplate_stylesheet_import($directory .'/global/print/print.css','print, screen');
+  }
+  else {
+    print '<link href="'. $directory .'/global/styles/utility.css" rel="stylesheet" media="all" />'. "\n";    
+    // implemenation of universal admin theme
+
+    // pseude code:
+    // if file_exists(current_style/admin/style.css) {
+    //   link to custom admin styles;
+    // }
+    // else {
+    //   use the default admin styles;
+    // }
+
+    $file = civicspace_path_to_style() . '/admin/admin.css';
+    if (file_exists($file)) {
+      print phptemplate_stylesheet_import($file,'screen');    
+    }
+    else {
+      print phptemplate_stylesheet_import($directory .'/admin/admin.css','screen');    
+    }
+  }
+
+?>
+
+  <!--[if IE]>
+  <style type="text/css" media="screen">
+  /*<![CDATA[*/
+    /* Give IE some :hover lovin' '*/
+    body {
+      behavior: url("<?php print $directory ?>/scripts/csshover.htc");
+    }
+    /* IE min-width trick */
+    div#wrapper { 
+      width:expression(((document.compatMode && document.compatMode=='CSS1Compat') ? document.documentElement.clientWidth : document.body.clientWidth) < 720 ? "720px" : "auto"); 
+    }
+    /*]]>*/
+* {
+  zoom:                         1; /* IE peekaboo fix */
+}
+.outer, .main-content {
+  word-wrap:                    break-word;
+}
+  </style>
+  <![endif]-->
+  <script language="JavaScript" src="<?php print $directory ?>/scripts/pngfix.js" type="text/javascript"></script>
+  <script language="JavaScript" src="<?php print $directory ?>/scripts/utility.js" type="text/javascript"></script>
+  <script language="JavaScript1.2" type="text/javascript">
+  /*<![CDATA[*/
+  <!--
+    document.write('<' + 'script language="JavaScript1.2" type="text/javascript" src="<?php print $directory ?>/scripts/toggle.js"><\/script>');
+  //-->
+    /*]]>*/
+  </script>
+
+</head>
+<?php
+  $body_classes = civicspace_get_body_classes($sidebar_left, $sidebar_right);
+?>
+<body class="<?php print implode(' ', array_unique($body_classes));?>"<?php print theme("onload_attribute"); ?>>
+
+<div class="hide skiplink">
+  <?php print l(t('Skip to the main content'), $_GET['q'],array('title' =>'Skip directly to the main content'), NULL, 'body_content', FALSE) ."\n" ?>
+</div>
+
+
+  <div id="admin-header">
+    <h1 id="site-name">
+      <?php print $site?>
+      <span>
+        <a href="<?php print url('') ?>">View site &raquo;</a>
+      </span>
+    </h1>
+    <div id="admin-help">
+      <ul>
+        <li><a href="http://drupal.org/handbook" title="Drupal handbook">Drupal Handbook</a></li>
+
+<?php
+        $help_loc = check_plain(arg(1));
+        if ($help_loc) {
+          if ($help_loc == "settings" && check_plain(arg(2))) {
+            $help_loc = check_plain(arg(2));
+            $help_print = ucfirst($help_loc) .' Help';
+            $help_loc = '/'. $help_loc;
+          }
+          elseif ($help_loc == "help") {
+            $help_loc = "";
+            $help_print = "Help Index";
+          }
+          else {
+          $help_print = ucfirst($help_loc) .' Help';
+          $help_loc = '/'. $help_loc;
+          }
+        } else {
+          $help_print = "Admin Help";
+        }
+        ?>
+
+        <li><a href="?q=admin/help<?php print $help_loc; ?>"><?php print 
+$help_print; ?></a></li>
+        <li class="last"><a 
+href="?q=logout">Logoff</a></li>
+      </ul>
+    </div>
+    <div class="clearing"></div>
+  </div>
+  
+  <!-- END: HEADER
+       |||||||||||||||||||||||||||||||||||||||||||||||||||||||| -->
+         
+
+  <?php if ($primary_links or $secondary_links) { ?>
+
+  <!-- START: NAV      |||||||||||||||||||||||||||||||||||||||||||||||||||||||| -->
+  <div id="navigation">
+    <h3 class="hide">Site Navigation</h3>
+    <?php if (is_array($primary_links) && (count($primary_links) > 0)): ?>
+      <ul id="global-primary" class="global-navigation">
+      <?php foreach ($primary_links as $link): ?>
+        <?php
+          static $primary_link_id;
+          $primary_link_id += 1;    
+        ?>
+        <li id="primary-link-<?php print $primary_link_id; ?>"><?php print $link; ?></li>
+      <?php endforeach; ?>
+      </ul>
+    <?php endif; ?>
+
+    <?php if (is_array($secondary_links) && (count($secondary_links) > 0)): ?>
+      <ul id="global-secondary" class="global-navigation">
+      <?php foreach (array_reverse($secondary_links) as $link): ?>
+        <?php
+          static $secondary_link_id;
+          $secondary_link_id += 1;    
+        ?>
+        <li id="secondary-link-<?php print $secondary_link_id; ?>"><?php print $link; ?></li>
+      <?php endforeach; ?>
+      </ul>
+    <?php endif; ?>
+  </div>
+  <!-- END: NAV     |||||||||||||||||||||||||||||||||||||||||||||||||||||||| -->  
+
+  <?php 
+    } // close primary/secondary links 
+  ?>
+
+
+
+<!-- BEGIN: Content top -->
+  <hr class="hide" />
+  <div id="wrapper">  
+    <div class="outer" id="content-holder">
+      <div class="float-wrap">
+        <div class="center" id="div_column_center">   
+          <div id="content">
+            <div class="main-content" id="main">
+              <a name="body_content" id="body_content"></a>
+              <!-- END: Content top -->
+
+              <div class="breadcrumb-container no-print">
+                You are here: <?php print $breadcrumb ?> 
+              </div>
+              
+              <?php if ($title != ""): ?>
+              <h1 class="page-title <?php if ($tabs != "") { print 'page-title-withtabs'; } ?>"><?php print $title ?></h1> 
+              <?php endif; ?>
+            
+              <?php if ($mission != ""): ?>
+                <div id="mission">
+                  <img src="<?php print $directory ?>/images/bg_mission.png" class="alignright no-print" alt="Flag decoration" />
+                  <div class="content">
+                    <?php print $mission ?>
+                  </div>
+                </div>
+              <?php endif; ?>
+
+              <?php if (($messages != "") or ($help != "")): ?>
+                <div class="messages">
+
+                  <?php if ($help != ""): ?>
+                    <div class="help-toggle no-print" id="toggle-help-show" style="display: none;">
+                      <a href="javascript:void(0);" onclick="toggleShow('help');toggleShow('toggle-help-hide');toggleHide('toggle-help-show');" class="toggle-link"><img src="<?php print $directory; ?>/global/images/icon_collapsed.png" alt="Collapse" /> Show help</a>
+                    </div>
+                    <div class="help-toggle" id="toggle-help-hide" style="display: none;">
+                      <a href="javascript:void(0);" onclick="toggleHide('help');toggleHide('toggle-help-hide');toggleShow('toggle-help-show');" class="toggle-link"><img src="<?php print $directory; ?>/global/images/icon_expanded.png" alt="Expand" /> Hide help</a>
+                    </div>
+                    <div id="help">
+                      <img src="<?php print $directory ?>/global/images/icon_help.png" alt="Help icon" class="icon-help" />
+                      <div class="content">
+                        <?php print $help ?>                      
+                      </div>
+                    </div>
+                    <script language="JavaScript1.2" type="text/javascript">
+                      /*<![CDATA[*/
+                      <!--
+                        window.onload = toggleHide('help');toggleShow('toggle-help-show');
+                      //-->
+                        /*]]>*/
+                    </script>
+                  <?php endif; ?>
+
+                  <?php if ($messages != ""): ?>
+                    <?php print $messages ?>
+                  <?php endif; ?>
+
+                </div>
+              <?php endif; ?>
+    
+              <?php if ($tabs != "" && !(arg(0) == 'node' && is_numeric(arg(1)) && is_null(arg(2)))): ?>
+                <div id="local-tasks" class="no-print">
+                  <?php print $tabs ?>
+                </div>
+              <?php endif; ?>
+
+              <?php print($content); ?>
+
+          <!-- BEGIN: Content middle -->
+        </div>
+      </div> <!-- end content div -->    
+    </div> <!-- end centered div -->
+<!-- END: Content middle -->
+
+
+<?php if ($sidebar_left != '') { ?>
+<!-- begin left sidebar content -->
+    <div class="left sidebar" id="div_column_left">
+      <div class="container-left">
+
+        <?php
+          print(civicspace_word_split($sidebar_left));
+          print(civicspace_word_split($sidebar_right));
+        ?>
+
+    </div> <!-- end container-left div -->
+  </div> <!-- end left div -->
+  <div class="clearing"></div> 
+<?php } ?>
+  
+  </div> <!-- end float-wrap div -->
+<!-- end left sidebar content -->
+
+<!-- BEGIN: Content bottom -->
+    <div class="clearing"></div> 
+  </div>  <!-- end outer div -->
+</div>
+<!-- END: Content bottom -->
+
+
+<div class="clearing"></div>
+
+<?php print $closure ?>
+
+</body>
+
+</html>