From 0e336ca8d49c813f535e69d9e727aa58356d5197 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 6 Feb 2012 18:12:57 +0100 Subject: moved files to template hierarchy for merging with core --- lib/tpl/dokuwiki/main.php | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 lib/tpl/dokuwiki/main.php (limited to 'lib/tpl/dokuwiki/main.php') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php new file mode 100644 index 000000000..84334a4db --- /dev/null +++ b/lib/tpl/dokuwiki/main.php @@ -0,0 +1,100 @@ + + * @author Clarence Lee + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ + +if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +?> + + + + + <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] + + + + + + + + + + + + are added to make it possible to e.g. style a page differently if it's in edit mode, + see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> + +
+ + + +
+ + + +
+ + + + +
+ + + +
+ +
+ +
+ + + + + + +
+ +
+ + +
+ +
+ + +
+

+
+
    + ', ''); + tpl_action('revert', 1, 'li', 0, '', ''); + tpl_action('revisions', 1, 'li', 0, '', ''); + tpl_action('backlink', 1, 'li', 0, '', ''); + tpl_action('subscribe', 1, 'li', 0, '', ''); + tpl_action('top', 1, 'li', 0, '', ''); + ?> +
+
+
+
+ + +
+ +
+ + + -- cgit v1.2.3 From 57fc5eddedf96b52f76700b70686359a594b2031 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 23 Mar 2012 23:58:44 +0000 Subject: removed a few comments in new template files --- lib/tpl/dokuwiki/main.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lib/tpl/dokuwiki/main.php') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 84334a4db..44a8d4a19 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -27,14 +27,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show - - - - are added to make it possible to e.g. style a page differently if it's in edit mode, - see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> -
@@ -45,9 +38,9 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
- + - +
@@ -61,12 +54,12 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show - +
-
+
-- cgit v1.2.3 From e601443821436ad3b9cd9b8ec9a478a50d77d3e0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 24 Mar 2012 00:32:53 +0000 Subject: wrapped X-UA-Compatible meta tag with conditional comments --- lib/tpl/dokuwiki/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki/main.php') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 44a8d4a19..9bc221711 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -18,7 +18,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show lang="" dir=""> - + <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] -- cgit v1.2.3 From e5d4768d27336a3af2fc36af663d21a1a57d0ee1 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 7 Apr 2012 20:20:22 +0200 Subject: added tpl_includeFile() to core --- lib/tpl/dokuwiki/main.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib/tpl/dokuwiki/main.php') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 9bc221711..57c94f174 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -9,7 +9,6 @@ */ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); ?> - + @@ -39,9 +38,9 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
- + - +
@@ -52,11 +51,11 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
- + - +
-- cgit v1.2.3