adrian
/
tcm-in-guestrow-tpl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

made include hooks more flexible (especially for farms: put included file into conf directory)

master
Anika Henke 14 years ago
parent
b49f0667ba
commit
383a53f459
2 changed files with 21 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      main.php
  2. 16
      tpl_functions.php

10
main.php
View File

@ -19,7 +19,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
<title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title> <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title>
<?php tpl_metaheaders() ?> <?php tpl_metaheaders() ?>
<link rel="shortcut icon" href="<?php echo _tpl_getFavicon() /* DW versions > 2010-11-12 can use the core function tpl_getFavicon() */ ?>" /> <link rel="shortcut icon" href="<?php echo _tpl_getFavicon() /* DW versions > 2010-11-12 can use the core function tpl_getFavicon() */ ?>" />
<?php @include(dirname(__FILE__).'/meta.html') /* include hook */ ?>
<?php _tpl_include('meta.html') ?>
</head> </head>
<body> <body>
@ -32,7 +32,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
<?php /* .dokuwiki should always be in one of the surrounding elements (e.g. plugins and templates depend on it) */ ?> <?php /* .dokuwiki should always be in one of the surrounding elements (e.g. plugins and templates depend on it) */ ?>
<div id="dokuwiki__site"><div class="dokuwiki site mode_<?php echo $ACT ?>"> <div id="dokuwiki__site"><div class="dokuwiki site mode_<?php echo $ACT ?>">
<?php html_msgarea() /* occasional error and info messages on top of the page */ ?> <?php html_msgarea() /* occasional error and info messages on top of the page */ ?>
<?php @include(dirname(__FILE__).'/header.html') /* include hook */ ?>
<?php _tpl_include('header.html') ?>
<!-- ********** HEADER ********** --> <!-- ********** HEADER ********** -->
<div id="dokuwiki__header"><div class="pad"> <div id="dokuwiki__header"><div class="pad">
@ -113,7 +113,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
<!-- ********** CONTENT ********** --> <!-- ********** CONTENT ********** -->
<div id="dokuwiki__content"><div class="pad"> <div id="dokuwiki__content"><div class="pad">
<?php tpl_flush() /* flush the output buffer */ ?> <?php tpl_flush() /* flush the output buffer */ ?>
<?php @include(dirname(__FILE__).'/pageheader.html') /* include hook */ ?>
<?php _tpl_include('pageheader.html') ?>
<div class="page"> <div class="page">
<!-- wikipage start --> <!-- wikipage start -->
@ -123,7 +123,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
</div> </div>
<?php tpl_flush() ?> <?php tpl_flush() ?>
<?php @include(dirname(__FILE__).'/pagefooter.html') /* include hook */ ?>
<?php _tpl_include('pagefooter.html') ?>
</div></div><!-- /content --> </div></div><!-- /content -->
<div class="clearer"></div> <div class="clearer"></div>
@ -154,7 +154,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
<?php tpl_license('button') /* content license, parameters: img=*badge|button|0, imgonly=*0|1, return=*0|1 */ ?> <?php tpl_license('button') /* content license, parameters: img=*badge|button|0, imgonly=*0|1, return=*0|1 */ ?>
</div></div><!-- /footer --> </div></div><!-- /footer -->
<?php @include(dirname(__FILE__).'/footer.html') /* include hook */ ?>
<?php _tpl_include('footer.html') ?>
</div></div><!-- /site --> </div></div><!-- /site -->
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div> <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>

16
tpl_functions.php
View File

@ -93,3 +93,19 @@ function _tpl_getFavicon() {
return ml('favicon.ico'); return ml('favicon.ico');
return DOKU_TPL.'images/favicon.ico'; return DOKU_TPL.'images/favicon.ico';
} }
/**
* Include additional html file from conf directory if it exists, otherwise use
* file in the template's root directory.
*
* @author Anika Henke <anika@selfthinker.org>
*/
function _tpl_include($fn) {
$confFile = DOKU_CONF.$fn;
$tplFile = dirname(__FILE__).'/'.$fn;
if (file_exists($confFile))
include($confFile);
else if (file_exists($tplFile))
include($tplFile);
}
Write Preview
Loading…
Cancel
Save