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_header.php | 83 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 lib/tpl/dokuwiki/tpl_header.php

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

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
new file mode 100644
index 000000000..91d8876b9
--- /dev/null
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -0,0 +1,83 @@
+<!-- ********** HEADER ********** -->
+<div id="dokuwiki__header"><div class="pad group">
+
+    <?php html_msgarea() /* occasional error and info messages on top of the page */ ?>
+    <?php _tpl_include('header.html') ?>
+
+    <div class="headings group">
+        <ul class="a11y skip">
+            <li><a href="#dokuwiki__content"><?php echo $lang['skip_to_content']; ?></a></li>
+        </ul>
+
+        <h1><?php
+            // get logo either out of the template images folder or data/media folder
+            $logoSize = array();
+            $logo = tpl_getMediaFile(array(':wiki:logo.png','images/logo.png'),false,$logoSize);
+
+            // display logo and wiki title in a link to the home page
+            tpl_link(
+                wl(),
+                '<img src="'.$logo.'" '.$logoSize[3].' alt="" /> <span>'.$conf['title'].'</span>',
+                'accesskey="h" title="[H]"'
+            );
+        ?></h1>
+        <?php if ($conf['tagline']): ?>
+            <p class="claim"><?php echo $conf['tagline']; ?></p>
+        <?php endif ?>
+    </div>
+
+    <div class="tools group">
+        <!-- USER TOOLS -->
+        <?php if ($conf['useacl']): ?>
+            <div id="dokuwiki__usertools">
+                <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
+                <ul>
+                    <?php /* the optional second parameter of tpl_action() switches between a link and a button,
+                             e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */
+                        if ($_SERVER['REMOTE_USER']) {
+                            echo '<li class="user">';
+                            tpl_userinfo(); /* 'Logged in as ...' */
+                            echo '</li>';
+                        }
+                        tpl_action('admin', 1, 'li');
+                        tpl_action('profile', 1, 'li');
+                        tpl_action('register', 1, 'li');
+                        tpl_action('login', 1, 'li');
+                    ?>
+                </ul>
+            </div>
+        <?php endif ?>
+
+        <!-- SITE TOOLS -->
+        <div id="dokuwiki__sitetools">
+            <h3 class="a11y"><?php echo $lang['site_tools']; ?></h3>
+            <?php tpl_searchform(); ?>
+            <?php /* all the tools in one dropdown (good for mobile view): */ ?>
+            <div class="mobileTools">
+                <?php tpl_actiondropdown($lang['tools']); ?>
+            </div>
+            <ul>
+                <?php
+                    tpl_action('recent', 1, 'li');
+                    tpl_action('media', 1, 'li');
+                    tpl_action('index', 1, 'li');
+                ?>
+            </ul>
+        </div>
+
+    </div>
+
+    <!-- BREADCRUMBS -->
+    <?php if($conf['breadcrumbs'] || $conf['youarehere']): ?>
+        <div class="breadcrumbs">
+            <?php if($conf['youarehere']): ?>
+                <div class="youarehere"><?php tpl_youarehere() ?></div>
+            <?php endif ?>
+            <?php if($conf['breadcrumbs']): ?>
+                <div class="trace"><?php tpl_breadcrumbs() ?></div>
+            <?php endif ?>
+        </div>
+    <?php endif ?>
+
+    <hr class="a11y" />
+</div></div><!-- /header -->
-- 
cgit v1.2.3


From 57fc5eddedf96b52f76700b70686359a594b2031 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 23 Mar 2012 23:58:44 +0000
Subject: removed a few comments in new template files

---
 lib/tpl/dokuwiki/tpl_header.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 91d8876b9..9a391aedc 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -1,7 +1,7 @@
 <!-- ********** HEADER ********** -->
 <div id="dokuwiki__header"><div class="pad group">
 
-    <?php html_msgarea() /* occasional error and info messages on top of the page */ ?>
+    <?php html_msgarea() ?>
     <?php _tpl_include('header.html') ?>
 
     <div class="headings group">
@@ -12,7 +12,7 @@
         <h1><?php
             // get logo either out of the template images folder or data/media folder
             $logoSize = array();
-            $logo = tpl_getMediaFile(array(':wiki:logo.png','images/logo.png'),false,$logoSize);
+            $logo = tpl_getMediaFile(array(':wiki:logo.png', 'images/logo.png'), false, $logoSize);
 
             // display logo and wiki title in a link to the home page
             tpl_link(
@@ -32,8 +32,6 @@
             <div id="dokuwiki__usertools">
                 <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
                 <ul>
-                    <?php /* the optional second parameter of tpl_action() switches between a link and a button,
-                             e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */
                         if ($_SERVER['REMOTE_USER']) {
                             echo '<li class="user">';
                             tpl_userinfo(); /* 'Logged in as ...' */
@@ -52,7 +50,6 @@
         <div id="dokuwiki__sitetools">
             <h3 class="a11y"><?php echo $lang['site_tools']; ?></h3>
             <?php tpl_searchform(); ?>
-            <?php /* all the tools in one dropdown (good for mobile view): */ ?>
             <div class="mobileTools">
                 <?php tpl_actiondropdown($lang['tools']); ?>
             </div>
-- 
cgit v1.2.3


From 5e984c56d67aafecf27d7fddd922484a0318c9db Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 24 Mar 2012 11:51:44 +0000
Subject: added accidentally removed '<?php' back in (was in 57fc5edd)

---
 lib/tpl/dokuwiki/tpl_header.php | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 9a391aedc..35b3cf636 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -32,6 +32,7 @@
             <div id="dokuwiki__usertools">
                 <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
                 <ul>
+                    <?php
                         if ($_SERVER['REMOTE_USER']) {
                             echo '<li class="user">';
                             tpl_userinfo(); /* 'Logged in as ...' */
-- 
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_header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 35b3cf636..1d2517ee1 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -2,7 +2,7 @@
 <div id="dokuwiki__header"><div class="pad group">
 
     <?php html_msgarea() ?>
-    <?php _tpl_include('header.html') ?>
+    <?php tpl_includeFile('header.html') ?>
 
     <div class="headings group">
         <ul class="a11y skip">
-- 
cgit v1.2.3


From ff74ee7c91ff27350da267a1d9145eaba85a01a6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 30 Jun 2012 15:42:46 +0200
Subject: move down the message area

---
 lib/tpl/dokuwiki/tpl_header.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 1d2517ee1..f2e720308 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -1,7 +1,6 @@
 <!-- ********** HEADER ********** -->
 <div id="dokuwiki__header"><div class="pad group">
 
-    <?php html_msgarea() ?>
     <?php tpl_includeFile('header.html') ?>
 
     <div class="headings group">
@@ -77,5 +76,7 @@
         </div>
     <?php endif ?>
 
+    <?php html_msgarea() ?>
+
     <hr class="a11y" />
 </div></div><!-- /header -->
-- 
cgit v1.2.3


From 91626c7f91db0e2bcd183db41a224b53b1ed3cd2 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 28 Jul 2012 10:22:01 +0100
Subject: made sure all template files are run from within DokuWiki (FS#2567)

---
 lib/tpl/dokuwiki/tpl_header.php | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index f2e720308..5b2f806a8 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -1,3 +1,8 @@
+<?php
+// must be run from within DokuWiki
+if (!defined('DOKU_INC')) die();
+?>
+
 <!-- ********** HEADER ********** -->
 <div id="dokuwiki__header"><div class="pad group">
 
-- 
cgit v1.2.3


From ae45007edaa7e6d72f10a30a02548edb34ab3bfa Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 28 Jul 2012 10:35:25 +0100
Subject: added missing phpdoc header to included template files

---
 lib/tpl/dokuwiki/tpl_header.php | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 5b2f806a8..0704aa271 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * Template header, included in the main and detail files
+ */
+
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
 ?>
-- 
cgit v1.2.3