diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/attachments/20110113/512ecd45 | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110113/512ecd45')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110113/512ecd45/attachment-0001.html | 197 | ||||
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110113/512ecd45/attachment.html | 197 |
2 files changed, 394 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110113/512ecd45/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110113/512ecd45/attachment-0001.html new file mode 100644 index 000000000..6382fffee --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110113/512ecd45/attachment-0001.html @@ -0,0 +1,197 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[292] properly handle empty queue; remove feedback labels; try a "score" for this list of packages</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>292</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-13 18:13:01 +0100 (Thu, 13 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>properly handle empty queue; remove feedback labels; try a "score" for this list of packages</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemwebindexphp">build_system/web/index.php</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemwebindexphp">Modified: build_system/web/index.php</a> +=================================================================== +--- build_system/web/index.php 2011-01-13 15:54:31 UTC (rev 291) ++++ build_system/web/index.php 2011-01-13 17:13:01 UTC (rev 292) +@@ -21,6 +21,7 @@ + $robots = 'no' . $robots; + } + $tz = new DateTimeZone('UTC'); ++$date_gen = date('c'); + + # Temporary until initial mirror is ready + chdir("data"); +@@ -169,6 +170,9 @@ + tr.youri td.status-box { background: olive; } + + #stats { float: right; } ++ #score {} ++ #score-box { width: 200px; height: 100px; background: #faa; } ++ #score-meter { width: 200px; background: #afa; } + </style> + </head> + <body> +@@ -189,9 +193,6 @@ + ); + + ######################################### +-echo '<table>', +- '<caption>Packages submitted in the past ', $max_modified * 24, '&nbsp;hours.</caption>', +- '<tr><th>Submitted</th><th>User</th><th>Package</th><th>Target</th><th>Media</th><th colspan="2">Status</th></tr>'; + + $s = ''; + $tmpl = <<<T +@@ -225,47 +226,67 @@ + 'built' => '' + ); + +-foreach ($pkgs as $key => $p) { +- $p['type'] = pkg_gettype($p); ++if ($total > 0) { ++ foreach ($pkgs as $key => $p) { ++ $p['type'] = pkg_gettype($p); + +- $stats[$p['type']] += 1; +- $s .= sprintf($tmpl, +- $p['type'], +- key2date($key), +- $p['user'], $p['user'], +- $p['package'], +- $p['version'], +- $p['media'], $p['section'] +- ); ++ $stats[$p['type']] += 1; ++ $s .= sprintf($tmpl, ++ $p['type'], ++ key2date($key), ++ $p['user'], $p['user'], ++ $p['package'], ++ $p['version'], ++ $p['media'], $p['section'] ++ ); + +- $typelink = ''; +- if ($p['type'] == 'failure') { +- $typelink = '/uploads/' . $p['type'] . '/' . $p['path']; +- } elseif ($p['type'] == 'rejected') { +- $typelink = '/uploads/' . $p['type'] . '/' . $p['path'] . '.youri'; ++ $typelink = ''; ++ if ($p['type'] == 'failure') { ++ $typelink = '/uploads/' . $p['type'] . '/' . $p['path']; ++ } elseif ($p['type'] == 'rejected') { ++ $typelink = '/uploads/' . $p['type'] . '/' . $p['path'] . '.youri'; ++ } ++ ++ $s .= '<td>'; ++ $s .= ($typelink != '') ? ++ sprintf('<a href="%s">%s</a>', $typelink, $p['type']) : ++ $p['type']; ++ ++ $s .= '</td>'; ++ //$s .= '<td>' . sprintf($badges[$p['type']], $p['user']) . '</td>'; ++ $s .= '</tr>'; + } ++ // Table ++ echo '<table>', ++ '<caption>Packages submitted in the past ', $max_modified * 24, '&nbsp;hours.</caption>', ++ '<tr><th>Submitted</th><th>User</th><th>Package</th><th>Target</th><th>Media</th><th colspan="2">Status</th></tr>', ++ $s, ++ '</table>'; + +- $s .= '<td>'; +- $s .= ($typelink != '') ? +- sprintf('<a href="%s">%s</a>', $typelink, $p['type']) : +- $p['type']; ++ // Stats ++ $s = '<div id="stats">'; ++ $score = round($stats['uploaded']/$total * 100); ++ $s .= sprintf('<div id="score"><h3>Score: %d/100</h3> ++ <div id="score-box"><div id="score-meter" style="height: %dpx;"></div></div></div>', ++ $score, $score); + +- $s .= '</td>'; +- $s .= '<td>' . sprintf($badges[$p['type']], $p['user']) . '</td>'; +- $s .= '</tr>'; ++ $s .= '<table><caption>Stats.</caption><tr><th colspan="2">Status</th><th>Count</th><th>%</th></tr>'; ++ foreach ($stats as $k => $v) { ++ $s .= sprintf('<tr class="%s"><td class="status-box"></td><td>%s</td><td>%d</td><td>%d%%</td></tr>', ++ $k, $k, $v, round($v/$total*100)); ++ } ++ $s .= '</table></div>'; ++ echo $s; + } +-echo $s, '</table>'; +- +-$s = '<div id="stats"><table><caption>Stats.</caption><tr><th colspan="2">Status</th><th>Count</th><th>%</th></tr>'; +-foreach ($stats as $k => $v) { +- $s .= sprintf('<tr class="%s"><td class="status-box"></td><td>%s</td><td>%d</td><td>%d%%</td></tr>', +- $k, $k, $v, round($v/$total*100)); ++else ++{ ++ echo sprintf('<p>No package has been submitted in the past %d&nbsp;hours.</p>', ++ $max_modified * 24); + } +-$s .= '</table></div>'; +-$s .= '<div class="clear"></div>'; + +-echo $s; +- + ?> ++ <div class="clear"></div> ++ <hr /> ++ <p>Generated at <?php echo $date_gen; ?>.</p> + </body> + </html> + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110113/512ecd45/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110113/512ecd45/attachment.html new file mode 100644 index 000000000..6382fffee --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110113/512ecd45/attachment.html @@ -0,0 +1,197 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[292] properly handle empty queue; remove feedback labels; try a "score" for this list of packages</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>292</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-13 18:13:01 +0100 (Thu, 13 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>properly handle empty queue; remove feedback labels; try a "score" for this list of packages</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemwebindexphp">build_system/web/index.php</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemwebindexphp">Modified: build_system/web/index.php</a> +=================================================================== +--- build_system/web/index.php 2011-01-13 15:54:31 UTC (rev 291) ++++ build_system/web/index.php 2011-01-13 17:13:01 UTC (rev 292) +@@ -21,6 +21,7 @@ + $robots = 'no' . $robots; + } + $tz = new DateTimeZone('UTC'); ++$date_gen = date('c'); + + # Temporary until initial mirror is ready + chdir("data"); +@@ -169,6 +170,9 @@ + tr.youri td.status-box { background: olive; } + + #stats { float: right; } ++ #score {} ++ #score-box { width: 200px; height: 100px; background: #faa; } ++ #score-meter { width: 200px; background: #afa; } + </style> + </head> + <body> +@@ -189,9 +193,6 @@ + ); + + ######################################### +-echo '<table>', +- '<caption>Packages submitted in the past ', $max_modified * 24, '&nbsp;hours.</caption>', +- '<tr><th>Submitted</th><th>User</th><th>Package</th><th>Target</th><th>Media</th><th colspan="2">Status</th></tr>'; + + $s = ''; + $tmpl = <<<T +@@ -225,47 +226,67 @@ + 'built' => '' + ); + +-foreach ($pkgs as $key => $p) { +- $p['type'] = pkg_gettype($p); ++if ($total > 0) { ++ foreach ($pkgs as $key => $p) { ++ $p['type'] = pkg_gettype($p); + +- $stats[$p['type']] += 1; +- $s .= sprintf($tmpl, +- $p['type'], +- key2date($key), +- $p['user'], $p['user'], +- $p['package'], +- $p['version'], +- $p['media'], $p['section'] +- ); ++ $stats[$p['type']] += 1; ++ $s .= sprintf($tmpl, ++ $p['type'], ++ key2date($key), ++ $p['user'], $p['user'], ++ $p['package'], ++ $p['version'], ++ $p['media'], $p['section'] ++ ); + +- $typelink = ''; +- if ($p['type'] == 'failure') { +- $typelink = '/uploads/' . $p['type'] . '/' . $p['path']; +- } elseif ($p['type'] == 'rejected') { +- $typelink = '/uploads/' . $p['type'] . '/' . $p['path'] . '.youri'; ++ $typelink = ''; ++ if ($p['type'] == 'failure') { ++ $typelink = '/uploads/' . $p['type'] . '/' . $p['path']; ++ } elseif ($p['type'] == 'rejected') { ++ $typelink = '/uploads/' . $p['type'] . '/' . $p['path'] . '.youri'; ++ } ++ ++ $s .= '<td>'; ++ $s .= ($typelink != '') ? ++ sprintf('<a href="%s">%s</a>', $typelink, $p['type']) : ++ $p['type']; ++ ++ $s .= '</td>'; ++ //$s .= '<td>' . sprintf($badges[$p['type']], $p['user']) . '</td>'; ++ $s .= '</tr>'; + } ++ // Table ++ echo '<table>', ++ '<caption>Packages submitted in the past ', $max_modified * 24, '&nbsp;hours.</caption>', ++ '<tr><th>Submitted</th><th>User</th><th>Package</th><th>Target</th><th>Media</th><th colspan="2">Status</th></tr>', ++ $s, ++ '</table>'; + +- $s .= '<td>'; +- $s .= ($typelink != '') ? +- sprintf('<a href="%s">%s</a>', $typelink, $p['type']) : +- $p['type']; ++ // Stats ++ $s = '<div id="stats">'; ++ $score = round($stats['uploaded']/$total * 100); ++ $s .= sprintf('<div id="score"><h3>Score: %d/100</h3> ++ <div id="score-box"><div id="score-meter" style="height: %dpx;"></div></div></div>', ++ $score, $score); + +- $s .= '</td>'; +- $s .= '<td>' . sprintf($badges[$p['type']], $p['user']) . '</td>'; +- $s .= '</tr>'; ++ $s .= '<table><caption>Stats.</caption><tr><th colspan="2">Status</th><th>Count</th><th>%</th></tr>'; ++ foreach ($stats as $k => $v) { ++ $s .= sprintf('<tr class="%s"><td class="status-box"></td><td>%s</td><td>%d</td><td>%d%%</td></tr>', ++ $k, $k, $v, round($v/$total*100)); ++ } ++ $s .= '</table></div>'; ++ echo $s; + } +-echo $s, '</table>'; +- +-$s = '<div id="stats"><table><caption>Stats.</caption><tr><th colspan="2">Status</th><th>Count</th><th>%</th></tr>'; +-foreach ($stats as $k => $v) { +- $s .= sprintf('<tr class="%s"><td class="status-box"></td><td>%s</td><td>%d</td><td>%d%%</td></tr>', +- $k, $k, $v, round($v/$total*100)); ++else ++{ ++ echo sprintf('<p>No package has been submitted in the past %d&nbsp;hours.</p>', ++ $max_modified * 24); + } +-$s .= '</table></div>'; +-$s .= '<div class="clear"></div>'; + +-echo $s; +- + ?> ++ <div class="clear"></div> ++ <hr /> ++ <p>Generated at <?php echo $date_gen; ?>.</p> + </body> + </html> + +</pre></div> + +</body> +</html>
\ No newline at end of file |