diff --git a/conf/default.php b/conf/default.php index 57b7bd5..64bf080 100644 --- a/conf/default.php +++ b/conf/default.php @@ -4,8 +4,8 @@ * */ -$conf['tagline'] = 'This is the tagline - explaining what this site is about.'; $conf['discussionPage'] = 'discussion:@ID@'; $conf['userPage'] = 'user:@USER@:'; -$conf['sidebarID'] = 'sidebar'; $conf['hideTools'] = 0; +$conf['tagline'] = 'This is the tagline - explaining what this site is about.'; +$conf['sidebarID'] = 'sidebar'; diff --git a/conf/metadata.php b/conf/metadata.php index 88583bc..7345616 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -4,8 +4,8 @@ * */ -$meta['tagline'] = array('string'); $meta['discussionPage'] = array('string'); $meta['userPage'] = array('string'); -$meta['sidebarID'] = array('string'); $meta['hideTools'] = array('onoff'); +$meta['tagline'] = array('string'); +$meta['sidebarID'] = array('string'); diff --git a/lang/en/lang.php b/lang/en/lang.php index 91b04b1..cefac6c 100644 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -8,7 +8,7 @@ $lang['discussion'] = 'Discussion'; $lang['back_to_article'] = 'Back to article'; $lang['userpage'] = 'User page'; -/* accessibility headlines */ +/* accessibility headlines (deprecated and superseded by core since Adora Belle) */ $lang['user_tools'] = 'User Tools'; $lang['site_tools'] = 'Site Tools'; $lang['page_tools'] = 'Page Tools'; diff --git a/lang/en/settings.php b/lang/en/settings.php index 356e952..52ccf88 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -4,8 +4,8 @@ * */ -$lang['tagline'] = 'Tagline'; $lang['discussionPage'] = 'Discussion page (leave empty to disable discussions)'; $lang['userPage'] = 'User page (leave empty to disable user pages)'; -$lang['sidebarID'] = 'page name of page included in sidebar'; $lang['hideTools'] = 'Hide tools when not logged in?'; +$lang['tagline'] = 'Tagline (deprecated, use core "tagline" setting since Adora Belle)'; +$lang['sidebarID'] = 'page name of page included in sidebar (deprecated, use core "sidebar" setting since Adora Belle)'; diff --git a/main.php b/main.php index 2497003..8af2449 100644 --- a/main.php +++ b/main.php @@ -47,12 +47,12 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER ','id="dokuwiki__top" accesskey="h" title="[H]"') */ ?> - -
+ + @@ -61,10 +61,10 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER