- Patch #21855 by TDobes: the recent commit of phptemplate caused a number of problems for non-phptemplate themes. A patch is attached to address these issues.

  Changes include:
    * parsing of the primary/secondary links has been moved out of phptemplate and into theme_get_setting.
    * unnecessary and XHTML-invalidating duplicate div#help removed from themes/bluemarine/page.tpl.php (this is already generated by theme_help)
    * weird generation of the "edit primary/secondary links" messages removed from bluemarine and placed in theme.inc
    * unnecessary changes to themes/bluemarine/style.css rolled back (the phptemplate bluemarine had an older version of style.css than the one in core)
    * chameleon updated to work with new link scheme (passes links through theme_links)

2 files changed, 9 insertions, 4 deletions

diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php
index f8fd5837a..0ca11414d 100644
--- a/themes/bluemarine/page.tpl.php
+++ b/themes/bluemarine/page.tpl.php
@@ -20,8 +20,8 @@
 
     </td>
     <td id="menu">
-      <div id="secondary"><?php print (is_array($secondary_links) && count($secondary_links) > 0) ? theme('links', $secondary_links) : l(t('edit secondary links'),'admin/themes/settings') ?></div>
-      <div id="primary"><?php print (is_array($primary_links) && count($primary_links) > 0) ? theme('links', $primary_links) : l(t('edit primary links'), 'admin/themes/settings') ?></div>
+      <div id="secondary"><?php print theme('links', $secondary_links) ?></div>
+      <div id="primary"><?php print theme('links', $primary_links) ?></div>
       <?php if ($search_box) { ?><form action="<?php print $search_url ?>" method="post">
         <div id="search">
           <input class="form-text" type="text" size="15" value="" name="keys" alt="<?php print $search_description ?>" />
@@ -43,7 +43,7 @@
         <?php print $breadcrumb ?>
         <h1 class="title"><?php print $title ?></h1>
         <div class="tabs"><?php print $tabs ?></div>
-        <div id="help"><?php print $help ?></div>
+        <?php print $help ?>
         <?php print $messages ?>
 
         <?php print $content; ?>
diff --git a/themes/bluemarine/style.css b/themes/bluemarine/style.css
index 366f538d1..4f6e637d6 100644
--- a/themes/bluemarine/style.css
+++ b/themes/bluemarine/style.css
@@ -14,7 +14,7 @@ tr.dark td, tr.light td {
   padding: 0.3em;
 }
 h1, h2, h3, h4, h5, h6 {
-  margin: 0.5;
+  margin-bottom: 0.5em;
 }
 h1 {
   font-size: 1.3em;
@@ -25,6 +25,10 @@ h2 {
 h3, h4, h5, h6 {
   font-size: 1.1em;
 }
+p {
+  margin-top: 0.5em;
+  margin-bottom: 0.9em;
+}
 a {
   text-decoration: none;
   font-weight: bold;
@@ -83,6 +87,7 @@ table {
 #logo img {
   float: left;
   padding: 0em 1.0em 0em 1em;
+  border: 0;
 }
 #menu {
   padding: 0.5em 0.5em 0 0.5em;