Changeset 1063 for trunk/htdocs/cacher/cacher.tpl.php

Timestamp:

2012-07-27T18:03:21+02:00 (10 months ago)

Author:

moo

Message:

htdocs/cacher: clogs->skips, compiling ad part of status

File:

• trunk/htdocs/cacher/cacher.tpl.php (modified) (6 diffs)

trunk/htdocs/cacher/cacher.tpl.php

@@ -36 +36 @@
         , th(N_("cache.blocksgraph"))
         , th(N_("cache.operations"))
-        , th(N_("cache.compiling"))
+        , th(N_("cache.status"))
         , th(N_("cache.hits"))
         , th(N_("cache.hits_graph"))
@@ -42 +42 @@
         , th(N_("cache.hits_avg_s"))
         , th(N_("cache.updates"))
-        , th(N_("cache.clogs"))
+        , th(N_("cache.skips"))
         , th(N_("cache.ooms"))
         , th(N_("cache.errors"))
@@ -53 +53 @@
     </tr>
     <?php
-    $numkeys = explode(',', 'slots,size,avail,hits,updates,clogs,ooms,errors,cached,deleted');
+    $numkeys = explode(',', 'slots,size,avail,hits,updates,skips,ooms,errors,cached,deleted');
     $l_clear = _('Clear');
     $l_clear_confirm = _('Sure to clear?');
@@ -88 +88 @@
 
         if (!empty($ci['istotal'])) {
-            $ci['compiling']    = '-';
+            $ci['status']       = '-';
             $ci['can_readonly'] = '-';
         }
         else {
-            $ci['compiling']    = $ci['type'] == $type_php ? ($ci['compiling'] ? 'yes' : 'no') : '-';
+            if ($ci['type'] == $type_php) {
+            $ci['status'] = $ci['compiling'] ? sprintf(_('Compiling(%s)'), age($ci['compiling'])) : _('Normal');
+            }
+            else {
+                $ci['status'] = '-';
+            }
             $ci['can_readonly'] = $ci['can_readonly'] ? 'yes' : 'no';
         }
@@ -115 +120 @@
             ></form
         ></td>
-        <td>{$ci['compiling']}</td>
+        <td>{$ci['status']}</td>
         <td>{$ci['hits']}</td>
         <td><div class="hitsgraph" style="width: {$hits_graph_h_w}px">{$hits_graph_h}</div></td>
@@ -121 +126 @@
         <td>{$hits_avg_s}</td>
         <td>{$ci['updates']}</td>
-        <td>{$ci['clogs']}</td>
+        <td>{$ci['skips']}</td>
         <td>{$ci['ooms']}</td>
         <td>{$ci['errors']}</td>