Ignore:
Timestamp:
2012-07-27T18:03:21+02:00 (21 months ago)
Author:
moo
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/htdocs/cacher/cacher.tpl.php

    r1058 r1063  
    3636        , th(N_("cache.blocksgraph")) 
    3737        , th(N_("cache.operations")) 
    38         , th(N_("cache.compiling")) 
     38        , th(N_("cache.status")) 
    3939        , th(N_("cache.hits")) 
    4040        , th(N_("cache.hits_graph")) 
     
    4242        , th(N_("cache.hits_avg_s")) 
    4343        , th(N_("cache.updates")) 
    44         , th(N_("cache.clogs")) 
     44        , th(N_("cache.skips")) 
    4545        , th(N_("cache.ooms")) 
    4646        , th(N_("cache.errors")) 
     
    5353    </tr> 
    5454    <?php 
    55     $numkeys = explode(',', 'slots,size,avail,hits,updates,clogs,ooms,errors,cached,deleted'); 
     55    $numkeys = explode(',', 'slots,size,avail,hits,updates,skips,ooms,errors,cached,deleted'); 
    5656    $l_clear = _('Clear'); 
    5757    $l_clear_confirm = _('Sure to clear?'); 
     
    8888 
    8989        if (!empty($ci['istotal'])) { 
    90             $ci['compiling']    = '-'; 
     90            $ci['status']       = '-'; 
    9191            $ci['can_readonly'] = '-'; 
    9292        } 
    9393        else { 
    94             $ci['compiling']    = $ci['type'] == $type_php ? ($ci['compiling'] ? 'yes' : 'no') : '-'; 
     94            if ($ci['type'] == $type_php) { 
     95            $ci['status'] = $ci['compiling'] ? sprintf(_('Compiling(%s)'), age($ci['compiling'])) : _('Normal'); 
     96            } 
     97            else { 
     98                $ci['status'] = '-'; 
     99            } 
    95100            $ci['can_readonly'] = $ci['can_readonly'] ? 'yes' : 'no'; 
    96101        } 
     
    115120            ></form 
    116121        ></td> 
    117         <td>{$ci['compiling']}</td> 
     122        <td>{$ci['status']}</td> 
    118123        <td>{$ci['hits']}</td> 
    119124        <td><div class="hitsgraph" style="width: {$hits_graph_h_w}px">{$hits_graph_h}</div></td> 
     
    121126        <td>{$hits_avg_s}</td> 
    122127        <td>{$ci['updates']}</td> 
    123         <td>{$ci['clogs']}</td> 
     128        <td>{$ci['skips']}</td> 
    124129        <td>{$ci['ooms']}</td> 
    125130        <td>{$ci['errors']}</td> 
Note: See TracChangeset for help on using the changeset viewer.