From f4d27201048c83c893d9476dd80a89bbce29a1c6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 5 Nov 2010 00:32:03 +0000 Subject: initial commit --- conf/default.php | 10 ++++++++++ conf/metadata.php | 12 ++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 conf/default.php create mode 100644 conf/metadata.php (limited to 'conf') diff --git a/conf/default.php b/conf/default.php new file mode 100644 index 000000000..7f1fbb246 --- /dev/null +++ b/conf/default.php @@ -0,0 +1,10 @@ + array(0,1,2)); -- cgit v1.2.3 From 5b4c3e60499b9ce847a755833ee8041800e0fcdb Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 5 Nov 2010 10:34:56 +0000 Subject: added user page link --- conf/default.php | 1 + conf/metadata.php | 1 + 2 files changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/default.php b/conf/default.php index 7f1fbb246..7c60e665e 100644 --- a/conf/default.php +++ b/conf/default.php @@ -6,5 +6,6 @@ $conf['tagline'] = 'This is the tagline - explaining what this site is about.'; $conf['discussionNS'] = 'discussion'; +$conf['userNS'] = 'user'; $conf['sidebarID'] = 'sidebar'; $conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index 591053e7e..c6ebe1638 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -6,6 +6,7 @@ $meta['tagline'] = array('string'); $meta['discussionNS'] = array('string'); +$meta['userNS'] = array('string'); $meta['sidebarID'] = array('string'); $meta['hideTools'] = array('onoff'); -- cgit v1.2.3 From 23bca4f3845d2ee190cdcbd04ecb5452c1fc502f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 6 Nov 2010 23:11:25 +0000 Subject: finished design, improved template functions --- conf/default.php | 11 ++++++----- conf/metadata.php | 13 ++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'conf') diff --git a/conf/default.php b/conf/default.php index 7c60e665e..e5bce5e9d 100644 --- a/conf/default.php +++ b/conf/default.php @@ -4,8 +4,9 @@ * */ -$conf['tagline'] = 'This is the tagline - explaining what this site is about.'; -$conf['discussionNS'] = 'discussion'; -$conf['userNS'] = 'user'; -$conf['sidebarID'] = 'sidebar'; -$conf['hideTools'] = 0; +$conf['tagline'] = 'This is the tagline - explaining what this site is about.'; +$conf['discussionNS'] = 'discussion'; +$conf['discussNSreverse'] = 0; +$conf['userNS'] = 'user'; +$conf['sidebarID'] = 'sidebar'; +$conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index c6ebe1638..792c47ae2 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -4,10 +4,9 @@ * */ -$meta['tagline'] = array('string'); -$meta['discussionNS'] = array('string'); -$meta['userNS'] = array('string'); -$meta['sidebarID'] = array('string'); -$meta['hideTools'] = array('onoff'); - -// array('multichoice','_choices' => array(0,1,2)); +$meta['tagline'] = array('string'); +$meta['discussionNS'] = array('string'); +$meta['discussNSreverse'] = array('onoff'); +$meta['userNS'] = array('string'); +$meta['sidebarID'] = array('string'); +$meta['hideTools'] = array('onoff'); -- cgit v1.2.3 From afe47fae3b5d4dbb4c209df698b72d4f2e716ad7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 5 Dec 2010 13:01:15 +0000 Subject: made template functions more flexible * attention: incompatible to previous version! * introduced _tpl_action() (wrapper similar to tpl_action()) * improved discussion and user page functions * made them work independent from config * added full control to how the page links are built (with placeholders @ID@ and @USER@) * config option changes: removed 'discussNSreverse', renamed 'discussionNS' and 'userNS' to 'discussionPage' and 'userPage' --- conf/default.php | 5 ++--- conf/metadata.php | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'conf') diff --git a/conf/default.php b/conf/default.php index e5bce5e9d..57b7bd581 100644 --- a/conf/default.php +++ b/conf/default.php @@ -5,8 +5,7 @@ */ $conf['tagline'] = 'This is the tagline - explaining what this site is about.'; -$conf['discussionNS'] = 'discussion'; -$conf['discussNSreverse'] = 0; -$conf['userNS'] = 'user'; +$conf['discussionPage'] = 'discussion:@ID@'; +$conf['userPage'] = 'user:@USER@:'; $conf['sidebarID'] = 'sidebar'; $conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index 792c47ae2..88583bcd0 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -5,8 +5,7 @@ */ $meta['tagline'] = array('string'); -$meta['discussionNS'] = array('string'); -$meta['discussNSreverse'] = array('onoff'); -$meta['userNS'] = array('string'); +$meta['discussionPage'] = array('string'); +$meta['userPage'] = array('string'); $meta['sidebarID'] = array('string'); $meta['hideTools'] = array('onoff'); -- cgit v1.2.3 From 0afd685c36d348dedfca731c55f562668f7e094b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 5 Feb 2012 15:18:19 +0000 Subject: deleted obsolete files --- conf/default.php | 11 ----------- conf/metadata.php | 11 ----------- 2 files changed, 22 deletions(-) delete mode 100644 conf/default.php delete mode 100644 conf/metadata.php (limited to 'conf') diff --git a/conf/default.php b/conf/default.php deleted file mode 100644 index 57b7bd581..000000000 --- a/conf/default.php +++ /dev/null @@ -1,11 +0,0 @@ - Date: Sat, 10 Mar 2012 16:55:05 +0100 Subject: make new template the default --- conf/dokuwiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 7a7e4bf1a..2eb43f535 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -27,7 +27,7 @@ $conf['mediarevisions'] = 1; //enable/disable media revisions $conf['start'] = 'start'; //name of start page $conf['title'] = 'DokuWiki'; //what to show in the title -$conf['template'] = 'default'; //see lib/tpl directory +$conf['template'] = 'dokuwiki'; //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 -- cgit v1.2.3