EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support the tplinc plugin

Browse source 
This is a first commit to generally support the plugin and make the page
footer use it. More includes should be added at other places.
This commit is contained in:
Andreas Gohr 2017-03-28 16:55:26 +02:00
commit cad2e67442
2 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Template.php
View file

@ -35,6 +35,36 @@ class Template {
*/ */
protected function __construct() { protected function __construct() {
$this->initializePlugins(); $this->initializePlugins();
/** @var \Doku_Event_Handler */
global $EVENT_HANDLER;
$EVENT_HANDLER->register_hook('PLUGIN_TPLINC_LOCATIONS_SET', 'BEFORE', $this, 'registerIncludes');
}
/**
* Makes include position info available to the tplinc plugin
*
* @param \Doku_Event $event
*/
public function registerIncludes(\Doku_Event $event) {
$event->data['footer'] = 'Footer below the page content';
}
/**
* Get the content to include from the tplinc plugin
*
* prefix and postfix are only added when there actually is any content
*
* @param string $location
* @param string $pre prepend this before the content
* @param string $post append this to the content
* @return string
*/
public function getInclude($location, $pre = '', $post = '') {
if(!$this->plugins['tplinc']) return '';
$content = $this->plugins['tplinc']->renderIncludes($location);
if($content === '') return '';
return $pre . $content . $post;
} }
/** /**
@ -45,6 +75,7 @@ class Template {
if($this->plugins['sqlite']) { if($this->plugins['sqlite']) {
$this->plugins['tagging'] = plugin_load('helper', 'tagging'); $this->plugins['tagging'] = plugin_load('helper', 'tagging');
} }
$this->plugins['tplinc'] = plugin_load('helper', 'tplinc');
} }
/** /**

25
main.php
View file

@ -9,14 +9,13 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*/ */
use dokuwiki\template\sprintdoc\Template;
if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
header('X-UA-Compatible: IE=edge,chrome=1'); header('X-UA-Compatible: IE=edge,chrome=1');
$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) ); $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) );
$showSidebar = true; /* */ $showSidebar = true; /* */
$hasFooter = page_findnearest('pagefooter');
$showFooter = $hasFooter && ($ACT === 'show');
?> ?>
<html class="edge no-js" lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>"> <html class="edge no-js" lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
<head> <head>
@ -277,19 +276,13 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
tpl_content(false); /* the main content */ tpl_content(false); /* the main content */
?> ?>
<div class="clearer"></div> <div class="clearer"></div>
<?php if($showFooter): <?php
if($ACT == 'show') echo Template::getInstance()->getInclude(
'footer',
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ '<div class="wikipagefooter"><hr>',
/* Page Include Hook: pagefooter.txt */ '<div class="clearer"></div></div>'
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ );
?> ?>
<div class="wikipagefooter">
<hr>
<?php tpl_include_page('pagefooter', true, true) ?>
<div class="clearer"></div>
</div>
<?php endif; ?>
</div><!-- .main-content --> </div><!-- .main-content -->