From 0e336ca8d49c813f535e69d9e727aa58356d5197 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 6 Feb 2012 18:12:57 +0100
Subject: moved files to template hierarchy for merging with core

---
 lib/tpl/dokuwiki/tpl_footer.php | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 lib/tpl/dokuwiki/tpl_footer.php

(limited to 'lib/tpl/dokuwiki/tpl_footer.php')

diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
new file mode 100644
index 000000000..fcc9d21c7
--- /dev/null
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -0,0 +1,6 @@
+<!-- ********** FOOTER ********** -->
+<div id="dokuwiki__footer"><div class="pad">
+    <?php tpl_license('button') /* content license, parameters: img=*badge|button|0, imgonly=*0|1, return=*0|1 */ ?>
+</div></div><!-- /footer -->
+
+<?php _tpl_include('footer.html') ?>
-- 
cgit v1.2.3


From 0cec12dbebb29837b4bc322d5c1931cd79dc3848 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 10 Mar 2012 17:26:30 +0100
Subject: readded footer buttons from the old template

as discussed at https://github.com/splitbrain/dokuwiki/pull/82#r419699
---
 lib/tpl/dokuwiki/tpl_footer.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'lib/tpl/dokuwiki/tpl_footer.php')

diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index fcc9d21c7..e6fb7661d 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -1,6 +1,19 @@
 <!-- ********** FOOTER ********** -->
 <div id="dokuwiki__footer"><div class="pad">
-    <?php tpl_license('button') /* content license, parameters: img=*badge|button|0, imgonly=*0|1, return=*0|1 */ ?>
+        <?php
+            $tgt = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' : '';
+            tpl_license(''); // text only
+        ?>
+
+    <div class="footerbuttons">
+
+        <?php tpl_license('button',true,false,false); // button, no wrapper?>
+        <a <?php echo $tgt?> href="http://www.dokuwiki.org/donate" title="Donate"><img src="<?php echo tpl_basedir(); ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a>
+        <a <?php echo $tgt?> href="http://www.php.net" title="Powered by PHP"><img src="<?php echo tpl_basedir(); ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a>
+        <a <?php echo $tgt?> href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0"><img src="<?php echo tpl_basedir(); ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
+        <a <?php echo $tgt?> href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS"><img src="<?php echo tpl_basedir(); ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
+        <a <?php echo $tgt?> href="http://dokuwiki.org/" title="Driven by DokuWiki"><img src="<?php echo tpl_basedir(); ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
+    </div>
 </div></div><!-- /footer -->
 
 <?php _tpl_include('footer.html') ?>
-- 
cgit v1.2.3


From a4380643ef4658cfe5340f5963a54a045a529c5b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 10 Mar 2012 21:04:15 +0000
Subject: improved footer readability and css

---
 lib/tpl/dokuwiki/tpl_footer.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'lib/tpl/dokuwiki/tpl_footer.php')

diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index e6fb7661d..6b46234d6 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -1,18 +1,22 @@
 <!-- ********** FOOTER ********** -->
 <div id="dokuwiki__footer"><div class="pad">
+    <?php tpl_license(''); // license text ?>
+
+    <div class="buttons">
         <?php
-            $tgt = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' : '';
-            tpl_license(''); // text only
+            tpl_license('button', true, false, false); // license button, no wrapper
+            $target = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' : '';
         ?>
-
-    <div class="footerbuttons">
-
-        <?php tpl_license('button',true,false,false); // button, no wrapper?>
-        <a <?php echo $tgt?> href="http://www.dokuwiki.org/donate" title="Donate"><img src="<?php echo tpl_basedir(); ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a>
-        <a <?php echo $tgt?> href="http://www.php.net" title="Powered by PHP"><img src="<?php echo tpl_basedir(); ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a>
-        <a <?php echo $tgt?> href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0"><img src="<?php echo tpl_basedir(); ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
-        <a <?php echo $tgt?> href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS"><img src="<?php echo tpl_basedir(); ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
-        <a <?php echo $tgt?> href="http://dokuwiki.org/" title="Driven by DokuWiki"><img src="<?php echo tpl_basedir(); ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
+        <a href="http://www.dokuwiki.org/donate" title="Donate" <?php echo $target?>><img
+            src="<?php echo tpl_basedir(); ?>images/button-donate.gif" width="80" height="15" alt="Donate" /></a>
+        <a href="http://www.php.net" title="Powered by PHP" <?php echo $target?>><img
+            src="<?php echo tpl_basedir(); ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a>
+        <a href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0" <?php echo $target?>><img
+            src="<?php echo tpl_basedir(); ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
+        <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS" <?php echo $target?>><img
+            src="<?php echo tpl_basedir(); ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
+        <a href="http://dokuwiki.org/" title="Driven by DokuWiki" <?php echo $target?>><img
+            src="<?php echo tpl_basedir(); ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
     </div>
 </div></div><!-- /footer -->
 
-- 
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/tpl_footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tpl/dokuwiki/tpl_footer.php')

diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index 6b46234d6..41ddabda2 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -20,4 +20,4 @@
     </div>
 </div></div><!-- /footer -->
 
-<?php _tpl_include('footer.html') ?>
+<?php tpl_includeFile('footer.html') ?>
-- 
cgit v1.2.3