Revised default templates

diff --git a/com.woltlab.wcf/templates/breadcrumbs.tpl b/com.woltlab.wcf/templates/breadcrumbs.tpl
new file mode 100644 (file)
index 0000000..0bfd81e
--- /dev/null
+++ b/com.woltlab.wcf/templates/breadcrumbs.tpl
@@ -0,0 +1,9 @@
+<nav id="breadcrumbs" class="breadcrumbs">
+       <ul>
+               {foreach from=$__wcf->getBreadcrumbs()->get() item=$breadcrumb}
+                       <li>
+                               {if $breadcrumb->getURL()}<a href="{$breadcrumb->getURL()}">{/if}<span>{$breadcrumb->getLabel()}</span>{if $breadcrumb->getURL()}</a>{/if} &raquo;
+                       </li>
+               {/foreach}
+       </ul>
+</nav>
\ No newline at end of file

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index 9d2d260af0b9afad61a514e73d9ebec99d2b05af..4beeb46805ffd0f1c3a05687bc4304356f267cde 100644 (file)
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -1,5 +1,9 @@
-<div id="footerContainer">
-       <div id="footer">
-               {include file=footerMenu}
+               </section>
        </div>
-</div>
\ No newline at end of file
+</div>
+<footer>
+       <nav id="footerMenu" class="footerMenu">
+               {include file=footerMenu}
+       </nav>
+</footer>
+<a id="bottom"></a>
\ No newline at end of file

diff --git a/com.woltlab.wcf/templates/footerMenu.tpl b/com.woltlab.wcf/templates/footerMenu.tpl
index 8b2311933cb300b90f93c87b9be79fe97d58da04..3287b98c3c0da72012b776a30229177a23928958 100644 (file)
--- a/com.woltlab.wcf/templates/footerMenu.tpl
+++ b/com.woltlab.wcf/templates/footerMenu.tpl
@@ -1,11 +1,9 @@
 {if $__wcf->getPageMenu()->getMenuItems('footer')|count > 0}
-       <div id="footerMenu" class="footerMenu">
-               <div class="footerMenuInner">
-                       <ul>
-                               {foreach from=$__wcf->getPageMenu()->getMenuItems('footer') item=menuItem}
-                                       <li>{$menuItem|print_r}</li>
-                               {/foreach}
-                       </ul>
-               </div>
-       </div>
+       <nav id="footerMenu" class="footerMenu">
+               <ul>
+                       {foreach from=$__wcf->getPageMenu()->getMenuItems('footer') item=menuItem}
+                               <li><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem} ({#$menuItem->getProcessor()->getNotifications()})</a></li>
+                       {/foreach}
+               </ul>
+       </nav>
 {/if}
\ No newline at end of file

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index 8311bbcc60e8a3ce31dca9f46621bc95d72c6549..250ae3ae9b1c4fb5d85c2a88b92f99f1ccf85bb7 100644 (file)
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -1,5 +1,4 @@
 <meta charset="utf-8" />
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <meta name="description" content="{META_DESCRIPTION}" />
 <meta name="keywords" content="{META_KEYWORDS}" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -16,6 +15,6 @@
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/WCF.js"></script>
 <script type="text/javascript">
        //<![CDATA[
-       WCF.User.init({$__wcf->user->userID}, '{@$__wcf->user->username|encodejs}');
+       WCF.User.init({@$__wcf->user->userID}, '{@$__wcf->user->username|encodejs}');
        //]]>
 </script>

diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index eae1cf6dda31fd8a929029020b745ec4f58aee06..90ac45680cdede974f0a698723aec63c72f05046 100644 (file)
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -1,5 +1,10 @@
-<a id="top" name="top"></a>
-<div id="page">
-       <div id="header" class="border">
-               {include file=headerMenu}
-       </div>
\ No newline at end of file
+<a id="top"></a>
+<header class="pageHeader">
+       {include file=headerMenu}
+       
+       {include file='breadcrumbs' sandbox=false}
+</header>
+
+<div id="main" class="main">
+       <div>
+               <section id="content">
\ No newline at end of file

diff --git a/com.woltlab.wcf/templates/headerMenu.tpl b/com.woltlab.wcf/templates/headerMenu.tpl
index d7c1c9dfda010a4be85c5b25591d76289cdca54e..83e3a74d5305008f1460bdc9df2cc5fb3a600161 100644 (file)
--- a/com.woltlab.wcf/templates/headerMenu.tpl
+++ b/com.woltlab.wcf/templates/headerMenu.tpl
@@ -1,21 +1,19 @@
 {if $__wcf->getPageMenu()->getMenuItems('header')|count > 0}
-       <div id="mainMenu" class="mainMenu">
-               <div class="mainMenuInner">
-                       <ul>
-                               {foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
-                                       <li><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem} ({#$menuItem->getProcessor()->getNotifications()})</a>
-                                       
-                                       {if $__wcf->getPageMenu()->getMenuItems($menuItem->menuItem)|count > 0}
-                                               <ul>
-                                                       {foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
-                                                               <li><a href="{$subMenuItem->menuItemLink}">{$subMenuItem->menuItem} ({#$subMenuItem->getProcessor()->getNotifications()})</a></li>
-                                                       {/foreach}
-                                               </ul>
-                                       {/if}
-                                       
-                                       </li>
-                               {/foreach}
-                       </ul>
-               </div>
-       </div>
+       <nav id="mainMenu" class="mainMenu">
+               <ul>
+                       {foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
+                               <li><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem} ({#$menuItem->getProcessor()->getNotifications()})</a>
+                               
+                               {if $__wcf->getPageMenu()->getMenuItems($menuItem->menuItem)|count > 0}
+                                       <ul>
+                                               {foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
+                                                       <li><a href="{$subMenuItem->menuItemLink}">{$subMenuItem->menuItem} ({#$subMenuItem->getProcessor()->getNotifications()})</a></li>
+                                               {/foreach}
+                                       </ul>
+                               {/if}
+                               
+                               </li>
+                       {/foreach}
+               </ul>
+       </nav>
 {/if}