diff options
| author | Remi Collet <fedora@famillecollet.com> | 2010-05-26 22:22:33 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2010-05-26 22:22:33 +0200 |
| commit | 707d798cd402a08157ef2a66eff6cbebe606d746 (patch) | |
| tree | f5ace133c94721ec0fd665cbd0f9a2bbfb9b4dd1 | |
| parent | ba771dc91b13c70509b6da1589e7e9c4a95b3384 (diff) | |
| parent | 886b1ca73cc20b7c266dd0a7da0e863b722c47df (diff) | |
Merge branch 'master' of http://github.com/trasher/rpmphp
| -rw-r--r-- | all.php | 289 | ||||
| -rw-r--r-- | css/rpmphp.css | 41 | ||||
| -rw-r--r-- | rpm.php | 7 | ||||
| -rw-r--r-- | zoom.php | 187 |
4 files changed, 217 insertions, 307 deletions
@@ -1,68 +1,33 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html> - <head> - <title>Packages in Fedora</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <link rel="stylesheet" type="text/css" media="print" href="http://docs.fedoraproject.org/css/print.css"> - <style type="text/css" media="screen"> - @import url("http://docs.fedoraproject.org/css/layout.css"); - @import url("http://docs.fedoraproject.org/css/content.css"); - @import url("http://docs.fedoraproject.org/css/docbook.css"); - -body { - background-image:none; -} -.error { - background:url(http://fedoraproject.org/wikidata/kindofblue/img/icon-error.png) no-repeat left; - padding-left: 21px; -} - -.info { - background:url(http://fedoraproject.org/wikidata/kindofblue/img/icon-info.png) no-repeat left; - padding-left: 21px; -} - -.attn { - background:url(http://fedoraproject.org/wikidata/kindofblue/img/attention.png) no-repeat left; - padding-left: 21px; -} - -.check { - background:url(http://fedoraproject.org/wikidata/kindofblue/img/checkmark.png) no-repeat left; - padding-left: 21px; -} - -.cpan { - background:url(http://www.perl.com/favicon.ico) no-repeat left; - padding-left: 18px; -} - -.rt { - background:url(/img/rt.png) no-repeat left; - padding-left: 18px; -} - -.bz { - background:url(/img/bz.png) no-repeat left; - padding-left: 18px; -} - <?php $what=(isset($_GET["what"]) ? $_GET["what"] : false); require "config.inc.php"; -function Report ($db) { - global $what; - - echo "<h1>Packages in Fedora</h1>\n"; +function listRepos($db){ + $repos = array(); + $res=$db->query("SELECT * FROM repo WHERE active=1 ORDER BY ID"); + if ($res) while ($repo = $res->fetchObject()) { + $repos[$repo->main][$repo->sub]=$repo; + } + // echo "<pre>"; print_r($repos);echo "</pre>"; + foreach($repos as $repomain) { + foreach ($repomain as $repo) { + /*printf ("<th align='left'>%s</th>", $repo->main);*/ + $repos[$repo->main][$repo->sub] = $repo; + break; + } + } + return $repos; +} +function Report ($db, $repos) { + global $what; - $repos=array(); + /*$repos=array(); $res=$db->query("SELECT * FROM repo WHERE active=1 ORDER BY ID"); if ($res) while ($repo = $res->fetchObject()) { $repos[$repo->main][$repo->sub]=$repo; - } + }*/ if (substr($what,0,1)=='%') { $sql=sprintf("SELECT DISTINCT name FROM rpm WHERE SUBSTRING(name,1,1)='%s' ORDER BY name", substr($what,1,1)); @@ -71,7 +36,7 @@ function Report ($db) { } //echo "<p>SQL=$sql</p>"; - echo "<table id='fedora-list-packages'>\n"; + /*echo "<table id='fedora-list-packages'>\n"; echo "<tr class='odd'><th>Package</th><th>Owner(s)</th>"; foreach($repos as $repomain) { @@ -80,7 +45,7 @@ function Report ($db) { break; } } - echo "</tr>\n"; + echo "</tr>\n";*/ $i=0; $res=$db->query($sql); @@ -91,8 +56,8 @@ function Report ($db) { $res2=$db->query($sql2); $dispowner=""; if ($res2) while ($owner= $res2->fetchObject()) { - if ($dispowner) $dispowner .= "<br>"; - $dispowner .= sprintf ("<a href='%s?what=%s'>%s</a>", $_SERVER["PHP_SELF"], $owner->owner, $owner->owner); + if ($dispowner) $dispowner .= "<br/>"; + $dispowner .= sprintf ("<a href=\"%s?what=%s\">%s</a>", $_SERVER["PHP_SELF"], $owner->owner, $owner->owner); } $sql3 = "SELECT * FROM rpm WHERE name LIKE '$rpmname'"; @@ -101,14 +66,14 @@ function Report ($db) { if ($rpm) { $url = $rpm->url; - $des = $rpm->summary; + $des = htmlentities($rpm->summary); $rpms=array(); do { $rpms[$rpm->repo_main."-".$rpm->repo_sub]=$rpm; } while ($rpm = $res3->fetchObject()); - printf ("<tr class='%s'><td><a href='zoom.php?rpm=%s' title='%s'>%s</a></td><td>%s</td>", + printf ("<tr class=\"%s\">\n\t<td><a href=\"zoom.php?rpm=%s\" title=\"%s\">%s</a></td>\n\t<td>%s</td>\n", ($i%2 ? "odd" : "even"), $rpmname, $des, $rpmname, $dispowner); @@ -116,171 +81,169 @@ function Report ($db) { $display=""; $class=""; foreach ($repomain as $repo) { - if (isset($rpms[$repo->main."-".$repo->sub])) { + if (isset($rpms[$repo->main."-".$repo->sub])) { $rpm=$rpms[$repo->main."-".$repo->sub]; - + $maxver = (isset($rpms["rawhide-"]) ? $rpms["rawhide-"]->ver : ""); switch ($repo->sub) { case "base": if (isset($rpms[$repo->main."-updates"])) { - $display .= sprintf("%s-%s<br>", $rpm->ver, $rpm->rel); + $display .= sprintf("%s-%s<br/>", $rpm->ver, $rpm->rel); } else { - $display .= sprintf("<b>%s</b>-%s<br>", $rpm->ver, $rpm->rel); + $display .= sprintf("<strong>%s</strong>-%s<br/>", $rpm->ver, $rpm->rel); $class = ($rpm->ver == $maxver ? "check" : "attn"); } break; case "": - $display .= sprintf("<b>%s</b>-%s<br>", $rpm->ver, $rpm->rel); + $display .= sprintf("<strong>%s</strong>-%s<br/>", $rpm->ver, $rpm->rel); break; case "updates": - $display .= sprintf("<b>%s</b>-%s <small>(updates)</small><br>", $rpm->ver, $rpm->rel); + $display .= sprintf("<strong>%s</strong>-%s <small>(updates)</small><br/>", $rpm->ver, $rpm->rel); $class = ($rpm->ver == $maxver ? "check" : "attn"); break; case "testing": - $display .= sprintf("%s-%s <small>(testing)</small><br>", $rpm->ver, $rpm->rel); + $display .= sprintf("%s-%s <small>(testing)</small><br/>", $rpm->ver, $rpm->rel); $class = ($rpm->ver == $maxver ? "info" : "attn"); - break; + break; } } // RPM exists } // sub repo if ($class && $maxver) { - printf("<td><div class='%s'>%s</div></td>", $class, $display); + printf("\t<td class=\"%s\">%s</td>\n", $class, $display); } else if ($display) { - printf("<td>%s</td>", $display); + printf("\t<td>%s</td>\n", $display); } else { - echo "<td> </td>"; + echo "\t<td> </td>\n"; } } // mainrepo echo "</tr>\n"; - $i++; + $i++; } } // each Line - echo "</table>\n"; } - -try { - $db = new PDO ("mysql:dbname=" . MYBASE . ";host=" . MYHOST, MYUSER, MYPASS); ?> - </style> - - <meta name="MSSmartTagsPreventParsing" content="TRUE"> - <link rel="shortcut icon" href="http://docs.fedoraproject.org/images/favicon.ico"> - <link rel="icon" href="http://docs.fedoraproject.org/images/favicon.ico"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> + <head> + <title>Packages in Fedora</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <link rel="stylesheet" type="text/css" media="screen" href="css/rpmphp.css"/> + <!--<link rel="stylesheet" type="text/css" media="print" href="css/rpmphp-print.css">--> + <link rel="shortcut icon" href="images/favicon.ico"/> + <link rel="icon" href="images/favicon.ico"/> </head> <body> - <!-- header BEGIN --> - <div id="fedora-header"> - <div id="fedora-header-logo"> - - <a href="http://fedoraproject.org"><img src="http://docs.fedoraproject.org/images/header-fedora_logo01.png" alt="Fedora Project"></a> - </div> - - <div id="fedora-header-items"> - <span class="fedora-header-search"> + <div id="wrapper"> +<?php +include '_header.php'; +?> + <div id="fedora-content"> + <div id="ariane"> + <p>You are here: </p> + <ul> + <li><a href="./">Reports home</a></li> + <li><a href="#">All packages</a></li> + </ul> + </div> + <div id="filter"> <form action='<?php echo $_SERVER["PHP_SELF"]; ?>' method='get'> - <select name='what' size='1'> - <optgroup label='Pakages'> + <fieldset> + <legend>Filter packages</legend> + <label for="what">Criteria: </label> + <select name="what" id="what"> + <optgroup label="Pakages"> <?php +try { + $db = new PDO ("mysql:dbname=" . MYBASE . ";host=" . MYHOST, MYUSER, MYPASS); + $sql="SELECT DISTINCT CONCAT('%',SUBSTRING(name,1,1)) as init FROM rpm ORDER BY init"; $res=$db->query($sql); if ($res)while ($start = $res->fetchObject()) { - printf("<option value='%s' %s>Start with %s</option>", $start->init, ($what==$start->init ? "selected='1'" : ""), substr($start->init,1)); + printf("\t\t\t\t\t\t\t\t\t<option value=\"%s\" %s>Start with %s</option>\n", $start->init, ($what==$start->init ? " selected=\"selected\"" : ""), substr($start->init,1)); } else { - echo "<option value='remi'>remi</option>"; + echo "\t\t\t\t\t\t\t\t\t<option value=\"remi\">remi</option>\n"; } ?> - </optgroup> - <optgroup label='Owner'> + </optgroup> + <optgroup label="Owner"> <?php $sql="SELECT DISTINCT owner FROM acls ORDER BY owner"; $res=$db->query($sql); if ($res)while ($owner = $res->fetchObject()) { - printf("<option value='%s' %s>%s</option>", $owner->owner, ($what==$owner->owner ? "selected='1'" : ""), $owner->owner); + printf("\t\t\t\t\t\t\t\t\t<option value=\"%s\" %s>%s</option>\n", $owner->owner, ($what==$owner->owner ? " selected=\"selected\"" : ""), $owner->owner); } else { - echo "<option value='remi'>remi</option>"; + echo "\t\t\t\t\t\t\t\t\t<option value=\"remi\">remi</option>\n"; } ?> - </optgroup> - </select> - <input type="image" src='http://docs.fedoraproject.org/images/header-search.png' alt="Search" /> - </form></span> - - </div> - - </div> - - <div id="fedora-nav"></div> - <img src='http://docs.fedoraproject.org/images/link-offsite-side.png' /> - <a href="./">Reports home</a> - <img src='http://docs.fedoraproject.org/images/link-offsite-side.png' /> - All packages - <!-- header END --> - - <!-- leftside BEGIN --> - <div id="fedora-side-left"> - </div> - - <!-- leftside END --> - - <!-- content BEGIN --> - <div id="fedora-middle-one"> - <div class="fedora-corner-tr"> </div> - <div class="fedora-corner-tl"> </div> - <div id="fedora-content"> - - <!-- document BEGIN --> - - - + </optgroup> + </select> + <input type="submit" value="Filter" /> + </fieldset> + </form> + </div> <?php - $sql='SELECT MAX(stamp) AS stamp FROM repo'; $res=$db->query($sql); if ($res && $row=$res->fetchObject()) { printf("<p>Repositories last updated %s.</p>", date("r", $row->stamp)); } - if ($what) Report($db); - else echo "<h2>Choose a criteria from the search menu</h2>"; +?> + <h1>Packages in Fedora</h1> + <table id="list-packages"> + <thead> + <tr> + <th>Package</th> + <th>Owner(s)</th> + <th>Upstream</th> +<?php + $repos = listRepos($db); + $repos_k = array_keys($repos); + foreach ( $repos_k as $r ) { +?> + <th><?php echo $r; ?></th> +<?php + } +?> + </tr> + </thead> + <tbody> +<?php + if ($what) Report($db, $repos); + else echo "<tr><td colspan=\"" . (count($repos) + 3) . "\"><h2>Choose a criteria from the filter menu</h2></td></tr>"; //echo "<pre>"; print_r($rpms); echo "</pre>"; - -} -catch(PDOException $e) { +} catch(PDOException $e) { +?> + <tr> + <td colspan="<?php echo count($repos_k) + 3; ?>"> +<?php printf("%s ERREUR : %s\n", date("r"), $e->getMessage()); +?> + </td> + </tr> +<?php } - ?> -<p> </p> - -<table id='fedora-list-packages'><tr><th>Legend: </th> -<td><b>Repo</b>: bold for latest release.</td> -<td><div class='check'>Lastest released (as in rawhide)</div></td> -<td><div class='info'>Lastest in testing</div></td> -<td><div class='attn'>Lastest not available</div></td> -</tr></table> - - <!-- document END --> - </div> - <div class="fedora-corner-br"> </div> - <div class="fedora-corner-bl"> </div> - </div> - - <!-- content END --> - - <!-- footer BEGIN --> - - <div id="fedora-footer"> - <br/>The Fedora Project is maintained and driven by the community and sponsored by Red Hat. - <br/><a href="http://fedoraproject.org/wiki/Legal">Legal</a> | <a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a> - <br> + </tbody> + </table> + <ul id="legend"> + <li>Legend: </li> + <li><strong>Upstream</strong>: bold if stable. </li> + <li><strong>Repo</strong>: bold for latest release.</li> + <li class='check'>Lastest released (stable if exists)</li> + <li class='info'>Lastest in testing</li> + <li class='attn'>Lastest not available</li> + </ul> + </div><!-- /fedora-content --> +<?php +include '_footer.php'; +?> </div> - - <!-- footer END --> </body> </html> diff --git a/css/rpmphp.css b/css/rpmphp.css index 89ce374..33e7f64 100644 --- a/css/rpmphp.css +++ b/css/rpmphp.css @@ -22,18 +22,21 @@ input{ input[type='submit']:hover{ background-color:#bbb; color:#fff; + cursor:pointer; } h1{ color:#3C6EB4; padding:.2em; margin:.2em 0; + font-size:1.6em; } h2{ color:#666666; padding:.1em; margin:.3em 1em; + font-size:1.4em; } a{ @@ -133,15 +136,20 @@ p{ border-collapse:collapse; } -#list-packages caption{ +#list-packages caption, +#upstream caption{ background-color:#2963A6; color:white; padding:.1em 0; + -moz-border-radius:5px 5px 0 0; + -webkit-border-radius:5px 5px 0 0; + font-weight:bold; } #list-packages td, #list-packages th{ padding:.2em; + background-color:white; } #list-packages thead th{ @@ -155,6 +163,10 @@ p{ border-top:1px solid #DDDDDD; } +#list-packages h2{ + text-align:center; +} + #filter{ display:inline-block; position:absolute; @@ -171,11 +183,30 @@ p{ font-style:italic; } -#legend{ - margin:0 auto; +#legend, #upstream{ + margin:.5em 1em; list-style:none; - width:20%; - text-align:center; + width:20em; + /*text-align:center;*/ + background-color:#E5E5E5; + -moz-border-radius:5px 5px 5px 5px; + -webkit-border-radius:5px 5px 5px 5px; + padding:.5em 2em; +} + +#upstream { + -moz-border-radius:0 0 5px 5px; + -webkit-border-radius:0 0 5px 5px; + width:90%; + margin:.5em auto; +} + +#upstream th{ + text-align:right; +} +#upstream td{ + padding-left:1em; + text-align:left; } .error { @@ -161,7 +161,7 @@ include '_header.php'; <fieldset> <legend>Filter <?php echo strtoupper($type); ?> packages</legend> <input type="hidden" name='type' value="<?php echo $type; ?>" /> - <label for="what">Where to search: </label> + <label for="what">Criteria: </label> <select name="what" id="what"> <optgroup label="Pakages"> <option value="%fedora"<?php if ($what=='%fedora') echo " selected=\"selected\""; ?>>In fedora</option> @@ -188,9 +188,7 @@ try { } ?> </optgroup> - </select><br/> - <label for="rpmf">Criteria: </label> - <input type="text" name="rpmf" id="rpmf" size="20" /> + </select> <input type="submit" value="Filter" /> </fieldset> </form> @@ -220,7 +218,6 @@ foreach ( $repos_k as $r ) { <?php } ?> - </tr> </thead> <tbody> @@ -1,52 +1,3 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html> - <head> - <title>Packages in Fedora</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <link rel="stylesheet" type="text/css" media="print" href="http://docs.fedoraproject.org/css/print.css"> - <style type="text/css" media="screen"> - @import url("http://docs.fedoraproject.org/css/layout.css"); - @import url("http://docs.fedoraproject.org/css/content.css"); - @import url("http://docs.fedoraproject.org/css/docbook.css"); - -body { - background-image:none; -} -.error { - background:url(http://fedoraproject.org/wikidata/kindofblue/img/icon-error.png) no-repeat left; - padding-left: 21px; -} - -.info { - background:url(http://fedoraproject.org/wikidata/kindofblue/img/icon-info.png) no-repeat left; - padding-left: 21px; -} - -.attn { - background:url(http://fedoraproject.org/wikidata/kindofblue/img/attention.png) no-repeat left; - padding-left: 21px; -} - -.check { - background:url(http://fedoraproject.org/wikidata/kindofblue/img/checkmark.png) no-repeat left; - padding-left: 21px; -} - -.cpan { - background:url(http://www.perl.com/favicon.ico) no-repeat left; - padding-left: 18px; -} - -.rt { - background:url(/img/rt.png) no-repeat left; - padding-left: 18px; -} - -.bz { - background:url(/img/bz.png) no-repeat left; - padding-left: 18px; -} - <?php require "config.inc.php"; @@ -56,131 +7,108 @@ if (!isset($_GET['rpm'])) { $name = $_GET['rpm']; ?> - </style> - - <meta name="MSSmartTagsPreventParsing" content="TRUE"> - <link rel="shortcut icon" href="http://docs.fedoraproject.org//images/favicon.ico"> - <link rel="icon" href="http://docs.fedoraproject.org//images/favicon.ico"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> + <head> + <title>Packages in Fedora</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <link rel="stylesheet" type="text/css" media="screen" href="css/rpmphp.css"/> + <!--<link rel="stylesheet" type="text/css" media="print" href="css/rpmphp-print.css">--> + <link rel="shortcut icon" href="images/favicon.ico"/> + <link rel="icon" href="images/favicon.ico"/> </head> <body> - <!-- header BEGIN --> - <div id="fedora-header"> - <div id="fedora-header-logo"> - - <a href="http://fedoraproject.org"><img src="http://docs.fedoraproject.org//images/header-fedora_logo01.png" alt="Fedora Project"></a> - </div> - - <div id="fedora-header-items"> - <span class="fedora-header-search"> - <form action='zoom.php' method='get'> - Package : - <input type='text' name='rpm' size='20' /> - <input type="image" src='http://docs.fedoraproject.org/images/header-search.png' alt="Search" /> - </form></span> - </div> - - </div> - - <div id="fedora-nav"></div> - <img src='http://docs.fedoraproject.org/images/link-offsite-side.png' /> - <a href="./">Reports home</a> - <img src='http://docs.fedoraproject.org/images/link-offsite-side.png' /> - Package detail - <!-- header END --> - - <!-- leftside BEGIN --> - <div id="fedora-side-left"> - </div> - - <!-- leftside END --> - - <!-- content BEGIN --> - <div id="fedora-middle-one"> - <div class="fedora-corner-tr"> </div> - <div class="fedora-corner-tl"> </div> - <div id="fedora-content"> - - <!-- document BEGIN --> - + <div id="wrapper"> +<?php +include '_header.php'; +?> + <div id="fedora-content"> + <div id="ariane"> + <p>You are here: </p> + <ul> + <li><a href="./">Reports home</a></li> + <li><a href="#">Package detail</a></li> + </ul> + </div> <?php if (!$name) { echo "<h1>Enter a package name</h1>\n"; } else { try { $db = new PDO ("mysql:dbname=" . MYBASE . ";host=" . MYHOST, MYUSER, MYPASS); - - $sql = "SELECT rpm.* + + $sql = "SELECT rpm.* FROM rpm INNER JOIN repo ON (repo.main=rpm.repo_main AND repo.sub=rpm.repo_sub) WHERE rpm.name='$name' ORDER BY repo.id DESC"; $resrpm = $db->query($sql); $rpm = ($resrpm ? $resrpm->fetchObject() : false); - + $sql = "SELECT * FROM upstream WHERE name = '$name'"; $resup=$db->query($sql); $up = ($resup ? $resup->fetchObject() : false); - + $sql = "SELECT * FROM acls WHERE name = '$name'"; $resown=$db->query($sql); $owner = ($resown ? $resown->fetchObject() : false); - + if (!$rpm) { echo "<h1>$name not found</h1>\n"; } else { echo "<h1>Package: $name</h1>\n"; - echo "<table id='fedora-list-packages'>\n"; - echo "<tr><th colspan='2'>Upstream info</th></tr>\n"; + echo "<table id=\"upstream\">\n"; + echo "<caption>Upstream info</caption>\n"; $i=0; - + if ($rpm->summary) { - echo "<tr class='".($i%2 ? 'odd' : 'even')."'><td>"; $i++; - echo "Summary</td><td><strong>". $rpm->summary . "</strong></td></tr>\n"; + echo "<tr class='".($i%2 ? 'odd' : 'even')."'><th>"; $i++; + echo "Summary: </th><td><strong>". $rpm->summary . "</strong></td></tr>\n"; } else if ($owner->summary) { - echo "<tr class='".($i%2 ? 'odd' : 'even')."'><td>"; $i++; - echo "Summary</td><td><strong>". $owner->summary . "</strong></td></tr>\n"; + echo "<tr class='".($i%2 ? 'odd' : 'even')."'><th>"; $i++; + echo "Summary: </th><td><strong>". $owner->summary . "</strong></td></tr>\n"; } if ($rpm->url) { - echo "<tr class='".($i%2 ? 'odd' : 'even')."'><td>"; $i++; - echo "URL</td><td><strong><a href='".$rpm->url."'>". $rpm->url . "</a></strong></td></tr>\n"; + echo "<tr class='".($i%2 ? 'odd' : 'even')."'><th>"; $i++; + echo "URL: </th><td><strong><a href='".$rpm->url."'>". $rpm->url . "</a></strong></td></tr>\n"; } if ($up && $up->type) { - echo "<tr class='".($i%2 ? 'odd' : 'even')."'><td>"; $i++; - echo "Type</td><td><strong>". $up->type . "</strong></td></tr>\n"; + echo "<tr class='".($i%2 ? 'odd' : 'even')."'><th>"; $i++; + echo "Type: </th><td><strong>". $up->type . "</strong></td></tr>\n"; } if ($up && $up->channel) { - echo "<tr class='".($i%2 ? 'odd' : 'even')."'><td>"; $i++; - echo "Channel</td><td><strong>". $up->channel . "</strong></td></tr>\n"; + echo "<tr class='".($i%2 ? 'odd' : 'even')."'><th>"; $i++; + echo "Channel: </th><td><strong>". $up->channel . "</strong></td></tr>\n"; } if ($up && $up->stable) { - echo "<tr class='".($i%2 ? 'odd' : 'even')."'><td>"; $i++; - echo "Stable version</td><td><strong>". $up->stable . "</strong></td></tr>\n"; + echo "<tr class='".($i%2 ? 'odd' : 'even')."'><th>"; $i++; + echo "Stable version: </th><td><strong>". $up->stable . "</strong></td></tr>\n"; } if ($up && $up->unstable && $up->stable!=$up->unstable) { - echo "<tr class='".($i%2 ? 'odd' : 'even')."'><td>"; $i++; - echo "Unstable version</td><td><strong>". $up->unstable . "</strong>"; + echo "<tr class='".($i%2 ? 'odd' : 'even')."'><th>"; $i++; + echo "Unstable version: </th><td><strong>". $up->unstable . "</strong>"; if ($up->state) { echo " (". $up->state . ")\n"; } echo "</td></tr>\n"; } if ($owner && $owner->owner) { - echo "<tr class='".($i%2 ? 'odd' : 'even')."'><td>"; $i++; - echo "Owner</td><td><strong>". $owner->owner . "</strong>"; + echo "<tr class=\"".($i%2 ? 'odd' : 'even')."\"><th>"; $i++; + echo "Owner: </th><td><strong>". $owner->owner . "</strong>"; if ($owner->cc) { echo " (". $owner->cc . ")\n"; } echo "</td></tr>\n"; } - echo "<tr class='".($i%2 ? 'odd' : 'even')."'><td>ViewVC</td>"; $i++; - echo "<td><a href='http://cvs.fedoraproject.org/viewvc/rpms/$name/'>http://cvs.fedoraproject.org/viewvc/rpms/$name/</a>"; + echo "<tr class=\"".($i%2 ? 'odd' : 'even')."\"><th>ViewVC: </th>"; $i++; + echo "<td><a href=\"http://cvs.fedoraproject.org/viewvc/rpms/$name/\">http://cvs.fedoraproject.org/viewvc/rpms/$name/</a>"; echo "</td></tr>\n"; echo "</table>"; - - echo "<br /><table id='fedora-list-packages'>\n"; - echo "<tr><th colspan='3'>Packages available in Fedora Repositories</th></tr>\n"; + + echo "<table id=\"list-packages\">\n"; + echo "<caption>Packages available in Fedora Repositories</caption>\n"; $prev=false; do { echo "<tr class='".($i%2 ? 'odd' : 'even')."'>"; $i++; @@ -201,20 +129,11 @@ if (!$name) { <!-- document END --> </div> - <div class="fedora-corner-br"> </div> - <div class="fedora-corner-bl"> </div> - </div> <!-- content END --> - - <!-- footer BEGIN --> - - <div id="fedora-footer"> - <br/>The Fedora Project is maintained and driven by the community and sponsored by Red Hat. - <br/><a href="http://fedoraproject.org/wiki/Legal">Legal</a> | <a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a> - <br> +<?php +include '_footer.php'; +?> </div> - - <!-- footer END --> </body> </html> |