--- /Users/brent/Sites/CVS1/blueprint/page.tpl.php
+++ page.tpl.php
@@ -1,4 +1,4 @@
-<?php // $Id: page.tpl.php,v 1.15.4.3 2008/10/28 18:28:11 designerbrent Exp $ ?>
+<?php // $Id: page.tpl.php,v 1.15.4.2 2008/09/05 00:07:37 m3avrck Exp $ ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -22,9 +22,16 @@
 
 <div class="container">
   <div id="header">
-    <h1 id="logo">
-      <a title="<?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?>" href="<?php print url(); ?>"><?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?></a>
-    </h1>
+    <?php if ($logo || $site_name): ?>
+      <h1 id="logo">
+        <?php if ($logo){ ?>
+          <a title="<?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?>" href="<?php print url(); ?>"><img src="<?php print($logo) ?>" alt="<?php print $site_name; ?>" border="0" /><?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?></a>
+        <?php }else{ ?>
+          <a title="<?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?>" href="<?php print url(); ?>"><?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?></a>
+        <?php } ?>
+        
+      </h1>
+    <?php endif ?>
     <?php print $header; ?>
     <?php if (isset($primary_links)) : ?>
       <?php print theme('links', $primary_links, array('id' => 'nav', 'class' => 'links')) ?>

