diff --git a/admin/header.tpl.php b/admin/header.tpl.php index b398d0a..d118d8b 100644 --- a/admin/header.tpl.php +++ b/admin/header.tpl.php @@ -1,4 +1,4 @@ - + - » - +
+ » +
+
-: + @@ -63,7 +65,6 @@ $b = new Cycle('class="col1"', 'class="col2"'); } $w = $graph_width; - $tdwidth = $w + 2; if (empty($ci['istotal'])) { $graph = freeblock_to_graph($ci['free_blocks'], $ci['size']); $blocksgraph = "
{$graph}
"; @@ -95,14 +96,14 @@ $b = new Cycle('class="col1"', 'class="col2"'); - "; ?>
{$ci_slots} {$ci_size} {$ci_avail}
{$blocksgraph}
$cachelist['cache_list'], 'Deleted' => $cachelist['deleted_list']) as $listname => $entries) { $a->reset(); - echo " -
", _T("{$cachelist['type_name']} $listname"), "
+ diff --git a/coverager/coverager.css b/coverager/coverager.css index 820a533..0ea04bc 100644 --- a/coverager/coverager.css +++ b/coverager/coverager.css @@ -2,6 +2,8 @@ h1 { text-align: center; display: block; } input, table { font-family: sans-serif; font-size: 11px; } th { font-size: 12px; } table { border-collapse: collapse; } +table.center { margin-left: auto; margin-right: auto; } +table\-center { text-align: center; } table.cycles { border: 1px solid black; margin-top: 5px; margin-bottom: 5px; } table.cycles .col1 { background-color: #f5f5f5; } table.cycles .col2 { background-color: #e0e0e0; } @@ -54,11 +56,15 @@ th a { color: black; font-weight: bold; display: block; width: 100%; height: 100 .lineCov { background-color: #F0F0F0; } .lineNoCov { background-color: #ffe0e0; } +div.code { + border: 1px solid gray; + font-size: 12px; +} pre.code { font-family: monospace; font-size: 12px; white-space: pre; - border: 1px solid gray; + padding: 0; margin: 0; } .footnote { text-align: right; font-size: 12px; } diff --git a/coverager/coverager.php b/coverager/coverager.php index 7d492a9..44af965 100644 --- a/coverager/coverager.php +++ b/coverager/coverager.php @@ -113,8 +113,8 @@ class XcacheCoverageViewer $lines = preg_replace('(^]*>|$)', '', $lines); $lines = explode('
', $lines); $last = array_pop($lines); + $lines[count($lines) - 1] = $last; $filecov = sprint_cov($fileinfo['cov'], $lines, false); - $filecov .= $last; unset($source); } else { @@ -324,13 +324,13 @@ function sprint_cov($cov, $lines, $encode = true) } } if (isset($cov[$offs])) { - $lines[$l] = sprintf("
  • %s\t%s\n
  • " + $lines[$l] = sprintf("
  •  %s\t%s\n
  • " , $cov[$offs] ? '' : 'No' , $cov[$offs] , $line); } else { - $lines[$l] = "
  • \t$line\n
  • "; + $lines[$l] = "
  • \t$line\n
  • "; } } return implode('', $lines); diff --git a/coverager/coverager.tpl.php b/coverager/coverager.tpl.php index b2d87db..a4edf14 100644 --- a/coverager/coverager.tpl.php +++ b/coverager/coverager.tpl.php @@ -1,4 +1,4 @@ - + +
    +
    @@ -104,6 +105,7 @@ function dir_foot() { return << + EOS; } @@ -116,8 +118,8 @@ function file_head() $l_hit = _T("Hits"); $l_lns = _T("Lines"); return << -
    {$l_dir}{$l_per}{$l_hit}{$l_lns}{$l_tds}
    +
    +
    @@ -161,6 +163,7 @@ function file_foot() { return << + EOS; } @@ -171,7 +174,9 @@ if ($action == 'dir') { } $path_html = htmlspecialchars($path); echo <<$l_root $path
    +
    + $l_root $path
    +
    EOS; echo dir_head($dirinfo); echo dir_row($dirinfo, $path); @@ -198,7 +203,9 @@ else if ($action == 'file') { $dir_url = urlencode($dir); $dir_html = htmlspecialchars($dir); echo <<$l_root {$dir_html}/{$filename}
    +
    + $l_root {$dir_html}/{$filename}
    +
    EOS; echo file_head(); @@ -208,19 +215,25 @@ EOS; if ($tplfile) { $tplfile_html = htmlspecialchars($tplfile); echo <<{$tplfile_html}
    +
    + {$tplfile_html}
    +
    EOS; } if (function_exists('ob_filter_path_nicer')) { ob_end_flush(); } echo <<
      {$filecov}
    +
    +
      {$filecov}
    +
    EOS; if ($tplfile) { echo <<{$tplfile} -
      {$tplcov}
    +
    +
      {$tplcov}
    +
    EOS; } }
    {$l_fil}{$l_per}{$l_hit}{$l_lns}