Changeset 1068


Ignore:
Timestamp:
2012-07-28T08:08:38+02:00 (2 years ago)
Author:
moo
Message:

htdocs: blue skin

Location:
trunk/htdocs
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/htdocs/cacher/cacher.css

    r1053 r1068  
    11td, th { white-space: pre; } 
    2 .phpinfo table { border: 1px solid black; margin-bottom: 1px; } 
    3 .phpinfo table th, .phpinfo table td { border: 1px solid black; } 
    4 .phpinfo table th { font-weight: bold; } 
    5 .phpinfo .e {background-color: #ccccff; font-weight: bold; color: #000000;} 
    6 .phpinfo .h {background-color: #9999cc; font-weight: bold; color: #000000;} 
    7 .phpinfo .v {background-color: #cccccc; color: #000000;} 
    8 .button { } 
    9 span.sortarrow { color: white; text-decoration: none; } 
    10 form {margin: 0; padding: 0} 
    112 
    123.percent { height: 3px; margin-bottom: 1px; border: 1px solid gray; } 
     
    145.pvalue { background: limegreen; } 
    156 
    16 .blocksgraph { height: 16px; } 
    17 .blocksgraph div { float: left; height: 3px; width: 4px; border: solid gray; border-width: 0 0px 1px 0; } 
    18 .blocksgraph { border: 1px solid gray; border-bottom: 0px; } 
     7.blocksgraph { height: 13px; } 
     8.blocksgraph div { float: left; height: 3px; width: 4px; border: solid gray; border-width: 0 0 1px 0; } 
     9.blocksgraph { border: 1px solid gray; border-bottom: 0; } 
     10.percent *, .blocksgraph *, .hitsgraph * { font-size: 1px; font-height: 1px; } 
    1911 
    20 .hitsgraph { height: 20px; margin: auto; } 
     12.hitsgraph { margin: auto; } 
    2113.hitsgraph div { float: left; width: 2px; height: 100%; } 
    2214.hitsgraph div:hover { background: gray; } 
    2315.hitsgraph div div { float: none; width: 100%; } 
    24 .hitsgraph div div.barf { border: 0px solid gray; border-width: 1px 0 0 0; } 
    25 .hitsgraph div div.barv { border: 0px solid gray; border-width: 0 0 1px 0; } 
     16.hitsgraph div div.barf { border: 0 solid gray; border-width: 1px 0 0 0; } 
     17.hitsgraph div div.barv { border: 0 solid gray; border-width: 0 0 1px 0; } 
    2618.hitsgraph div div.barf.active { border-color: yellow; } 
    2719.hitsgraph div div.barv.active { border-color: yellow; } 
     
    3123dt { font-weight: bold; clear: both; float: left; width: 100px; text-align: right; margin: 0; } 
    3224dd { margin: 0; } 
    33 .blockarea { overflow: hidden; _width: 1px; } 
     25.blockarea { overflow: hidden; width: 400px; } 
    3426div.legend { float: left; border: 1px solid gray; font: 12px/12px monospace; } 
    3527div.legendtitle { float: left; padding: 2px; padding-right: 10px; font: 12px/12px monospace; } 
  • trunk/htdocs/cacher/cacher.php

    r1066 r1068  
    3434        if ($config['percent_graph_type'] != 'free') { 
    3535            $v = 1 - $v; 
     36        } 
     37        if ($k % 30 == 0) { 
     38            $v = 1; 
    3639        } 
    3740        $v = (int) ($v * $c); 
     
    8689    $percent = (int) ($percent * 100); 
    8790    $a = $active ? ' active' : ''; 
     91    $height = 20; 
     92    $valueHeight = ceil($height * $percent / 100); 
     93    $paddingHeight = $height - $valueHeight; 
     94    $valueHeight = $valueHeight ? $valueHeight . "px" : 0; 
     95    $paddingHeight = $paddingHeight ? $paddingHeight . "px" : 0; 
    8896    return '<div title="' . $v . '">' 
    89         . '<div class="barf' . $a . '" style="height: ' . (100 - $percent) . '%"></div>' 
    90         . '<div class="barv' . $a . '" style="background: rgb(' . "$r,$g,$b" . '); height: ' . $percent . '%"></div>' 
     97        . '<div class="barf' . $a . '" style="height: ' . $paddingHeight . '"></div>' 
     98        . '<div class="barv' . $a . '" style="background: rgb(' . "$r,$g,$b" . '); height: ' . $valueHeight . '"></div>' 
    9199        . '</div>'; 
    92100} 
  • trunk/htdocs/cacher/cacher.tpl.php

    r1066 r1068  
    1010<table cellspacing="0" cellpadding="4" class="cycles caches"> 
    1111    <caption><?php echo _('Caches'); ?></caption> 
    12     <col /> 
    13     <col align="right" /> 
    14     <col align="right" /> 
    15     <col align="right" /> 
    16     <col /> 
    17     <col /> 
    18     <col align="right" /> 
    19     <col align="right" /> 
    20     <col align="right" /> 
    21     <col /> 
    22     <col align="right" /> 
    23     <col align="right" /> 
    24     <col align="right" /> 
    25     <col align="right" /> 
    26     <col align="right" /> 
    27     <col align="right" /> 
    28     <col align="right" /> 
    29     <col /> 
    3012    <tr <?php echo $a->next(); ?>> 
    3113    <?php echo 
     
    7355        } 
    7456 
    75         $w = $config['percent_graph_width']; 
     57        $w = $config['percent_graph_width'] + 2; 
    7658        if (empty($ci['istotal'])) { 
    7759            $graph = freeblock_to_graph($ci['free_blocks'], $ci['size']); 
     
    11597        echo <<<EOS 
    11698        <th>{$ci['cache_name']}</th> 
    117         <td title="{$ci['slots']}">{$ci_slots}</td> 
    118         <td title="{$ci['size']}">{$ci_size}</td> 
    119         <td title="{$ci['avail']}">{$ci_avail}</td> 
     99        <td align="right" title="{$ci['slots']}">{$ci_slots}</td> 
     100        <td align="right" title="{$ci['size']}">{$ci_size}</td> 
     101        <td align="right" title="{$ci['avail']}">{$ci_avail}</td> 
    120102        <td title="{$pvalue} %" 
    121103            ><div class="percent" style="width: {$w}px" 
     
    135117        ></td> 
    136118        <td>{$ci['status']}</td> 
    137         <td>{$ci['hits']}</td> 
     119        <td align="right">{$ci['hits']}</td> 
    138120        <td><div class="hitsgraph" style="width: {$hits_graph_h_w}px">{$hits_graph_h}</div></td> 
    139         <td>{$hits_avg_h}</td> 
    140         <td>{$hits_avg_s}</td> 
    141         <td>{$ci['updates']}</td> 
    142         <td>{$ci['skips']}</td> 
    143         <td>{$ci['ooms']}</td> 
    144         <td>{$ci['errors']}</td> 
     121        <td align="right">{$hits_avg_h}</td> 
     122        <td align="right">{$hits_avg_s}</td> 
     123        <td align="right">{$ci['updates']}</td> 
     124        <td align="right">{$ci['skips']}</td> 
     125        <td align="right">{$ci['ooms']}</td> 
     126        <td align="right">{$ci['errors']}</td> 
    145127        <td>{$ci['can_readonly']}</td> 
    146         <td>{$ci['cached']}</td> 
    147         <td>{$ci['deleted']}</td> 
    148         <td>{$ci['gc']}</td> 
     128        <td align="right">{$ci['cached']}</td> 
     129        <td align="right">{$ci['deleted']}</td> 
     130        <td align="right">{$ci['gc']}</td> 
    149131EOS; 
    150132 
     
    173155 
    174156    <form action="" method="post"> 
    175     <table cellspacing="0" cellpadding="4" class="cycles entries" width="100%"> 
     157    <table cellspacing="0" cellpadding="4" class="cycles entries"> 
    176158        <caption><?php echo _("{$cachelist['type_name']} $listname"); ?></caption> 
    177159        <?php 
     
    188170            else { 
    189171                echo 
    190                     th("entry.remove", 'width="20"') 
     172                    th("entry.remove") 
    191173                    ; 
    192174            } 
     
    312294    ob_end_flush(); 
    313295} 
    314 if (ini_get("xcache.test")) { 
     296if ($moduleinfo) { 
     297    if (ini_get("xcache.test")) { 
    315298?> 
    316299<form method="post" action="" 
     
    320303></form> 
    321304<?php 
    322 } 
    323 if ($moduleinfo) { 
     305    } 
    324306    $t_moduleinfo = _("Module Info"); 
    325307    echo <<<HTML 
  • trunk/htdocs/common/common.css

    r1054 r1068  
    1 table.cycles { border: 1px solid black; margin-top: 5px; margin-bottom: 5px; } 
    2 table.cycles .col1 { background-color: #f5f5f5; } 
    3 table.cycles .col2 { background-color: #e0e0e0; } 
    4 table.cycles th, table.cycles td { border: 1px solid black; font-family: monospace; } 
    5 table.cycles th { background-color: #9999cc; color: black; font-weight: bold; height: 20px; line-height: 20px; font-family: serif; } 
    6 th a { color: black; font-weight: bold; display: block; width: 100%; height: 100%; } 
     1* { 
     2    box-sizing: border-box; 
     3    -moz-box-sizing: border-box; 
     4} 
     5body { 
     6    background: white; 
     7    color: black; 
     8    margin: 0; 
     9    padding: 0; 
     10    font-family: arial; 
     11    font-size: 12pt; 
     12} 
     13form { 
     14    margin: 0; 
     15    padding: 0; 
     16} 
     17a:link 
     18, a:visited { 
     19    color: #0066CC; 
     20} 
     21a:link:hover 
     22, a:visited:hover { 
     23    color: #BB0000; 
     24} 
     25a:link:active 
     26, a:visited:active { 
     27    color: red; 
     28} 
     29#header { 
     30    background: #5084D5; 
     31    position: relative; 
     32    height: 51px; 
     33    color: #d0d0d0; 
     34} 
     35h1, h2, h3, h4, h5, h6 { 
     36    margin-bottom: 2px; 
     37} 
     38#header #banner { 
     39    font: 32px/51px serif; 
     40    padding-left: 10px; 
     41    color: white; 
     42    font-family: "arial", serif; 
     43} 
     44#header #mainnav { 
     45    top: 3px; 
     46    right: 5px; 
     47    font-size: 16px; 
     48    line-height: 16px; 
     49    position: absolute; 
     50} 
     51#header #mainnav a { 
     52    font-size: 14px; 
     53} 
     54#header #subnav { 
     55    bottom: 0; 
     56    right: 5px; 
     57    position: absolute; 
     58    font-size: 28px; 
     59    line-height: 28px; 
     60} 
     61#header #subnav a { 
     62    font-size: 24px; 
     63} 
     64#header #nav { 
     65    font-family: "arial", serif; 
     66} 
     67#header #mainnav a:link, #header #mainnav a:visited { 
     68    color: black; 
     69} 
     70#header #mainnav a:active, #header #mainnav a:hover { 
     71    color: red; 
     72} 
     73#headerbase { 
     74    background: #1163BC; 
     75    border: 1px solid #334C66; 
     76    border-width: 1px 0 1px 0; 
     77    margin-bottom: 10px; 
     78    font: 12px/12px serif; 
     79} 
     80#main table { 
     81    font-size: 12px; 
     82    border: 1px solid #334C66; 
     83    border-top-width: 0; 
     84} 
     85#main table caption { 
     86    background: #1163BC; 
     87    color: white; 
     88    line-height: 20px; 
     89    border: 1px solid #334C66; 
     90    border-bottom-width: 0; 
     91    padding: 0; 
     92} 
     93#main table tfoot { 
     94    background: #1163BC; 
     95} 
     96#main table th { 
     97    background: #E7E7FF; 
     98    color: black; 
     99} 
     100#main table td { 
     101    vertical-align: top; 
     102} 
     103#main { 
     104    margin: 20px; 
     105} 
     106#note { 
     107    font-size: 11.9px; 
     108} 
     109#footer { 
     110    bottom: 0px; 
     111    background: #E7E7FF; 
     112    border-top: 1px solid gray; 
     113} 
     114#poweredBy { 
     115    overflow: hidden; 
     116} 
     117#footer { 
     118    clear: both; 
     119    height: 40px; 
     120    position: relative; 
     121} 
     122#footer img { 
     123    margin-top: 2px; 
     124    margin-left: 2px; 
     125    border: 0; 
     126} 
     127#poweredBy h3 { 
     128    float: right; 
     129    margin-right: 20px; 
     130    margin-top: 20px; 
     131} 
     132#poweredBy h3 { 
     133    margin: 0; 
     134    font-size: 12px; 
     135    position: absolute; 
     136    bottom: 8px; 
     137    right: 8px; 
     138} 
     139.phpinfo table { border: 1px solid black; margin-bottom: 1px; } 
     140.phpinfo table th, .phpinfo table td { border: 1px solid black; } 
     141.phpinfo table th { font-weight: bold; } 
     142.phpinfo .e {background: #81BBF2; font-weight: bold; color: #000000;} 
     143#main .phpinfo .h th {background: #5084D5; font-weight: bold; color: #000000;} 
     144.phpinfo .v {color: #000000;} 
     145.button { } 
     146span.sortarrow { color: white; text-decoration: none; } 
     147table.cycles { border: 1px solid #334C66; margin-bottom: 5px; } 
     148table.cycles .col1 { background: #f5f5f5; } 
     149table.cycles .col2 { background: #e0e0e0; } 
     150table.cycles th, table.cycles td { border: 1px solid #334C66; font-family: monospace; } 
     151#main table.cycles caption { color: white; font-weight: bold; height: 24px; line-height: 24px; font-family: serif; } 
     152#main table.cycles th { background: #81BBF2; color: #334C66; font-weight: bold; height: 20px; line-height: 20px; font-family: serif; } 
     153#main table.cycles th.h { background: #5084D5; } 
     154th.h a:visited 
     155, th.h a:link { color: black; } 
     156th.h a:hover { color: #BB0000; } 
     157th.h a:active { color: red; } 
     158th a { font-weight: bold; display: block; width: 100%; height: 100%; } 
    7159th { font-size: 12px; } 
    8160input, table { font-family: sans-serif; } 
    9161input { font-size: 12px; } 
    10162table { border-collapse: collapse; font-size: 11px; margin: 0; } 
    11 table caption, h2, h3 { font-size: 16px; font-weight: bold; text-align: left; padding-top: 20px; margin-bottom: 2px; } 
    12 h3 { font-size: 14px; padding-top: 2px; margin-bottom: 0px; } 
     163table caption { 
     164    font-size: 14px; 
     165    font-weight: bold; 
     166} 
    13167 
    14 h1 { text-align: center; display: block; } 
    15 .switcher { text-align: center; display: block; padding: 2px 0 2px 0; } 
    16 .switcher a { color: blue; padding: 1px 8px 1px 8px; border: 1px solid white; border-bottom-color: black; text-decoration: none; } 
    17 .switcher a:hover.active 
    18 , .switcher a:active.active 
    19 , .switcher a.active { color: black; background: #99C; border-color: #99C; border-left-color: black; border-right-color: black; } 
    20 .switcher a:hover { background: #f0f0f0; } 
    21 .switcher a:active { background: #e0e0e0; } 
    22  
    23 .footnote { text-align: right; font-size: 12px; } 
     168a { 
     169    text-decoration: none; 
     170} 
     171#main table td { 
     172    vertical-align: middle; 
     173} 
     174.switcher a { color: black; padding: 1px 8px 1px 8px; border: 1px solid white; } 
     175.switcher a { border-color: white; border-bottom-color: #334C66; } 
     176#nav .switcher a { border-color: #5084D5; border-bottom-color: #334C66; } 
     177#nav .switcher a.active, .switcher a.active { color: white; background: #1163BC; border-color: #334C66; border-bottom-color: #1163BC; } 
     178#nav .switcher a:hover.active, .switcher a:hover.active { background: #81BBF2; } 
     179.switcher a:hover { background: #81BBF2; } 
     180#nav .switcher a:active, .switcher a:active { background: #81BBF2; } 
  • trunk/htdocs/common/common.php

    r1063 r1068  
    4141} 
    4242 
    43 function moduleswitcher() 
     43function mainnav() 
     44{ 
     45    foreach (array( 
     46                "http://xcache.lighttpd.net/" => "XCache", 
     47                "http://www.php.net/" => "PHP", 
     48                "http://www.lighttpd.net/" => "LIGHTTPD", 
     49                ) as $url => $title) { 
     50        $html[] = sprintf('<a href="%s" target="_blank">%s</a>', $url, $title); 
     51    } 
     52    return implode('|', $html); 
     53} 
     54 
     55function subnav() 
    4456{ 
    4557    global $module, $modules; 
     
    5870    } 
    5971    list($text, $title) = explode('|', $translated, 2); 
    60     return sprintf('%s<th%s id="%s" title="%s"><a href="javascript:" onclick="resort(this); return false">%s</a></th>%s' 
     72    return sprintf('%s<th%s id="%s" class="h" title="%s"><a href="javascript:" onclick="resort(this); return false">%s</a></th>%s' 
    6173            , "\t" 
    6274            , $attrs ? " $attrs" : "" 
     
    254266header("Cache-Control: no-cache, must-revalidate"); 
    255267header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
     268header("Content-Type: text/html; " . $GLOBALS['config']['charset']); 
     269header("Content-Language: " . $GLOBALS['config']['lang']); 
    256270 
    257271?> 
  • trunk/htdocs/common/footer.tpl.php

    r1053 r1068  
    1 <div class="footnote"> 
    2 PHP <?php 
     1</div> 
     2<div id="footer"> 
     3    <a href="http://validator.w3.org/check?uri=referer"> 
     4        <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /> 
     5    </a> 
     6    <a href="http://feed.w3.org/check.cgi?url=http://<?php echo $_SERVER["HTTP_HOST"], $_SERVER["REQUEST_URI"]; ?>"> 
     7        <img src="http://validator.w3.org/feed/images/valid-rss-rogers.png" alt="Valid RSS" title="Validate my RSS feed" /> 
     8    </a> 
     9    <div id="poweredBy"> 
     10        <h3>PHP <?php 
    311    echo phpversion(); 
    412?> Powered By: XCache <?php 
     
    715    echo defined('XCACHE_MODULES') ? XCACHE_MODULES : ''; 
    816?> 
    9  
     17        </h3> 
     18    </div> 
    1019</div> 
    1120 
  • trunk/htdocs/common/header.tpl.php

    r1053 r1068  
    22<html xmlns="http://www.w3.org/1999/xhtml"> 
    33<head> 
     4    <meta http-equiv="X-UA-Compatible" content="IE=6" /> 
    45    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['config']['charset']; ?>" /> 
    5     <meta http-equiv="Content-Language" content="<?php echo $GLOBALS['config']['charset']; ?>" /> 
     6    <meta http-equiv="Content-Language" content="<?php echo $GLOBALS['config']['lang']; ?>" /> 
    67    <script type="text/javascript" src="tablesort.js"></script> 
    78 
     
    1213 
    1314<body> 
    14 <h1><?php echo $title; ?></h1> 
    15 <div class="switcher"><?php echo moduleswitcher(); ?></div> 
     15<div id="header"> 
     16    <div id="banner"><?php echo $title; ?></div> 
     17    <div id="nav"> 
     18        <div id="mainnav"> 
     19                <?php echo mainnav(); ?> 
     20        </div> 
     21        <div id="subnav" class="switcher"> 
     22                <?php echo subnav(); ?> 
     23        </div> 
     24    </div> 
     25</div> 
     26<div id="headerbase">&nbsp;</div> 
     27<div id="main"> 
  • trunk/htdocs/coverager/coverager.css

    r1053 r1068  
    1 table.center { margin-left: auto; margin-right: auto; } 
    2 table\-center { text-align: center; } 
    3  
    41.coverFile { 
    52    text-align:       left; 
  • trunk/htdocs/coverager/coverager.tpl.php

    r1053 r1068  
    4141    $l_tds = _("TODO"); 
    4242    return <<<EOS 
    43 <div class="table-center"> 
    44     <table cellpadding="2" cellspacing="0" border="0" class="cycles center"> 
     43<table cellpadding="2" cellspacing="0" border="0" class="cycles"> 
    4544    <tr> 
    4645        <th>{$l_dir}</th><th>{$l_per}</th><th>{$l_hit}</th><th>{$l_lns}</th><th>{$l_tds}</th> 
     
    9089{ 
    9190    return <<<EOS 
    92     </table> 
    93 </div> 
     91</table> 
    9492EOS; 
    9593} 
     
    104102    $l_lns = _("Lines"); 
    105103    return <<<EOS 
    106 <div class="center-table"> 
    107     <table cellpadding="2" cellspacing="0" border="0" class="cycles center"> 
     104<table cellpadding="2" cellspacing="0" border="0" class="cycles"> 
    108105    <tr> 
    109106        <th>{$l_fil}</th><th>{$l_per}</th><th>{$l_hit}</th><th>{$l_lns}</th> 
     
    148145{ 
    149146    return <<<EOS 
    150     </table> 
    151 </div> 
     147</table> 
    152148EOS; 
    153149} 
Note: See TracChangeset for help on using the changeset viewer.