Front-end and more

Min-height for main content; Footer-template now similar to acp-footer;
Some more corrections.

diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl
index 4beeb46805ffd0f1c3a05687bc4304356f267cde..88357a63ece57d9a11f6ece4f93da05b5da0ce2d 100644 (file)
--- a/com.woltlab.wcf/template/footer.tpl
+++ b/com.woltlab.wcf/template/footer.tpl
@@ -1,9 +1,15 @@
-               </section>
+                       </section>
+                       <!-- /CONTENT -->
+               </div>
        </div>
-</div>
-<footer>
-       <nav id="footerMenu" class="footerMenu">
-               {include file=footerMenu}
-       </nav>
-</footer>
-<a id="bottom"></a>
\ No newline at end of file
+       <!-- /MAIN -->
+       
+       <!-- FOOTER -->
+       <footer id="pageFooter" class="pageFooter">
+               <div>
+                       {include file=footerMenu}
+               </div>
+               <small class="copyright"><a href="http://www.woltlab.com" title="Go to the WoltLab website">Copyright &copy; 2001-2011 WoltLab&reg; GmbH</a></small>
+       </footer>
+       <!-- /FOOTER -->
+       <a id="bottom"></a>

diff --git a/com.woltlab.wcf/template/footerMenu.tpl b/com.woltlab.wcf/template/footerMenu.tpl
index 3287b98c3c0da72012b776a30229177a23928958..e729e15ab1899936d5d0c018c8eb37b30e14eb67 100644 (file)
--- a/com.woltlab.wcf/template/footerMenu.tpl
+++ b/com.woltlab.wcf/template/footerMenu.tpl
@@ -1,9 +1,11 @@
-{if $__wcf->getPageMenu()->getMenuItems('footer')|count > 0}
-       <nav id="footerMenu" class="footerMenu">
-               <ul>
+<nav id="footerNavigation" class="footerNavigation">
+       <ul>
+               <li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}" class="balloonTooltip"><img src="{@RELATIVE_WCF_DIR}icon/toTop.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
+               {if $__wcf->getPageMenu()->getMenuItems('footer')|count > 0}
+                       <li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}" class="balloonTooltip"><img src="{@RELATIVE_WCF_DIR}icon/toTop.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
                        {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
+               {/if}
+       </ul>
+</nav>

diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index c6b6ba1dd2b9fb9d1d943b993d7a8cfb311bd2a7..3a8a3d923172a9a1318d045a0e0d877068e38ce0 100644 (file)
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -1,14 +1,17 @@
 <a id="top"></a>
+<!-- HEADER -->
 <header class="pageHeader">
        {event name='pageHeaderStart'}
        
        {include file=headerMenu}
        
-       {include file='breadcrumbs' sandbox=false}
-       
        {event name='pageHeaderEnd'}
 </header>
+<!-- /HEADER -->
 
+<!-- MAIN -->
 <div id="main" class="main">
        <div>
-               <section id="content">
\ No newline at end of file
+               <section id="content" class="content">
+                       
+                       {include file='breadcrumbs' sandbox=false}
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/style/style.css b/wcfsetup/install/files/acp/style/style.css
index ff739a28008bfa20888b2f7f1f6a522a936a078c..fb4d5a5b17e7537089ca183a914a824bf62c7042 100644 (file)
--- a/wcfsetup/install/files/acp/style/style.css
+++ b/wcfsetup/install/files/acp/style/style.css
@@ -469,6 +469,7 @@ section.content {
 div.main > div section:only-child {
        display: block !important;
        width: auto;
+       min-height: 100px;
 }
 
 section.content .content {

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index c7fe48726ee639840e56782304144685d60087ed..547e00b1c94927ada49b800c2ecfaf92e0abd51b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -79,8 +79,8 @@
                        <!-- top menu -->
                        <nav id="topMenu" class="topMenu">
                                <div>
-                                       <ul id="userMenu" class="userMenu"><!-- ToDo: We need an ID and/or class for each list here, this ID may change! -->
-                                               <li>
+                                       <ul>
+                                               <li id="userMenu" class="userMenu"><!-- ToDo: We need an ID and/or class for each list here, this ID may also change! -->
                                                        <span class="dropdownCaption">{lang}wcf.acp.user.userNote{/lang}</span>
                                                        <ul class="dropdown">
                                                                <li><a href="{link}index.php?action=Logout&amp;t={@SECURITY_TOKEN}{/link}" onclick="return confirm('{lang}wcf.user.logout.sure{/lang}')">{lang}wcf.user.logout{/lang}</a></li>