? .DS_Store
? files
? theme.patch
? modules/contrib
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.297
diff -u -F^f -r1.297 theme.inc
--- includes/theme.inc	20 May 2006 01:24:30 -0000	1.297
+++ includes/theme.inc	23 May 2006 19:12:18 -0000
@@ -487,12 +487,14 @@ function theme_status_messages() {
  *
  * @param $links
  *   A keyed array of links to be themed.
- * @param $delimiter
- *   A string used to separate the links.
+ * @param $id
+ *   Optional id for list of links.
+ * @param $class
+ *   Optional class name for list of links.
  * @return
- *   A string containing the themed links.
+ *   A string containing an unordered list of links.
  */
-function theme_links($links, $delimiter = ' | ') {
+function theme_links($links, $id = '', $class = '') {
   $output = array();
 
   if (is_array($links)) {
@@ -515,7 +517,10 @@ function theme_links($links, $delimiter 
     }
   }
 
-  return implode($delimiter, $output);
+  $id = ($id != '') ? ' id="'. $id .'"' : '';
+  $class = ($class != '') ? ' class="'. $class .'"' : '';
+    
+  return '<ul'. $id . $class .'><li class="first">'. implode('</li><li>', $output) .'</li></ul>';
 }
 
 /**
Index: themes/bluemarine/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/page.tpl.php,v
retrieving revision 1.17
diff -u -F^f -r1.17 page.tpl.php
--- themes/bluemarine/page.tpl.php	1 Feb 2006 16:04:02 -0000	1.17
+++ themes/bluemarine/page.tpl.php	23 May 2006 19:12:19 -0000
@@ -18,8 +18,8 @@
       <?php if ($site_slogan) { ?><div class='site-slogan'><?php print $site_slogan ?></div><?php } ?>
     </td>
     <td id="menu">
-      <?php if (isset($secondary_links)) { ?><div id="secondary"><?php print theme('links', $secondary_links) ?></div><?php } ?>
-      <?php if (isset($primary_links)) { ?><div id="primary"><?php print theme('links', $primary_links) ?></div><?php } ?>
+      <?php if (isset($secondary_links)) { ?><?php print theme('links', $secondary_links, 'secondary') ?><?php } ?>
+      <?php if (isset($primary_links)) { ?><?php print theme('links', $primary_links, 'primary') ?><?php } ?>
       <?php print $search_box ?>
     </td>
   </tr>
Index: themes/bluemarine/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/style.css,v
retrieving revision 1.14
diff -u -F^f -r1.14 style.css
--- themes/bluemarine/style.css	23 May 2006 02:11:17 -0000	1.14
+++ themes/bluemarine/style.css	23 May 2006 19:12:19 -0000
@@ -96,7 +96,7 @@ fieldset {
 }
 #primary {
   font-size: 1.0em;
-  padding: 0em 0.8em 0.5em 0;
+  padding: 0 0.8em 0.5em 0;
   color: #9cf;
 }
 #primary a {
@@ -104,7 +104,7 @@ fieldset {
   color: #fff;
 }
 #secondary {
-  padding: 0 1em 0.5em 0;
+  padding: 0 1em 0 0;
   font-size: 0.8em;
   color: #9cf;
 }
@@ -112,6 +112,15 @@ fieldset {
   font-weight: bold;
   color: #9cf;
 }
+#primary li, #secondary li {
+  display: inline;
+  list-style-type: none;
+  padding: 0 .5em;
+  border-left: 1px solid #9cf;
+}
+#primary li.first, #secondary li.first {
+  border: none;
+}
 #search .form-text, #search .form-submit {
   border: 1px solid #369;
   font-size: 1.1em;
Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.45
diff -u -F^f -r1.45 chameleon.theme
--- themes/chameleon/chameleon.theme	23 May 2006 02:07:36 -0000	1.45
+++ themes/chameleon/chameleon.theme	23 May 2006 19:12:19 -0000
@@ -53,15 +53,15 @@ function chameleon_page($content) {
 
   $output .= "</div>\n";
 
-  $primary_links = theme('links', menu_primary_links());
-  $secondary_links = theme('links', menu_secondary_links());
+  $primary_links = theme('links', menu_primary_links(), 'primary');
+  $secondary_links = theme('links', menu_secondary_links(), 'secondary');
   if (isset($primary_links) || isset($secondary_links)) {
     $output .= ' <div class="navlinks">';
     if (isset($primary_links)) {
-      $output .= '<div class="primary">'. $primary_links .'</div>';
+      $output .= $primary_links;
     }
     if (isset($secondary_links)) {
-      $output .= '<div class="secondary">'. $secondary_links .'</div>';
+      $output .= $secondary_links;
     }
     $output .= " </div>\n";
   }
Index: themes/chameleon/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/style.css,v
retrieving revision 1.3
diff -u -F^f -r1.3 style.css
--- themes/chameleon/style.css	2 Sep 2005 19:18:14 -0000	1.3
+++ themes/chameleon/style.css	23 May 2006 19:12:19 -0000
@@ -55,6 +55,22 @@
   margin-top: -0.1em;
   font-size: 0.8em;
 }
+#primary, #secondary {
+  margin: 0;
+  padding: 0;
+}
+#secondary {
+  font-size: 0.8em;
+}
+#primary li, #secondary li {
+  display: inline;
+  list-style-type: none;
+  padding: 0 .5em;
+  border-left: 1px solid #000;
+}
+#primary li.first, #secondary li.first {
+  border: none;
+}
 .node .title {
   font-size: 1.2em;
 }
Index: themes/chameleon/marvin/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/marvin/style.css,v
retrieving revision 1.3
diff -u -F^f -r1.3 style.css
--- themes/chameleon/marvin/style.css	23 May 2006 02:11:17 -0000	1.3
+++ themes/chameleon/marvin/style.css	23 May 2006 19:12:19 -0000
@@ -45,6 +45,22 @@
 #header .title {
   padding-top: .75em;
 }
+#primary, #secondary {
+  margin: 0;
+  padding: 0;
+}
+#secondary {
+  font-size: 0.8em;
+}
+#primary li, #secondary li {
+  display: inline;
+  list-style-type: none;
+  padding: 0 .5em;
+  border-left: 1px solid #888;
+}
+#primary li.first, #secondary li.first {
+  border: none;
+}
 
 /*
 ** Common declarations for child classes of node, comment, block, box etc
Index: themes/pushbutton/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/page.tpl.php,v
retrieving revision 1.13
diff -u -F^f -r1.13 page.tpl.php
--- themes/pushbutton/page.tpl.php	1 Feb 2006 16:04:03 -0000	1.13
+++ themes/pushbutton/page.tpl.php	23 May 2006 19:12:19 -0000
@@ -97,14 +97,10 @@
   <tr>
     <td align="center" valign="middle">
     <?php if (isset($primary_links)) : ?>
-      <div class="primary-links">
-        <?php print theme('links', $primary_links) ?>
-      </div>
+      <?php print theme('links', $primary_links, '', 'primary-links') ?>
     <?php endif; ?>
     <?php if (isset($secondary_links)) : ?>
-      <div class="secondary-links">
-        <?php print theme('links', $secondary_links) ?>
-      </div>
+      <?php print theme('links', $secondary_links, '', 'secondary-links') ?>
     <?php endif; ?>
     </td>
   </tr>
Index: themes/pushbutton/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/style.css,v
retrieving revision 1.17
diff -u -F^f -r1.17 style.css
--- themes/pushbutton/style.css	23 May 2006 02:11:17 -0000	1.17
+++ themes/pushbutton/style.css	23 May 2006 19:12:20 -0000
@@ -125,6 +125,22 @@ fieldset {
 #secondary-menu .secondary-links {
   font-size: 0.85em;
 }
+.primary-links ul, .secondary-links ul, .primary-links, .secondary-links {
+  margin: 0;
+  padding: 0;
+}
+.primary-links li, .secondary-links li {
+  display: inline;
+  list-style-type: none;
+  padding: 0 1em;
+}
+ul.primary-links li, ul.secondary-links li {
+  border-left: 1px solid #fff;
+  
+}
+ul.primary-links li.first, ul.secondary-links li.first {
+  border: none;
+}
 .tabs {
   margin: 15px 0;
 }