Updated footer markup and styles

diff --git a/com.woltlab.wcf/templates/pageFooter.tpl b/com.woltlab.wcf/templates/pageFooter.tpl
index 2e5ccef2cb1f55fbadd92452ac84745541276a19..2500fb4509730541fdc7ba92383b75f9c9064798 100644 (file)
--- 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 429e05497aef82953558fcf8960b2ae522bf1fe4..ba1902a0e00cd27934ccd15ef6681921fd646df4 100644 (file)
--- 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 8a37ea8bf79e29d511866a5dd77a0ea8238f54d2..2bea953c4ccb5211e57da4a554015f73c8f2b4c9 100644 (file)
--- 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 a577548f4565bcba4039aa99d5ca5c2705f1a41d..8d3f5f0903fdcac86f91c7909e75ec3fed1e859d 100644 (file)
--- 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 ea2f17b2973cd4a58779e30070581c8fde5ed45a..7eef4d9e099c2eb3f5e6f6f51727be61fd041250 100644 (file)
--- 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>