\n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print "

"; - print "".__("Package Details")."

\n"; - print "\n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print " "; - print "\n"; - - print "\n"; - print " \n"; + echo " \n"; + echo "

"; - print $row["Name"] . " " . $row["Version"]."

"; - print "".$row["URL"]."

".$row["Description"]; - print "

"; + # + echo "

\n"; + echo "

".__("Package Details")."

\n"; + echo "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " "; - - print "\n"; - print "\n"; - print " \n"; + echo " "; + echo ""; + echo $maintainer . ""; } else { - print $maintainer . ""; + echo $maintainer . ""; } } else { $maintainer = "None"; - print $maintainer . ""; + echo $maintainer . ""; } - print "\n"; - - print "\n"; - print " "; - print "\n"; + echo " \n"; + echo " \n"; # In case of wanting to put a custom message $msg = __("unknown"); $license = $row["License"] == "" ? $msg : $row["License"]; - print "\n"; - print " \n"; - print "\n"; - - print "\n"; - print " "; - print "\n"; + echo " \n"; + echo " \n"; # Print the timestamps for last updates $updated_time = ($row["ModifiedTS"] == 0) ? "(unknown)" : gmdate("r", intval($row["ModifiedTS"])); $submitted_time = ($row["SubmittedTS"] == 0) ? "(unknown)" : gmdate("r", intval($row["SubmittedTS"])); - print "\n"; - print " \n"; - print "\n"; - - print "\n"; - print " "; - print "\n"; - print "\n"; - print " \n"; + echo " \n"; + echo " "; + echo "".__("Tarball")." :: ".__("Files")." :: PKGBUILD"; } elseif ($row["LocationID"] == 3) { - print "CVS"; + echo "CVS"; } - print "\n"; + echo "\n"; if ($row["LocationID"] == 2) { - print "\n"; - print " "; + echo "".__("The above files have been verified (by %s) and are safe to use.", array(username_from_id($row["VerifiedBy"]))).""; } else { - print "".__("Be careful! The above files may contain malicious code that can damage your system.").""; - } + echo "".__("Be careful! The above files may contain malicious code that can damage your system.").""; + } + echo " \n"; } - print "\n"; - print " "; - print "\n"; - print "\n"; - print " \n"; - print "\n"; + echo "\n"; + echo "

"; + echo $row["Name"] . " " . $row["Version"]."

"; + echo "".$row["URL"]."

".$row["Description"]; + echo "

"; if ($row["Location"] == "unsupported" and ( uid_from_sid($SID) == $row["MaintainerUID"] or (account_from_sid($SID) == "Developer" or @@ -309,87 +292,65 @@ function package_details($id=0, $SID="") { } else { $edit_cat = $row["Category"]; } - print $row["Location"]." :: ".$edit_cat."

".__("Maintainer").": "; + echo $row["Location"]." :: ".$edit_cat."

".__("Maintainer").": "; if ($row["MaintainerUID"]) { $maintainer = username_from_id($row["MaintainerUID"]); if ($SID) { - print ""; - print $maintainer . "

".__("Votes").": "; - print $row["NumVotes"] . "

".__("Votes").": "; + echo $row["NumVotes"] . "

".__("License").": ".$license; - print "

".__("License").": ".$license; + echo "

"; - print ""; - print __("Last Updated").": ".$updated_time."
"; - print __("First Submitted").": ".$submitted_time; - print ""; - print "

"; + echo "

"; + echo __("Last Updated").": ".$updated_time."
"; + echo __("First Submitted").": ".$submitted_time."

"; if ($row["LocationID"] == 2) { global $URL_DIR; $urlpath = $URL_DIR.$row["Name"]."/".$row["Name"]; - print "".__("Tarball")." :: ".__("Files")." :: PKGBUILD

"; + echo "

"; if ($row["Safe"]) { - print "".__("The above files have been verified (by %s) and are safe to use.", array(username_from_id($row["VerifiedBy"])))."

"; - print ""; - print "\n"; - print "\n"; + echo " \n"; + echo " "; - - print " \n"; + echo " "; - print "\n"; - print "\n"; - print " \n"; - print "

"; - print __("Dependencies")."

"; + echo "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; - print "

"; + echo __("Dependencies")."

"; $deps = package_dependencies($row["ID"]); # $deps[0] = array('id','name', 'dummy'); while (list($k, $darr) = each($deps)) { $url = "".$darr[1].$darr[3]."
\n"; - else print "".$darr[1].$darr[3]."
\n"; + if ($darr[2] == 0) echo $url."'>".$darr[1].$darr[3]."
\n"; + else echo "".$darr[1].$darr[3]."
\n"; } - print "

"; - print ""; - print "\n"; - print "\n"; + echo "

"; - print __("Sources")."

"; + echo "

\n"; + echo "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; - print "

"; + echo __("Sources")."

"; $sources = package_sources($row["ID"]); # $sources[0] = 'src'; while (list($k, $src) = each($sources)) { $parsed_url = parse_url($src); if ($parsed_url['scheme']) { //It is an external source - print "".$src."
\n"; + echo "".$src."
\n"; } else { //It is presumably an internal source if ($row["LocationID"] == 2) { - print "".$src."
\n"; + echo "".$src."
\n"; } elseif ($row["LocationID"] == 3) { - print ""; - print $src."
\n"; + echo ""; + echo $src."
\n"; } } } - print "

"; - print "

\n"; - print "\n"; - print "

\n"; + echo "

\n"; + echo " \n"; + echo "\n\n"; + echo "
\n\n"; - print "

\n"; # Actions Bar # if ($SID) { - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "

".__("Actions")."

\n"; - print "\n"; - print "\n"; + echo "

\n"; + echo "

".__("Actions")."

\n"; + echo "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; # Voting Button # $q = "SELECT * FROM PackageVotes WHERE UsersID = ".uid_from_sid($SID); $q.= " AND PackageID = ".$row["ID"]; if (!mysql_num_rows(db_query($q, $dbh))) { - print ""; + echo " "; } else { - print ""; + echo ""; } # Comment Nofify Button # $q = "SELECT * FROM CommentNotify WHERE UserID = ".uid_from_sid($SID); $q.= " AND PkgID = ".$row["ID"]; if (!mysql_num_rows(db_query($q, $dbh))) { - print ""; + echo ""; } else { - print ""; + echo ""; } # Flag Safe Button # - if ($row["LocationID"] == 2 && (account_from_sid($SID) == "Trusted User" || account_from_sid($SID) == "Developer")) - { - if ($row["Safe"] == 0) - { - print ""; - } - else - { - print ""; + if ($row["LocationID"] == 2 && (account_from_sid($SID) == "Trusted User" || account_from_sid($SID) == "Developer")) { + if ($row["Safe"] == 0) { + echo ""; + } else { + echo ""; } + } + + if ($row["OutOfDate"] == 0) { + echo "\n"; + } else { + echo "\n"; } - if ($row["OutOfDate"] == 0) - { - print "\n"; - } - else - { - print "\n"; - } - if ($row["AURMaintainerUID"] == 0 && $row["MaintainerUID"] == 0) - { - print "\n"; - } + if ($row["AURMaintainerUID"] == 0 && $row["MaintainerUID"] == 0) { + echo "\n"; + } - if ($row["MaintainerUID"] == uid_from_sid($SID)) - { - print "\n"; - } + if ($row["MaintainerUID"] == uid_from_sid($SID)) { + echo "\n"; + } - if ($row["MaintainerUID"] == uid_from_sid($SID) || - account_from_sid($SID) == "Trusted User" || - account_from_sid($SID) == "Developer") - { - print "\n"; - } + if ($row["MaintainerUID"] == uid_from_sid($SID) || + account_from_sid($SID) == "Trusted User" || + account_from_sid($SID) == "Developer") { + echo "\n"; + } - print "

\n"; + echo " \n"; + echo " \n"; + echo "\n"; + echo "\n
\n\n"; } # Comments # - print "\n"; - print "\n"; - print "\n"; - print "

".__("Comments")."

"; - - print "\n"; + echo "

\n"; + echo "

".__("Comments")."

\n"; + echo "

\n"; $comments = package_comments($row["ID"]); if (!empty($comments)) { while (list($indx, $carr) = each($comments)) { - print "\n"; - print " \n"; - - print "\n"; - print " \n"; + echo " \n"; } } - print "\n"; - print " \n"; - print "\n"; - print " "; - print "\n"; - - print "

"; - print "

"; - print ""; - print "\n"; + echo " \n"; - print "\n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "

"; + + echo "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; - print "

"; if (canDeleteComment($carr["ID"], account_from_sid($SID), $SID)) { $durl = "

"; - print $durl . " "; + echo $durl . " "; } if ($SID) { - print __("Comment by: %h%s%h on %h%s%h", + echo __("Comment by: %h%s%h on %h%s%h", array("",$carr["UserName"],"", "",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"")); } else { - print __("Comment by: %h%s%h on %h%s%h", + echo __("Comment by: %h%s%h on %h%s%h", array("",$carr["UserName"],"", "",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"")); } - print ""; - print "

"; - print "

\n";
-					print str_replace("\n", "
", str_replace('"',""", htmlspecialchars(strip_tags(stripslashes($carr["Comments"])))));
-					print "

\n"; - print "

"; + echo "

\n";
+					echo str_replace("\n", "
", str_replace('"',""", htmlspecialchars(strip_tags(stripslashes($carr["Comments"])))));
+                    echo "

\n"; + echo "

"; - print "

"; - print "\n"; - print "

\n"; - - - print "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "\n"; } } -- cgit v1.2.3-54-g00ecf From aebdd21b58046f647c7c500dde5152ba774303ab Mon Sep 17 00:00:00 2001 From: eliott Date: Mon, 24 Sep 2007 07:57:35 -0700 Subject: More changes to page styles. --- web/html/account.php | 7 +++++++ web/html/css/arch.css | 20 +++++++++++++++----- web/html/index.php | 17 ++++++++--------- web/html/pkgsubmit.php | 8 +++++--- web/lib/pkgfuncs.inc | 18 +++++++++--------- 5 files changed, 44 insertions(+), 26 deletions(-) (limited to 'web/lib/pkgfuncs.inc') diff --git a/web/html/account.php b/web/html/account.php index fd9cc61..3d98171 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -13,6 +13,10 @@ html_header(); # print out the HTML header # Main page processing here # +echo "

\n"; +echo "

".__("Accounts")."

\n"; +echo "

\n"; + if (isset($_COOKIE["AURSID"])) { # visitor is logged in # @@ -148,6 +152,9 @@ if (isset($_COOKIE["AURSID"])) { } } +echo "

"; +echo "

"; + html_footer("\$Id$"); # vim: ts=2 sw=2 noet ft=php ?> diff --git a/web/html/css/arch.css b/web/html/css/arch.css index 7d8f41f..65f3cff 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -410,7 +410,7 @@ textarea.vLargeTextField { margin-left: 5%; margin-right: 5%; } -.pkgbox { +.pgbox { width: 90%; margin-left: 5%; margin-right: 5%; @@ -421,7 +421,17 @@ textarea.vLargeTextField { text-align: left; padding: 3px; } -.pkgboxtitle { +.frontpgboxbody { + padding: 10px; +} +.frontpgboxbody > table { + width: 100%; +} +.boxSoftTitle { + text-align: right; +} + +.pgboxtitle { border-width: 2px; border-style: solid; border-color: #dddddd; @@ -435,14 +445,14 @@ textarea.vLargeTextField { padding-bottom: 2px; padding-right: 10px; } -.pkgboxbody, .pkgboxbody-comment { +.pgboxbody, .pgboxbody-comment { padding: 10px; } -.pkgboxbody input { +.pgboxbody input { margin-right: 10px; } -.pkgboxbody-comment > table { +.pgboxbody-comment > table { border-collapse: separate; border-spacing: 0 15px; } diff --git a/web/html/index.php b/web/html/index.php index 7d28d75..d76d13d 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -79,19 +79,19 @@ if (isset($_REQUEST["user"]) || isset($_REQUEST["pass"])) { html_header(); # Big Top Level Table (Table 1) -print "\n"; -print "\n"; +echo "

\n"; +echo "

AUR-".__("Home")."

\n"; +echo "

\n"; +echo "\n"; # MAIN: Top Left print ""; @@ -178,9 +178,6 @@ print ""; print "

"; print "

".__("Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information.", array('', '', '', ''))."
"; print __("Contributed PKGBUILDs must conform to the %hArch Packaging Standards%h otherwise they will be deleted!", array('', ''))."

"; -#print "

".__("If you have feedback about the AUR, please leave it in %hFlyspray%h.", array('', ''))."
"; -#print __("Email discussion about the AUR takes place on the %sTUR Users List%s.", array('', ''))."

"; print "

".__("Remember to vote for your favourite packages!")."
"; print __("The most popular packages will be provided as binary packages in [community].")."

"; -#print "

".__("Though we can't vouch for their contents, we provide a %hlist of user repositories%h for your convenience.", array('', ''))."

"; # MAIN: Top Right print "

"; # End Table 2 -#print " "; -#print " \n"; - # MAIN: Bottom Right print ""; print ""; @@ -357,8 +354,10 @@ print ""; print " "; print "\n"; print "\n"; +echo "\n"; # End Table 1 - +echo " "; +echo ""; html_footer("Version 1.3.1 \$Id$"); # vim: ts=2 sw=2 noet ft=php ?> diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 89ecfa4..24aeea5 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -9,7 +9,9 @@ include("config.inc"); # configuration file with dir locations set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in html_header(); # print out the HTML header -print "\n"; +echo "

\n"; +echo "

".__("Submit")."

\n"; +echo "

\n"; # Debugging $DBUG = 0; @@ -665,8 +667,8 @@ if ($_COOKIE["AURSID"]) { print __("You must create an account before you can upload packages."); print "
\n"; } - -print "

\n"; +echo " \n"; +echo "\n"; html_footer("\$Id$"); # vim: ts=2 sw=2 noet ft=php ?> diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index de1dc5f..3089ccb 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -269,9 +269,9 @@ function package_details($id=0, $SID="") { # print out package details # - echo "

\n"; - echo "

".__("Package Details")."

\n"; - echo "

\n"; + echo "

".__("Package Details")."

\n"; + echo "

\n"; echo " \n"; echo " \n"; @@ -409,9 +409,9 @@ function package_details($id=0, $SID="") { # Actions Bar # if ($SID) { - echo "

\n"; - echo "

".__("Actions")."

\n"; - echo "

\n"; + echo "

".__("Actions")."

\n"; + echo "

\n"; echo " \n"; echo " \n"; echo " \n"; @@ -482,9 +482,9 @@ function package_details($id=0, $SID="") { # Comments # - echo "

\n"; - echo "

".__("Comments")."

\n"; - echo "

\n"; + echo "

".__("Comments")."

\n"; + echo "

\n"; echo "

"; echo $row["Name"] . " " . $row["Version"]."

\n"; $comments = package_comments($row["ID"]); if (!empty($comments)) { -- cgit v1.2.3-54-g00ecf