From b744177907173800d77cfb84e04392ba9850f91f Mon Sep 17 00:00:00 2001 From: Andreas Gohr <gohr@cosmocode.de> Date: Thu, 2 Mar 2006 14:43:06 +0100 Subject: [PATCH] no default targets Using the target attribute is considered bad practice. This patch removes the default targets from dokuwiki.conf and fixes the footer.html of the default template accordingly darcs-hash:20060302134306-6e07b-cae2e54472687abb50f7cb97bd6c479b7c7d97d7.gz --- conf/dokuwiki.php | 4 ++-- lib/tpl/default/footer.html | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 1b1c7d6c8..3e15fa689 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -97,8 +97,8 @@ $conf['rss_linkto'] = 'diff'; //what page RSS entries link to: //Set target to use when creating links - leave empty for same window $conf['target']['wiki'] = ''; -$conf['target']['interwiki'] = '_blank'; -$conf['target']['extern'] = '_blank'; +$conf['target']['interwiki'] = ''; +$conf['target']['extern'] = ''; $conf['target']['media'] = ''; $conf['target']['windows'] = ''; diff --git a/lib/tpl/default/footer.html b/lib/tpl/default/footer.html index 9db2db4e8..6d146c540 100644 --- a/lib/tpl/default/footer.html +++ b/lib/tpl/default/footer.html @@ -3,24 +3,26 @@ * Example footer include * * This file shows you how to use the include hooks. However I recommend to - * create your own complete new template instead. + * create your own complete new template instead. */ + +$tgt = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' : ''; ?> <div class="footerinc"> - <a target="_blank" href="<?php echo DOKU_BASE; ?>feed.php" title="Recent changes RSS feed"><img src="<?php echo DOKU_TPL; ?>images/button-rss.png" width="80" height="15" alt="Recent changes RSS feed" /></a> + <a <?php echo $tgt?> href="<?php echo DOKU_BASE; ?>feed.php" title="Recent changes RSS feed"><img src="<?php echo DOKU_TPL; ?>images/button-rss.png" width="80" height="15" alt="Recent changes RSS feed" /></a> - <a target="_blank" href="http://creativecommons.org/licenses/by-nc-sa/2.0/" rel="license" title="Creative Commons License"><img src="<?php echo DOKU_TPL; ?>images/button-cc.gif" width="80" height="15" alt="Creative Commons License" /></a> + <a <?php echo $tgt?> href="http://creativecommons.org/licenses/by-nc-sa/2.0/" rel="license" title="Creative Commons License"><img src="<?php echo DOKU_TPL; ?>images/button-cc.gif" width="80" height="15" alt="Creative Commons License" /></a> - <a target="_blank" href="https://www.paypal.com/xclick/business=andi%40splitbrain.org&item_name=DokuWiki+Donation&no_shipping=1&no_note=1&tax=0&currency_code=EUR&lc=US" title="Donate"><img src="<?php echo DOKU_TPL; ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a> + <a <?php echo $tgt?> href="https://www.paypal.com/xclick/business=andi%40splitbrain.org&item_name=DokuWiki+Donation&no_shipping=1&no_note=1&tax=0&currency_code=EUR&lc=US" title="Donate"><img src="<?php echo DOKU_TPL; ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a> - <a target="_blank" href="http://www.php.net" title="Powered by PHP"><img src="<?php echo DOKU_TPL; ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a> + <a <?php echo $tgt?> href="http://www.php.net" title="Powered by PHP"><img src="<?php echo DOKU_TPL; ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a> - <a target="_blank" href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0"><img src="<?php echo DOKU_TPL; ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a> + <a <?php echo $tgt?> href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0"><img src="<?php echo DOKU_TPL; ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a> - <a target="_blank" href="http://jigsaw.w3.org/css-validator/check/referer" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a> + <a <?php echo $tgt?> href="http://jigsaw.w3.org/css-validator/check/referer" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a> - <a target="_blank" href="http://wiki.splitbrain.org/wiki:dokuwiki" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a> + <a <?php echo $tgt?> href="http://wiki.splitbrain.org/wiki:dokuwiki" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a> <?php -- GitLab