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

darcs-hash:20080613154632-84dde-d2eec5c1472d76eb5d3e8eb253b6a3572a8f721b.gz
This commit is contained in:
Evan Prodromou 2008-06-13 11:46:32 -04:00
parent 704155647f
commit 59d8b8b199

View File

@ -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' => 'wrap'));
common_element_start('div', array('id' => 'header')); common_element_start('div', array('id' => 'header'));
common_nav_menu(); common_nav_menu();
if ($config['site']['logo'] || file_exists(theme_file('logo.png'))) {
common_element_start('a', array('href' => common_local_url('public'))); common_element_start('a', array('href' => common_local_url('public')));
common_element('img', array('src' => ($config['site']['logo']) ? common_element('img', array('src' => ($config['site']['logo']) ?
($config['site']['logo']) : theme_path('logo.png'), ($config['site']['logo']) : theme_path('logo.png'),
'alt' => $config['site']['name'], 'alt' => $config['site']['name'],
'id' => 'logo')); 'id' => 'logo'));
common_element_end('a'); common_element_end('a');
}
common_element('h1', 'pagetitle', $pagetitle);
common_element('h2', 'sitename', $config['site']['name']);
if ($headercall) { if ($headercall) {
if ($data) { if ($data) {
call_user_func($headercall, $data); call_user_func($headercall, $data);