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/detail.php | 144 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 lib/tpl/dokuwiki/detail.php (limited to 'lib/tpl/dokuwiki/detail.php') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php new file mode 100644 index 000000000..287827253 --- /dev/null +++ b/lib/tpl/dokuwiki/detail.php @@ -0,0 +1,144 @@ + + * @author Anika Henke + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ + +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +?> + + + + + + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> + [<?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 */ ?> + +
+ + + +
+ + +
+ + +
+ + +
+ + + + '.$ERROR.''; + else: ?> + +

+ + + +
+
+ $tag){ + $t = array(); + if (!empty($tag[0])) { + $t = array($tag[0]); + } + if(is_array($tag[3])) { + $t = array_merge($t,$tag[3]); + } + $value = tpl_img_getTag($t); + if ($value) { + echo '
'.$lang[$tag[1]].':
'; + if ($tag[2] == 'date') { + echo dformat($value); + } else { + echo hsc($value); + } + echo '
'; + } + } + ?> +
+
+ + +
+ + + + +
+ */ ?> + +
+ +
+ + + +
+

+
+ +
+
+ +
+ + +
+ + + + -- 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/detail.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'lib/tpl/dokuwiki/detail.php') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 287827253..90ae492bd 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -30,14 +30,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 */ ?> -
@@ -53,7 +46,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
- + Date: Sat, 24 Mar 2012 00:32:53 +0000 Subject: wrapped X-UA-Compatible meta tag with conditional comments --- lib/tpl/dokuwiki/detail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki/detail.php') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 90ae492bd..baa454edc 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -18,7 +18,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show lang="" dir=""> - + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> [<?php echo strip_tags($conf['title'])?>] -- cgit v1.2.3 From e5d4768d27336a3af2fc36af663d21a1a57d0ee1 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 7 Apr 2012 20:20:22 +0200 Subject: added tpl_includeFile() to core --- lib/tpl/dokuwiki/detail.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/tpl/dokuwiki/detail.php') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index baa454edc..a3516a7ed 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -9,7 +9,6 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -26,7 +25,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php tpl_metaheaders()?> <meta name="viewport" content="width=device-width,initial-scale=1" /> <?php echo tpl_favicon(array('favicon', 'mobile')) ?> - <?php _tpl_include('meta.html') ?> + <?php tpl_includeFile('meta.html') ?> </head> <body> @@ -47,7 +46,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <div class="page group"> <?php tpl_flush() ?> - <?php _tpl_include('pageheader.html') ?> + <?php tpl_includeFile('pageheader.html') ?> <!-- detail start --> <?php if($ERROR): @@ -95,7 +94,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php endif; ?> </div> <!-- detail stop --> - <?php _tpl_include('pagefooter.html') ?> + <?php tpl_includeFile('pagefooter.html') ?> <?php tpl_flush() ?> <?php /* doesn't make sense like this; @todo: maybe add tpl_imginfo()? -- cgit v1.2.3