From: Luzifr <szekely@woltlab.com>
Date: Fri, 23 Sep 2011 14:22:00 +0000 (+0200)
Subject:  Front-end and more
X-Git-Tag: 2.0.0_Beta_1~1774
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=853b834a66bf02dc0fed3cf5f61513988b2c16bd;p=GitHub%2FWoltLab%2FWCF.git

 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 4beeb46805..88357a63ec 100644
--- 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 3287b98c3c..e729e15ab1 100644
--- 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 c6b6ba1dd2..3a8a3d9231 100644
--- 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 ff739a2800..fb4d5a5b17 100644
--- 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 c7fe48726e..547e00b1c9 100644
--- 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>