Skip to content
Snippets Groups Projects
Commit 91e90457 authored by Anika Henke's avatar Anika Henke
Browse files

added two new config options: tagline and sidebar

Templates authors should support these to make the transition between templates easier. Templates which already have a sidebar could first check for $conf['sidebar'] and use it if it's defined, otherwise use their old own sidebar functionality to stay backwards-compatible.
parent 3b9a3b55
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,8 @@ $conf['mediarevisions'] = 1; //enable/disable media revisions ...@@ -28,6 +28,8 @@ $conf['mediarevisions'] = 1; //enable/disable media revisions
$conf['start'] = 'start'; //name of start page $conf['start'] = 'start'; //name of start page
$conf['title'] = 'DokuWiki'; //what to show in the title $conf['title'] = 'DokuWiki'; //what to show in the title
$conf['template'] = 'default'; //see lib/tpl directory $conf['template'] = 'default'; //see lib/tpl directory
$conf['tagline'] = ''; //tagline in header (if template supports it)
$conf['sidebar'] = 'sidebar'; //name of sidebar in root namespace (if template supports it)
$conf['license'] = 'cc-by-nc-sa'; //see conf/license.php $conf['license'] = 'cc-by-nc-sa'; //see conf/license.php
$conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1 $conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1
$conf['recent'] = 20; //how many entries to show in recent $conf['recent'] = 20; //how many entries to show in recent
......
...@@ -62,6 +62,8 @@ $lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; ...@@ -62,6 +62,8 @@ $lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.';
$lang['start'] = 'Start page name'; $lang['start'] = 'Start page name';
$lang['title'] = 'Wiki title'; $lang['title'] = 'Wiki title';
$lang['template'] = 'Template'; $lang['template'] = 'Template';
$lang['tagline'] = 'Tagline (if template supports it)';
$lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar';
$lang['license'] = 'Under which license should your content be released?'; $lang['license'] = 'Under which license should your content be released?';
$lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['fullpath'] = 'Reveal full path of pages in the footer';
$lang['recent'] = 'Recent changes'; $lang['recent'] = 'Recent changes';
......
...@@ -91,6 +91,8 @@ $meta['title'] = array('string'); ...@@ -91,6 +91,8 @@ $meta['title'] = array('string');
$meta['start'] = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces $meta['start'] = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces
$meta['lang'] = array('dirchoice','_dir' => DOKU_INC.'inc/lang/'); $meta['lang'] = array('dirchoice','_dir' => DOKU_INC.'inc/lang/');
$meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/'); $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/');
$meta['tagline'] = array('string');
$meta['sidebar'] = array('string');
$meta['license'] = array('license'); $meta['license'] = array('license');
$meta['savedir'] = array('savedir'); $meta['savedir'] = array('savedir');
$meta['basedir'] = array('string'); $meta['basedir'] = array('string');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment