? webchick.info
Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/webchick/page.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 page.tpl.php
--- page.tpl.php	7 Aug 2007 18:46:43 -0000	1.1
+++ page.tpl.php	8 Nov 2007 04:07:50 -0000
@@ -10,6 +10,7 @@
 <?php /* different ids allow for separate theming of the home page */ ?>
 <body class="<?php print $body_classes; ?>">
 <div id="header">
+  <?php print $header; ?>
   <?php if ($logo): ?>
     <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>">
       <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" id="logo" />
@@ -31,7 +32,8 @@
 </div>
 <div id="topnav">
   <?php if ($primary_links): ?>
-    <?php print theme('menu_links', $primary_links); ?>
+    <!-- TODO: Format the links correctly -->
+    <?php print theme('links', $primary_links, ''); ?>
   <?php endif; ?>
 </div> <!-- /topnav -->
 <div id="contentarea">
@@ -50,11 +52,12 @@
 </div> <!-- /contentarea -->
 
 <div id="botnav">
-  <?php print theme('menu_links', $primary_links, ' | '); ?>
+  <?php print theme('links', $primary_links, ' | '); ?>
 </div>
 <div id="copyright">
   <?php print $footer_message; ?>
 </div>
+<?php if ($footer):?><div id="footer"><?php print $footer; ?></div><?php endif; ?>
 <?php print $closure; ?>
 </body>
 </html>
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/webchick/template.php,v
retrieving revision 1.3
diff -u -r1.3 template.php
--- template.php	20 Oct 2007 17:53:30 -0000	1.3
+++ template.php	8 Nov 2007 04:07:48 -0000
@@ -11,20 +11,6 @@
  *
  *  webchick's website in Drupal form.
  */
- 
-/*
- * 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 webchick_regions() {
-  return array(
-    'content_top' => t('content top'),
-    'content_bottom' => t('content bottom'),
-  );
-} 
 
 /**
   * Return a menu that outputs the correct HTML for webchick.net .
@@ -35,13 +21,14 @@
   *   The text delimiter to use when outputing the links.
   * @return a string containing the menu output.
   */
-function webchick_menu_links($links, $delimiter = '') {
+function webchick_links(&$links, $delimiter = '') {
+
   if (!count($links)) {
     return '';
   }
   $level_tmp = explode('-', key($links));
   $level = $level_tmp[0];
-  $output = '';//"<ul class=\"links-$level\">\n";
+  $output = 'hi';//"<ul class=\"links-$level\">\n";
   $num = count($links);
   foreach ($links as $index => $link) {
     $output .= '';//'<li';
