From 984a0213bdd387c062bc44a18ec012b0896db8c2 Mon Sep 17 00:00:00 2001
From: David Bezemer <info@davidbezemer.nl>
Date: Mon, 11 Aug 2014 20:01:05 +0200
Subject: [PATCH] Fix #52

---
 lang/en/theme_essential.php | 11 ++++++
 lib.php                     | 70 +++++++++++++++++++++++++++----------
 2 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/lang/en/theme_essential.php b/lang/en/theme_essential.php
index 66e56153..6cf34aed 100644
--- a/lang/en/theme_essential.php
+++ b/lang/en/theme_essential.php
@@ -94,6 +94,17 @@
 $string['perf_max'] = 'Detailed';
 $string['perf_min'] = 'Minimal';
 
+$string['perfinfoheading'] = 'Performance Information';
+$string['extperfinfoheading'] = 'Extended Performance Information';
+$string['loadtime'] = 'Load Time';
+$string['memused'] = 'Memory Used';
+$string['peakmem'] = 'Peak Memory';
+$string['included'] = 'Files Included';
+$string['dbqueries'] = 'DB Read/Write';
+$string['serverload'] = 'Server Load';
+$string['cachesused'] = 'Cached Used';
+$string['sessionsize'] = 'Session Size';
+
 $string['visibleadminonly'] = 'Blocks moved into the area below will only be seen by admins';
 $string['backtotop'] = 'Back to top';
 
diff --git a/lib.php b/lib.php
index 1e7b8f67..95f9410d 100644
--- a/lib.php
+++ b/lib.php
@@ -137,36 +137,70 @@ function essential_set_pagewidth($css, $pagewidth) {
  */
 function essential_performance_output($param, $perfinfo) {
     
-    $html = '<div class="container-fluid performanceinfo"><div class="row-fluid"><h2>Performance Information</h2></div><div class="row-fluid">';
-    if (isset($param['realtime'])) { 
-        $html .= '<div class="span3"><var id="load">'.round($param['realtime'], 2).' secs</var><span>Load Time</span></div>'; 
-    }
-    if (isset($param['memory_total'])) { 
-        $html .= '<div class="span3"><var id="memory">'.display_size($param['memory_total']).'</var><span>Memory Used</span></div>'; 
-    }
-    if (isset($param['includecount'])) { 
-        $html .= '<div class="span3"><var id="included">'.$param['includecount'].' Files </var><span>Included</span></div>'; 
+    $html  = html_writer::start_tag('div', array('class' => 'container-fluid performanceinfo'));
+    $html .= html_writer::start_tag('div', array('class' => 'row-fluid'));
+    $html .= html_writer::tag('h2', get_string('perfinfoheading', 'theme_essential'));
+    $html .= html_writer::end_tag('div');
+    $html .= html_writer::start_tag('div', array('class' => 'row-fluid'));
+    if (isset($param['realtime'])) {
+        $html .= html_writer::start_tag('div', array('class' => 'span3'));
+        $html .= html_writer::tag('var',round($param['realtime'], 2).' '.get_string('seconds'), array('id' => 'load'));
+        $html .= html_writer::span(get_string('loadtime', 'theme_essential'));
+        $html .= html_writer::end_tag('div');
+    }
+    if (isset($param['memory_total'])) {
+        $html .= html_writer::start_tag('div', array('class' => 'span3'));
+        $html .= html_writer::tag('var',display_size($param['memory_total']), array('id' => 'memory'));
+        $html .= html_writer::span(get_string('memused', 'theme_essential'));
+        $html .= html_writer::end_tag('div');
+    }
+    if (isset($param['includecount'])) {
+        $html .= html_writer::start_tag('div', array('class' => 'span3'));
+        $html .= html_writer::tag('var',$param['includecount'], array('id' => 'included'));
+        $html .= html_writer::span(get_string('included', 'theme_essential'));
+        $html .= html_writer::end_tag('div');
     }
     if (isset($param['dbqueries'])) { 
-        $html .= '<div class="span3"><var id="db">'.$param['dbqueries'].' </var><span>DB Read/Write</span></div>'; 
+        $html .= html_writer::start_tag('div', array('class' => 'span3'));
+        $html .= html_writer::tag('var',$param['dbqueries'], array('id' => 'db'));
+        $html .= html_writer::span(get_string('dbqueries', 'theme_essential'));
+        $html .= html_writer::end_tag('div');
     }
+    $html .= html_writer::end_tag('div');
     if ($perfinfo === "max") {
-        $html .= '</div><hr /><div class="row-fluid"><h2>Extended Performance Information</h2></div><div class="row-fluid">';
+        $html .= html_writer::empty_tag('hr');
+        $html .= html_writer::start_tag('div', array('class' => 'row-fluid'));
+        $html .= html_writer::tag('h2', get_string('extperfinfoheading', 'theme_essential'));
+        $html .= html_writer::end_tag('div');
+        $html .= html_writer::start_tag('div', array('class' => 'row-fluid'));
         if (isset($param['serverload'])) { 
-            $html .= '<div class="span3"><var id="load">'.$param['serverload'].' </var><span>Server Load</span></div>'; 
+            $html .= html_writer::start_tag('div', array('class' => 'span3'));
+            $html .= html_writer::tag('var',$param['serverload'], array('id' => 'load'));
+            $html .= html_writer::span(get_string('serverload', 'theme_essential'));
+            $html .= html_writer::end_tag('div');
          }
-        if (isset($param['memory_peak'])) { 
-            $html .= '<div class="span3"><var id="memory">'.display_size($param['memory_peak']).' </var><span>Peak Memory</span></div>'; 
+        if (isset($param['memory_peak'])) {
+            $html .= html_writer::start_tag('div', array('class' => 'span3'));
+            $html .= html_writer::tag('var',display_size($param['memory_peak']), array('id' => 'load'));
+            $html .= html_writer::span(get_string('peakmem', 'theme_essential'));
+            $html .= html_writer::end_tag('div');
          }
         if (isset($param['cachesused'])) { 
-            $html .= '<div class="span3"><var id="cache">'.$param['cachesused'].' </var><span>Caches Used</span></div>'; 
+            $html .= html_writer::start_tag('div', array('class' => 'span3'));
+            $html .= html_writer::tag('var',$param['cachesused'], array('id' => 'cache'));
+            $html .= html_writer::span(get_string('peakmem', 'theme_essential'));
+            $html .= html_writer::end_tag('div');
          }
         if (isset($param['sessionsize'])) { 
-            $html .= '<div class="span3"><var id="session">'.$param['sessionsize'].' </var><span>Session Size</span></div>'; 
+            $html .= html_writer::start_tag('div', array('class' => 'span3'));
+            $html .= html_writer::tag('var',$param['sessionsize'], array('id' => 'session'));
+            $html .= html_writer::span(get_string('sessionsize', 'theme_essential'));
+            $html .= html_writer::end_tag('div');
          }
+         $html .= html_writer::end_tag('div');
     }
-    $html .= '</div>';
-    $html .= '</div>';
+    $html .= html_writer::end_tag('div');
+    $html .= html_writer::end_tag('div');
 
     return $html;
 }