From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 25 Nov 2011 18:24:28 +0000 (+0100)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~1566
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=94f17e75f5d971c7d776c68005c7b55f8359da5c;p=GitHub%2FWoltLab%2FWCF.git

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

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

94f17e75f5d971c7d776c68005c7b55f8359da5c
diff --cc com.woltlab.wcf/template/benchmark.tpl
index 09c8e1ad6e,0000000000..9008fa5279
mode 100644,000000..100644
--- a/com.woltlab.wcf/template/benchmark.tpl
+++ b/com.woltlab.wcf/template/benchmark.tpl
@@@ -1,20 -1,0 +1,22 @@@
 +<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}	
- 	<ul id="benchmarkDetails" style="display: none; max-height: 500px; overflow: auto">
++	<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);
++				WCF.showDialog('benchmarkDetails', true, {
++					title: 'Log'
++				});
 +				return false;
 +			});
 +		});
 +		//]]>
 +	</script>
 +{/if}
diff --cc wcfsetup/install/files/acp/templates/benchmark.tpl
index 09c8e1ad6e,0000000000..9008fa5279
mode 100644,000000..100644
--- a/wcfsetup/install/files/acp/templates/benchmark.tpl
+++ b/wcfsetup/install/files/acp/templates/benchmark.tpl
@@@ -1,20 -1,0 +1,22 @@@
 +<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}	
- 	<ul id="benchmarkDetails" style="display: none; max-height: 500px; overflow: auto">
++	<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);
++				WCF.showDialog('benchmarkDetails', true, {
++					title: 'Log'
++				});
 +				return false;
 +			});
 +		});
 +		//]]>
 +	</script>
 +{/if}