From 886b1ca73cc20b7c266dd0a7da0e863b722c47df Mon Sep 17 00:00:00 2001 From: "Johan \"Papa\" Cwiklinski" Date: Tue, 25 May 2010 20:00:16 +0200 Subject: Change zoom page layout and validate xhtml 1.0 strict ; apply some minor graphical changes (thanks to Pingou) --- css/rpmphp.css | 33 ++++++++-- zoom.php | 187 ++++++++++++++++----------------------------------------- 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 @@ - - - - Packages in Fedora - - - - - - - + + + + Packages in Fedora + + + + + - -
- - -
- -
- Package :  - - -
-
- -
- -
-   - Reports home -   - Package detail - - - -
-
- - - - -
-
 
-
 
-
- - - +
+ +
+
+

You are here:

+ +
Enter a package name\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 "

$name not found

\n"; } else { echo "

Package: $name

\n"; - echo "\n"; - echo "\n"; + echo "
Upstream info
\n"; + echo "\n"; $i=0; - + if ($rpm->summary) { - echo "\n"; + echo "\n"; } else if ($owner->summary) { - echo "\n"; + echo "\n"; } if ($rpm->url) { - echo "\n"; + echo "\n"; } if ($up && $up->type) { - echo "\n"; + echo "\n"; } if ($up && $up->channel) { - echo "\n"; + echo "\n"; } if ($up && $up->stable) { - echo "\n"; + echo "\n"; } if ($up && $up->unstable && $up->stable!=$up->unstable) { - echo "\n"; } if ($owner && $owner->owner) { - echo "\n"; } - echo ""; $i++; - echo ""; $i++; + echo "\n"; echo "
Upstream info
"; $i++; - echo "Summary". $rpm->summary . "
"; $i++; + echo "Summary: ". $rpm->summary . "
"; $i++; - echo "Summary". $owner->summary . "
"; $i++; + echo "Summary: ". $owner->summary . "
"; $i++; - echo "URL". $rpm->url . "
"; $i++; + echo "URL: ". $rpm->url . "
"; $i++; - echo "Type". $up->type . "
"; $i++; + echo "Type: ". $up->type . "
"; $i++; - echo "Channel". $up->channel . "
"; $i++; + echo "Channel: ". $up->channel . "
"; $i++; - echo "Stable version". $up->stable . "
"; $i++; + echo "Stable version: ". $up->stable . "
"; $i++; - echo "Unstable version". $up->unstable . ""; + echo "
"; $i++; + echo "Unstable version: ". $up->unstable . ""; if ($up->state) { echo " (". $up->state . ")\n"; } echo "
"; $i++; - echo "Owner". $owner->owner . ""; + echo "
"; $i++; + echo "Owner: ". $owner->owner . ""; if ($owner->cc) { echo " (". $owner->cc . ")\n"; } echo "
ViewVChttp://cvs.fedoraproject.org/viewvc/rpms/$name/"; + echo "
ViewVC: http://cvs.fedoraproject.org/viewvc/rpms/$name/"; echo "
"; - - echo "
\n"; - echo "\n"; + + echo "
Packages available in Fedora Repositories
\n"; + echo "\n"; $prev=false; do { echo ""; $i++; @@ -200,21 +128,12 @@ if (!$name) { - -
 
-
 
- - - - - - -- cgit
Packages available in Fedora Repositories