show logo only if file exists, add h1 and h2 to all pages

darcs-hash:20080613154632-84dde-d2eec5c1472d76eb5d3e8eb253b6a3572a8f721b.gz

diff --git a/lib/util.php b/lib/util.php
index e1e50817652843add1ce2d96e309bd13e037cc1c..4869d4dfdd7083c5e7b1fcdc1011da483a4bd6e4 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -178,12 +178,17 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
        common_element_start('div', array('id' => 'wrap'));
        common_element_start('div', array('id' => 'header'));
        common_nav_menu();
-       common_element_start('a', array('href' => common_local_url('public')));
-       common_element('img', array('src' => ($config['site']['logo']) ? 
-                                                               ($config['site']['logo']) : theme_path('logo.png'),
-                                                               'alt' => $config['site']['name'],
-                                                               'id' => 'logo'));
-       common_element_end('a');
+       if ($config['site']['logo'] || file_exists(theme_file('logo.png'))) {
+               common_element_start('a', array('href' => common_local_url('public')));
+               common_element('img', array('src' => ($config['site']['logo']) ?
+                                                                       ($config['site']['logo']) : theme_path('logo.png'),
+                                                                       'alt' => $config['site']['name'],
+                                                                       'id' => 'logo'));
+               common_element_end('a');
+       }
+       common_element('h1', 'pagetitle', $pagetitle);
+       common_element('h2', 'sitename', $config['site']['name']);
+       
        if ($headercall) {
                if ($data) {
                        call_user_func($headercall, $data);