Merge branch 'master' of c:/UniServer/www/dokuwiki/lib/tpl/dokuwiki-2011 into new_default

Conflicts:
	README
	css/_admin.css
	css/_diff.css
	css/_edit.css
	css/_footnotes.css
	css/_forms.css
	css/_imgdetail.css
	css/_links.css
	css/_modal.css
	css/_recent.css
	css/_search.css
	css/_toc.css
	css/basic.css
	css/content.css
	css/design.css
	css/includes.css
	css/print.css
	css/rtl.css
	css/structure.css
	detail.php
	images/bullet.png
	images/closed.png
	images/favicon.ico
	images/link_icon.gif
	images/mail_icon.gif
	images/open.png
	images/windows.gif
	main.php
	mediamanager.php
	style.ini
	tpl_functions.php

1 files changed, 83 insertions, 0 deletions

diff --git a/tpl_header.php b/tpl_header.php
new file mode 100644
index 000000000..91d8876b9
--- /dev/null
+++ b/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 -->