Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
	com.woltlab.wcf/template/footer.tpl

diff --cc com.woltlab.wcf/template/benchmark.tpl
index 09c8e1ad6eddb93520c642099adba263a6cc7f42,0000000000000000000000000000000000000000..9008fa5279fd0249fbaba9cfcbb56c48fddd7776
mode 100644,000000..100644
--- 1/com.woltlab.wcf/template/benchmark.tpl
--- /dev/null
+++ b/com.woltlab.wcf/template/benchmark.tpl
@@@ -1,20 -1,0 +1,22 @@@
-       <ul id="benchmarkDetails" style="display: none; max-height: 500px; overflow: auto">
 +<p style="margin-top: 10px; font-size: .85em" 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()}</p>
 +
 +{if ENABLE_DEBUG_MODE}        
-                               WCF.showDialog('benchmarkDetails', true);
++      <ul id="benchmarkDetails" style="display: none;">
 +              {foreach from=$__wcf->getBenchmark()->getItems() item=item}
 +                      <li style="margin-bottom: 8px;"{if $item.use >= 0.01} class="hot"{/if}>{if $item.type == 1}(SQL Query) {/if}{$item.text}<br /><small style="font-size: .85em">Execution time: {@$item.use}s</small></li>
 +              {/foreach}
 +      </ul>
 +      
 +      <script type="text/javascript">
 +              //<![CDATA[
 +              $(function() {
 +                      $('#benchmark').click(function() {
++                              WCF.showDialog('benchmarkDetails', true, {
++                                      title: 'Log'
++                              });
 +                              return false;
 +                      });
 +              });
 +              //]]>
 +      </script>
 +{/if}

diff --cc wcfsetup/install/files/acp/style/style.css
Simple merge

diff --cc wcfsetup/install/files/acp/templates/benchmark.tpl
index 09c8e1ad6eddb93520c642099adba263a6cc7f42,0000000000000000000000000000000000000000..9008fa5279fd0249fbaba9cfcbb56c48fddd7776
mode 100644,000000..100644
--- 1/wcfsetup/install/files/acp/templates/benchmark.tpl
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/benchmark.tpl
@@@ -1,20 -1,0 +1,22 @@@
-       <ul id="benchmarkDetails" style="display: none; max-height: 500px; overflow: auto">
 +<p style="margin-top: 10px; font-size: .85em" 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()}</p>
 +
 +{if ENABLE_DEBUG_MODE}        
-                               WCF.showDialog('benchmarkDetails', true);
++      <ul id="benchmarkDetails" style="display: none;">
 +              {foreach from=$__wcf->getBenchmark()->getItems() item=item}
 +                      <li style="margin-bottom: 8px;"{if $item.use >= 0.01} class="hot"{/if}>{if $item.type == 1}(SQL Query) {/if}{$item.text}<br /><small style="font-size: .85em">Execution time: {@$item.use}s</small></li>
 +              {/foreach}
 +      </ul>
 +      
 +      <script type="text/javascript">
 +              //<![CDATA[
 +              $(function() {
 +                      $('#benchmark').click(function() {
++                              WCF.showDialog('benchmarkDetails', true, {
++                                      title: 'Log'
++                              });
 +                              return false;
 +                      });
 +              });
 +              //]]>
 +      </script>
 +{/if}