From 4a4f93ccb04287591844adaf7f76d78d6f989b5e Mon Sep 17 00:00:00 2001
From: Denis Shakhov <denis.shakhov@gmail.com>
Date: Sat, 5 Jun 2010 12:50:27 +0000
Subject: [PATCH] fix statistics performance

---
 templates/skin/developer/css/style.css        | 10 ++-
 .../skin/developer/statistics_performance.tpl | 61 ++++++++-----------
 templates/skin/developer/topic.tpl            |  2 +-
 templates/skin/new/css/style.css              |  6 ++
 templates/skin/new/statistics_performance.tpl | 61 ++++++++-----------
 5 files changed, 64 insertions(+), 76 deletions(-)

diff --git a/templates/skin/developer/css/style.css b/templates/skin/developer/css/style.css
index 9803a502..e7cbb881 100644
--- a/templates/skin/developer/css/style.css
+++ b/templates/skin/developer/css/style.css
@@ -368,9 +368,13 @@ p { margin-bottom: 18px; }
 
 
 
-
-
-
+/* --------------------------------------------------------------
+	!STAT
+-------------------------------------------------------------- */
+.stat-performance { padding: 20px; background: #f0f7fd; border-top: 1px solid #d1e7f9; color: #333; }
+.stat-performance table { margin-top: 15px; }
+.stat-performance table td { width: 200px; vertical-align: top; }
+.stat-performance h4 { font-weight: bold; color: #81B2DB; }
 
 
 
diff --git a/templates/skin/developer/statistics_performance.tpl b/templates/skin/developer/statistics_performance.tpl
index ff46d3b3..7c133fbd 100644
--- a/templates/skin/developer/statistics_performance.tpl
+++ b/templates/skin/developer/statistics_performance.tpl
@@ -1,38 +1,27 @@
 {if $bIsShowStatsPerformance and $oUserCurrent and $oUserCurrent->isAdministrator()}
-<fieldset>
-<legend>Statistics performance</legend>
-<table>
-	<tr align="top">
-		<td align="top">
-		<ul>
-	<li>
-	<b>MySql</b> <br>
-	&nbsp;&nbsp;&nbsp;query: {$aStatsPerformance.sql.count}<br>
-	&nbsp;&nbsp;&nbsp;time: {$aStatsPerformance.sql.time}<br><br><br>
-	</li>
-	</ul>
-		</td>
-		<td>
-		<ul>
-	<li>
-	<b>Cache</b> <br>
-	&nbsp;&nbsp;&nbsp;query: {$aStatsPerformance.cache.count}<br>
-	&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; set: {$aStatsPerformance.cache.count_set}<br>
-	&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; get: {$aStatsPerformance.cache.count_get}<br>
-	&nbsp;&nbsp;&nbsp;time: {$aStatsPerformance.cache.time}
-	</li>
-	</ul>
-		</td>
-		<td align="top">
-		<ul>
-	<li>
-	<b>PHP</b> <br>	
-	&nbsp;&nbsp;&nbsp;time load modules:{$aStatsPerformance.engine.time_load_module}<br>
-	&nbsp;&nbsp;&nbsp;full time:{$iTimeFullPerformance}<br><br><br>
-	</li>
-	</ul>
-		</td>
-	</tr>
-</table>
-</fieldset>
+	<div class="stat-performance">
+		<h2>Statistics performance</h2>
+		
+		<table>
+			<tr>
+				<td>
+					<h4>MySql</h4>
+					query: <strong>{$aStatsPerformance.sql.count}</strong><br />
+					time: <strong>{$aStatsPerformance.sql.time}</strong>
+				</td>
+				<td>
+					<h4>Cache</h4>
+					query: <strong>{$aStatsPerformance.cache.count}</strong><br />
+					&mdash; set: <strong>{$aStatsPerformance.cache.count_set}</strong><br />
+					&mdash; get: <strong>{$aStatsPerformance.cache.count_get}</strong><br />
+					time: <strong>{$aStatsPerformance.cache.time}</strong>
+				</td>
+				<td>
+					<h4>PHP</h4>	
+					time load modules: <strong>{$aStatsPerformance.engine.time_load_module}</strong><br />
+					full time: <strong>{$iTimeFullPerformance}</strong>
+				</td>
+			</tr>
+		</table>
+	</div>
 {/if}
\ No newline at end of file
diff --git a/templates/skin/developer/topic.tpl b/templates/skin/developer/topic.tpl
index 2a346118..31a086b2 100644
--- a/templates/skin/developer/topic.tpl
+++ b/templates/skin/developer/topic.tpl
@@ -29,7 +29,7 @@
 	<div class="content">
 		{if $oTopic->getType()=='question'}
 			<div id="topic_question_area_{$oTopic->getId()}" class="poll">
-				{if !$oTopic->getUserQuestionIsVote()} {* Если пользователь еще не участвовал в голосовании *}	
+				{if !$oTopic->getUserQuestionIsVote()}
 					<ul class="poll-vote">
 						{foreach from=$oTopic->getQuestionAnswers() key=key item=aAnswer}
 							<li><label><input type="radio" id="topic_answer_{$oTopic->getId()}_{$key}" name="topic_answer_{$oTopic->getId()}" value="{$key}" onchange="$('topic_answer_{$oTopic->getId()}_value').setProperty('value',this.value);" /> {$aAnswer.text|escape:'html'}</label></li>
diff --git a/templates/skin/new/css/style.css b/templates/skin/new/css/style.css
index 6c6167a5..4f63b56c 100644
--- a/templates/skin/new/css/style.css
+++ b/templates/skin/new/css/style.css
@@ -818,6 +818,12 @@ table.admin_page td  {  /* IE: */ border-left: expression(previousSibling == nul
 .hidden {display: none;}
 
 
+/* Stat
+-------------------------------------------------------------------*/ 
+.stat-performance { padding: 20px; background: #f0f7fd; border-top: 1px solid #d1e7f9; color: #333; }
+.stat-performance table { margin-top: 15px; }
+.stat-performance table td { width: 200px; vertical-align: top; }
+.stat-performance h4 { font-weight: bold; color: #81B2DB; }
 
 
 
diff --git a/templates/skin/new/statistics_performance.tpl b/templates/skin/new/statistics_performance.tpl
index ff46d3b3..7c133fbd 100644
--- a/templates/skin/new/statistics_performance.tpl
+++ b/templates/skin/new/statistics_performance.tpl
@@ -1,38 +1,27 @@
 {if $bIsShowStatsPerformance and $oUserCurrent and $oUserCurrent->isAdministrator()}
-<fieldset>
-<legend>Statistics performance</legend>
-<table>
-	<tr align="top">
-		<td align="top">
-		<ul>
-	<li>
-	<b>MySql</b> <br>
-	&nbsp;&nbsp;&nbsp;query: {$aStatsPerformance.sql.count}<br>
-	&nbsp;&nbsp;&nbsp;time: {$aStatsPerformance.sql.time}<br><br><br>
-	</li>
-	</ul>
-		</td>
-		<td>
-		<ul>
-	<li>
-	<b>Cache</b> <br>
-	&nbsp;&nbsp;&nbsp;query: {$aStatsPerformance.cache.count}<br>
-	&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; set: {$aStatsPerformance.cache.count_set}<br>
-	&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; get: {$aStatsPerformance.cache.count_get}<br>
-	&nbsp;&nbsp;&nbsp;time: {$aStatsPerformance.cache.time}
-	</li>
-	</ul>
-		</td>
-		<td align="top">
-		<ul>
-	<li>
-	<b>PHP</b> <br>	
-	&nbsp;&nbsp;&nbsp;time load modules:{$aStatsPerformance.engine.time_load_module}<br>
-	&nbsp;&nbsp;&nbsp;full time:{$iTimeFullPerformance}<br><br><br>
-	</li>
-	</ul>
-		</td>
-	</tr>
-</table>
-</fieldset>
+	<div class="stat-performance">
+		<h2>Statistics performance</h2>
+		
+		<table>
+			<tr>
+				<td>
+					<h4>MySql</h4>
+					query: <strong>{$aStatsPerformance.sql.count}</strong><br />
+					time: <strong>{$aStatsPerformance.sql.time}</strong>
+				</td>
+				<td>
+					<h4>Cache</h4>
+					query: <strong>{$aStatsPerformance.cache.count}</strong><br />
+					&mdash; set: <strong>{$aStatsPerformance.cache.count_set}</strong><br />
+					&mdash; get: <strong>{$aStatsPerformance.cache.count_get}</strong><br />
+					time: <strong>{$aStatsPerformance.cache.time}</strong>
+				</td>
+				<td>
+					<h4>PHP</h4>	
+					time load modules: <strong>{$aStatsPerformance.engine.time_load_module}</strong><br />
+					full time: <strong>{$iTimeFullPerformance}</strong>
+				</td>
+			</tr>
+		</table>
+	</div>
 {/if}
\ No newline at end of file