summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan "Papa" Cwiklinski <trasher@odysseus.(none)>2010-05-25 20:00:16 +0200
committerJohan "Papa" Cwiklinski <trasher@odysseus.(none)>2010-05-25 20:00:16 +0200
commit886b1ca73cc20b7c266dd0a7da0e863b722c47df (patch)
tree0c655233bc12f8309cc9d9f9ba2fbad99606a4be
parent449959fe84ca08bcfcd5507d91114ec11c34120a (diff)
Change zoom page layout and validate xhtml 1.0 strict ; apply some minor graphical changes (thanks to Pingou)
-rw-r--r--css/rpmphp.css33
-rw-r--r--zoom.php187
2 files changed, 81 insertions, 139 deletions
diff --git a/css/rpmphp.css b/css/rpmphp.css
index 4aea4b7..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{
@@ -175,17 +183,32 @@ 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 {
background:url(../images/icon-error.png) no-repeat left;
padding-left: 21px!important;
diff --git a/zoom.php b/zoom.php
index 4e1fb75..f3c8bf8 100644
--- a/zoom.php
+++ b/zoom.php
@@ -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&nbsp;:&nbsp;
- <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>
- &nbsp;<img src='http://docs.fedoraproject.org/images/link-offsite-side.png' />
- <a href="./">Reports home</a>
- &nbsp;<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">&nbsp;</div>
- <div class="fedora-corner-tl">&nbsp;</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">&nbsp;</div>
- <div class="fedora-corner-bl">&nbsp;</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>