added logo configuration option - closes #5

chimeric · Mar 22, 2010 · 94169ce · 94169ce
1 parent 0c5a953
commit 94169ce
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/conf/default.php b/conf/default.php
@@ -10,3 +10,4 @@
 $conf['sb_position'] = 'left';
 $conf['ft_pagename'] = 'footer';        // the pagename for the footer page
 $conf['closedwiki']  = false;           // set to true if you run a closed wiki 
+$conf['logo']        = false;           // path to an image used as logo
diff --git a/conf/metadata.php b/conf/metadata.php
@@ -7,7 +7,7 @@
  */
 
 $meta['sb_pagename'] = array('string', '_pattern' => '#[a-z]*#');
-$meta['sb_position'] = array('');
 $meta['sb_position'] = array('multichoice', '_choices' => array('left', 'right'));
 $meta['ft_pagename'] = array('string', '_pattern' => '#[a-z]*#');
 $meta['closedwiki']  = array('onoff');
+$meta['logo']        = array('string');
diff --git a/lang/en/settings.php b/lang/en/settings.php
@@ -9,3 +9,4 @@
 $lang['sb_position'] = "Sidebar position";
 $lang['ft_pagename'] = "Pagename to use for the footer";
 $lang['closedwiki']  = "Closed Wiki (Navigation shows only the login form if not logged in)"; 
+$lang['logo']        = "Path to an image used as logo";
diff --git a/tpl_functions.php b/tpl_functions.php
@@ -27,6 +27,9 @@ function tpl_logo() {
     $out = '';
 
     switch(true) {
+        case(tpl_getConf('logo')):
+            $logo = tpl_getconf('logo');
+            break;
         case(@file_exists(DOKU_TPLINC.'images/logo.jpg')):
             $logo = DOKU_TPL.'images/logo.jpg';
             break;