From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 29 Apr 2016 23:16:29 +0000 (+0200)
Subject: Updated footer markup and styles
X-Git-Tag: 3.0.0_Beta_1~1795
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dcc2d75d5af8a9915cd33ccbeddc64ac198f9f7f;p=GitHub%2FWoltLab%2FWCF.git

Updated footer markup and styles
---

diff --git a/com.woltlab.wcf/templates/pageFooter.tpl b/com.woltlab.wcf/templates/pageFooter.tpl
index 2e5ccef2cb..2500fb4509 100644
--- a/com.woltlab.wcf/templates/pageFooter.tpl
+++ b/com.woltlab.wcf/templates/pageFooter.tpl
@@ -15,6 +15,8 @@
 	
 	<div id="pageFooterCopyright" class="pageFooterCopyright">
 		<div class="layoutBoundary">
+			{event name='footerContents'}
+			
 			{if ENABLE_BENCHMARK}{include file='benchmark'}{/if}
 			
 			{include file='pageFooterCopyright'}
diff --git a/wcfsetup/install/files/acp/style/layout.scss b/wcfsetup/install/files/acp/style/layout.scss
index 429e05497a..ba1902a0e0 100644
--- a/wcfsetup/install/files/acp/style/layout.scss
+++ b/wcfsetup/install/files/acp/style/layout.scss
@@ -214,6 +214,9 @@
 }
 
 .pageFooter {
+	box-shadow: 0 0 10px rgba(0, 0, 0, .6);
+}
+
+.pageFooterCopyright {
 	padding: 20px 0;
-	text-align: center;
 }
diff --git a/wcfsetup/install/files/acp/templates/benchmark.tpl b/wcfsetup/install/files/acp/templates/benchmark.tpl
index 8a37ea8bf7..2bea953c4c 100644
--- a/wcfsetup/install/files/acp/templates/benchmark.tpl
+++ b/wcfsetup/install/files/acp/templates/benchmark.tpl
@@ -1,37 +1,39 @@
-<p id="benchmark"><small>Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</small></p>
-
-{if ENABLE_DEBUG_MODE}	
-	<script data-relocate="true">
-		//<![CDATA[
-		$(function() {
-			$('#benchmarkDetails > li > span').click(function() {
-				$(this).parent().children('pre').toggle();
-			});
-		});
-		//]]>
-	</script>
-	<ul id="benchmarkDetails" style="display: none;">
-		{foreach from=$__wcf->getBenchmark()->getItems() key=benchmarkIndex item=item}
-			<li id="benchmarkItem{@$benchmarkIndex}" style="margin-bottom: 8px;"{if $item.use >= 0.01} class="hot"{/if}>
-				<span>{if $item.type == 1}(SQL Query) {/if}{$item.text}</span><br />
-				<small style="font-size: .85em">Execution time: {@$item.use}s</small>
-				
-				<pre style="display: none">{foreach from=$item.trace key=traceNo item=traceItem}#{#$traceNo} {if !$traceItem.class|empty}{$traceItem.class}{$traceItem.type}{else}{if !$traceItem.file|empty}{$traceItem.file}: {/if}{/if}{$traceItem.function}() {if !$traceItem.line|empty}(line {#$traceItem.line}){/if} 
-{/foreach}</pre>
-				
-			</li>
-		{/foreach}
-	</ul>
+<div class="benchmark">
+	<a id="benchmark">Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</a>
 	
-	<script data-relocate="true">
-		//<![CDATA[
-		$(function() {
-			$('#benchmark').click(function() {
-				$('#benchmarkDetails').wcfDialog({
-					title: 'Log'
+	{if ENABLE_DEBUG_MODE}	
+		<script data-relocate="true">
+			//<![CDATA[
+			$(function() {
+				$('#benchmarkDetails > li > span').click(function() {
+					$(this).parent().children('pre').toggle();
+				});
+			});
+			//]]>
+		</script>
+		<ul id="benchmarkDetails" style="display: none;">
+			{foreach from=$__wcf->getBenchmark()->getItems() key=benchmarkIndex item=item}
+				<li id="benchmarkItem{@$benchmarkIndex}" style="margin-bottom: 8px;"{if $item.use >= 0.01} class="hot"{/if}>
+					<span>{if $item.type == 1}(SQL Query) {/if}{$item.text}</span><br />
+					<small style="font-size: .85em">Execution time: {@$item.use}s</small>
+					
+					<pre style="display: none">{foreach from=$item.trace key=traceNo item=traceItem}#{#$traceNo} {if !$traceItem.class|empty}{$traceItem.class}{$traceItem.type}{else}{if !$traceItem.file|empty}{$traceItem.file}: {/if}{/if}{$traceItem.function}() {if !$traceItem.line|empty}(line {#$traceItem.line}){/if} 
+	{/foreach}</pre>
+					
+				</li>
+			{/foreach}
+		</ul>
+		
+		<script data-relocate="true">
+			//<![CDATA[
+			$(function() {
+				$('#benchmark').click(function() {
+					$('#benchmarkDetails').wcfDialog({
+						title: 'Log'
+					});
 				});
 			});
-		});
-		//]]>
-	</script>
-{/if}
\ No newline at end of file
+			//]]>
+		</script>
+	{/if}
+</div>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/pageFooter.tpl b/wcfsetup/install/files/acp/templates/pageFooter.tpl
index a577548f45..8d3f5f0903 100644
--- a/wcfsetup/install/files/acp/templates/pageFooter.tpl
+++ b/wcfsetup/install/files/acp/templates/pageFooter.tpl
@@ -1,11 +1,11 @@
 <footer id="pageFooter" class="pageFooter">
-	<div class="layoutBoundary">
-		<div class="footerContent">
+	<div id="pageFooterCopyright" class="pageFooterCopyright">
+		<div class="layoutBoundary">
 			{event name='footerContents'}
 			
 			{if ENABLE_BENCHMARK}{include file='benchmark'}{/if}
 			
-			<div class="copyright"><a href="http://www.woltlab.com">Copyright &copy; 2001-2016 WoltLab&reg; GmbH</a>{event name='copyright'}</div>
+			<div class="copyright"><a href="https://www.woltlab.com">Copyright &copy; 2001-2016 WoltLab&reg; GmbH</a>{event name='copyright'}</div>
 		</div>
 	</div>
 </footer>
diff --git a/wcfsetup/setup/template/footer.tpl b/wcfsetup/setup/template/footer.tpl
index ea2f17b297..7eef4d9e09 100644
--- a/wcfsetup/setup/template/footer.tpl
+++ b/wcfsetup/setup/template/footer.tpl
@@ -1,11 +1,11 @@
 				</div>
 			</div>
 		</section>
-		
+				
 		<footer id="pageFooter" class="pageFooter">
-			<div class="layoutBoundary">
-				<div class="footerContent">
-					<div class="copyright"><a href="http://www.woltlab.com">Copyright &copy; 2001-2016 WoltLab&reg; GmbH</a></div>
+			<div id="pageFooterCopyright" class="pageFooterCopyright">
+				<div class="layoutBoundary">
+					<div class="copyright"><a href="https://www.woltlab.com">Copyright &copy; 2001-2016 WoltLab&reg; GmbH</a></div>
 				</div>
 			</div>
 		</footer>