Index: themes/bluemarine/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/page.tpl.php,v
retrieving revision 1.8
diff -u -F^f -r1.8 page.tpl.php
--- themes/bluemarine/page.tpl.php	16 Aug 2005 18:06:18 -0000	1.8
+++ themes/bluemarine/page.tpl.php	21 Aug 2005 22:29:53 -0000
@@ -13,15 +13,24 @@
 <table border="0" cellpadding="0" cellspacing="0" id="header">
   <tr>
     <td id="logo">
-
-      <a href="./" title="Home"><img src="<?php print $logo ?>" alt="Home" /></a>
+      <?php if ($logo) : ?>
+        <a href="./" title="Home"><img src="<?php print $logo ?>" alt="Home" /></a>
+      <?php endif; ?>
+      <?php if ($site_name) : ?>
       <h1 class='site-name'><a href="./" title="Home"><?php print $site_name ?></a></h1>
+      <?php endif; ?>
+      <?php if ($site_slogan) : ?>
       <div class='site-slogan'><?php print $site_slogan ?></div>
+      <?php endif; ?>
 
     </td>
     <td id="menu">
+      <?php if ($secondary_links) : ?>
       <div id="secondary"><?php print theme('links', $secondary_links) ?></div>
+      <?php endif; ?>
+      <?php if ($primary_links) : ?>
       <div id="primary"><?php print theme('links', $primary_links) ?></div>
+      <?php endif; ?>
       <?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="edit[keys]" alt="<?php print $search_description ?>" />