Changeset 526 for trunk/admin

Timestamp:

02/18/2008 01:28:31 PM (11 months ago)

Author:

moo

Message:

allow user decide to show used or free blocks/percent

Location:

trunk/admin

Files:

• common-zh-simplified-utf-8.lang.php (modified) (1 diff)
• common-zh-traditional-utf-8.lang.php (modified) (1 diff)
• common.php (modified) (1 diff)
• config.php.example (modified) (1 diff)
• xcache.css (modified) (1 diff)
• xcache.php (modified) (2 diffs)
• xcache.tpl.php (modified) (3 diffs)

trunk/admin/common-zh-simplified-utf-8.lang.php

@@ -24 +24 @@
         'Compiling'
         => '编译中',
-        '%'
-        => '%',
+        '% Free'
+        => '% 剩余',
+        '% Used'
+        => '% 已用',
         'Hits'
         => '命中',

trunk/admin/common-zh-traditional-utf-8.lang.php

@@ -24 +24 @@
         'Compiling'
         => '編譯中',
-        '%'
-        => '%',
+        '% Free'
+        => '% 剩余',
+        '% Used'
+        => '% 已用',
         'Hits'
         => '命中',

trunk/admin/common.php

@@ -109 +109 @@
     $lang = 'en-us';
 }
-if (!isset($free_graph_width)) {
-    $free_graph_width = 120;
+if (!isset($usage_graph_width) && !isset($free_graph_width)) {
+    $usage_graph_width = 120;
 }
+$graph_width = isset($free_graph_width) ? $free_graph_width : $usage_graph_width;
 
 ?>

trunk/admin/config.php.example

@@ -12 +12 @@
 $show_todo_strings = false;
 
-// width of graph for free blocks
-$free_graph_width = 120;
+// width of graph for free or usage blocks
+$usage_graph_width = 120;
+// do not define both with
+// $free_graph_width = 120;
 
 // this function is detected by xcache.tpl.php, and enabled if function_exists

trunk/admin/xcache.css

@@ -20 +20 @@
 form {margin: 0; padding: 0}
 
-.percent { height: 3px; margin-bottom: 1px; background: gray; border: 1px solid gray; border-top: 0px; border-bottom: 0px; }
+.percent { height: 3px; margin-bottom: 1px; background: gray; border: 1px solid gray; }
 .percent div { float: left; height: 100%; }
-.percent .pavail { background: green; }
+.percent .pvalue { background: limegreen; }
 
-.freeblockgraph { height: 16px; }
-.freeblockgraph div { float: left; height: 3px; width: 4px; border: solid gray; border-width: 0 0px 1px 0; }
-.freeblockgraph { border: 1px solid gray; border-bottom: 0px; }
+.blocksgraph { height: 16px; }
+.blocksgraph div { float: left; height: 3px; width: 4px; border: solid gray; border-width: 0 0px 1px 0; }
+.blocksgraph { border: 1px solid gray; border-bottom: 0px; }
 
 .hitsgraph { height: 20px; border: solid gray; border-width: 1px 0 1px 0; margin: auto; }

trunk/admin/xcache.php

@@ -77 +77 @@
 function freeblock_to_graph($freeblocks, $size)
 {
-    global $free_graph_width;
+    global $graph_width, $usage_graph_width, $free_graph_width;
 
     // cached in static variable
     static $graph_initial;
     if (!isset($graph_initial)) {
-        for ($i = 0; $i < $free_graph_width; $i ++) {
-            $graph_initial[$i] = 0;
-        }
+        $graph_initial = array_fill(0, $graph_width, 0);
     }
     $graph = $graph_initial;
     foreach ($freeblocks as $b) {
-        $begin = $b['offset'] / $size * $free_graph_width;
-        $end = ($b['offset'] + $b['size']) / $size * $free_graph_width;
+        $begin = $b['offset'] / $size * $graph_width;
+        $end = ($b['offset'] + $b['size']) / $size * $graph_width;
 
         if ((int) $begin == (int) $end) {
@@ -106 +104 @@
     $c = 255;
     foreach ($graph as $k => $v) {
+        if (!isset($free_graph_width)) {
+            $v = 1 - $v;
+        }
         $v = (int) ($v * $c);
         $r = $g = $c - $v;

trunk/admin/xcache.tpl.php

@@ -31 +31 @@
         <th><?php echo _T('Size'); ?></th>
         <th><?php echo _T('Avail'); ?></th>
-        <th><?php echo _T('%'); ?></th>
+        <th><?php echo _T(isset($free_graph_width) ? '% Free' : '% Used'); ?></th>
         <th><?php echo _T('Clear'); ?></th>
         <th><?php echo _T('Compiling'); ?></th>
@@ -54 +54 @@
         echo "
         <tr ", $a->next(), ">";
-        $pavail = (int) ($ci['avail'] / $ci['size'] * 100);
-        $pused = 100 - $pavail;
-
-        $w = $free_graph_width;
+        $pvalue = (int) ($ci['avail'] / $ci['size'] * 100);
+        $pempty = 100 - $pvalue;
+        if (!isset($free_graph_width)) {
+            // swap
+            $tmp = $pvalue;
+            $pvalue = $pempty;
+            $pempty = $tmp;
+        }
+
+        $w = $graph_width;
         $tdwidth = $w + 2;
         if (empty($ci['istotal'])) {
             $graph = freeblock_to_graph($ci['free_blocks'], $ci['size']);
-            $freeblockgraph = "<div class=\"freeblockgraph\" style=\"width: {$w}px\">{$graph}</div>";
+            $blocksgraph = "<div class=\"blocksgraph\" style=\"width: {$w}px\">{$graph}</div>";
         }
         else {
-            $freeblockgraph = '';
+            $blocksgraph = '';
         }
 
@@ -90 +96 @@
         <td title="{$ci['size']}">{$ci_size}</td>
         <td title="{$ci['avail']}">{$ci_avail}</td>
-        <td title="{$pavail} %" width="{$tdwidth}"
+        <td title="{$pvalue} %" width="{$tdwidth}"
             ><div class="percent" style="width: {$w}px"
-                ><div style="width: {$pavail}%" class="pavail"></div
-                ><div style="width: {$pused}%" class="pused"></div
+                ><div style="width: {$pvalue}%" class="pvalue"></div
+                ><div style="width: {$pempty}%" class="pempty"></div
             ></div
-        >{$freeblockgraph}</td>
+        >{$blocksgraph}</td>
         <td
             ><form method="post"