From cfeb080dcd7f593cf70a7d12ef873c95c95ae40f Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Sat, 20 Dec 2008 23:42:35 -0500 Subject: Make all web paths relative. The site no longer needs to be hosted from the root of a domain, or virtual host. Signed-off-by: Loui Chang Signed-off-by: Callan Barrett --- web/html/css/arch.css | 4 ++-- web/lib/acctfuncs.inc | 4 ++-- web/lib/pkgfuncs.inc | 22 +++++++++++----------- web/template/header.php | 14 +++++++------- web/template/login_form.php | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index 9dc630e..bc629e8 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -2,7 +2,7 @@ * ul { padding: 20px; } body { min-width: 600px; - background: #fbf8f1 url("/images/titlebar.png") repeat-x top left; + background: #fbf8f1 url("../images/titlebar.png") repeat-x top left; padding: 0 30px; color: #555; font-family: "DejaVu Sans", "Bitstream Vera Sans", "Lucida Grande", Arial, sans-serif; @@ -125,7 +125,7 @@ body { } #logo h1#archtitle a { display: block; - background: transparent url("/images/titlelogo.png") top left no-repeat; + background: transparent url("../images/titlelogo.png") top left no-repeat; width: 350px; height: 103px; } diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc index 6120777..d7fabcf 100644 --- a/web/lib/acctfuncs.inc +++ b/web/lib/acctfuncs.inc @@ -463,7 +463,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", } print ""; print ""; - print "".$row["Username"].""; + print "".$row["Username"].""; print ""; print "".$row["AccountType"]; print ""; @@ -593,7 +593,7 @@ function display_account_info($U="",$T="", print " \n"; print " \n"; - print " ".__("View this user's packages")."\n"; + print " ".__("View this user's packages")."\n"; print " \n"; print "\n"; diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index f99810a..ca054db 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -306,7 +306,7 @@ function package_details($id=0, $SID="") { uid_from_sid($SID) == $row["MaintainerUID"] or (account_from_sid($SID) == "Developer" or account_from_sid($SID) == "Trusted User"))) { - $edit_cat = "".$row["Category"].""; $edit_cat .= "  ("; $edit_cat .= __("change category").")"; @@ -318,7 +318,7 @@ function package_details($id=0, $SID="") { if ($row["MaintainerUID"]) { $maintainer = username_from_id($row["MaintainerUID"]); if ($SID) { - echo ""; echo $maintainer . ""; } else { @@ -473,7 +473,7 @@ function package_details($id=0, $SID="") { echo "
\n"; echo "
".__("Actions")."
\n"; echo "
\n"; - echo "
\n"; + echo " \n"; echo " \n"; echo " \n"; # Voting Button @@ -537,7 +537,7 @@ function package_details($id=0, $SID="") { echo " \n"; if (isset($_COOKIE['AURSID'])) { echo "\n"; echo "
"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; @@ -555,7 +555,7 @@ function package_details($id=0, $SID="") { echo "
"; if (canDeleteComment($carr["ID"], account_from_sid($SID), $SID)) { - $durl = ""; @@ -564,7 +564,7 @@ function package_details($id=0, $SID="") { } if ($SID) { echo __("Comment by: %h%s%h on %h%s%h", - array("",$carr["UserName"],"", + array("",$carr["UserName"],"", "",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"")); } else { echo __("Comment by: %h%s%h on %h%s%h", @@ -767,7 +767,7 @@ function pkg_search_page($SID="") { $result = db_query($q, $dbh); $total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0); - print "\n"; + print "\n"; print "
\n"; print "\n"; print "\n"; @@ -856,7 +856,7 @@ function pkg_search_page($SID="") { print " \n"; print " "; // RIGHT print "
"; print $row["Category"].""; - $url = ""; print " "; if (($O-$PP) >= 0) { - print "" . __("Less") . ""; + print "" . __("Less") . ""; } else if ($O<$PP && $O>0) { - print "" . __("Less") . ""; + print "" . __("Less") . ""; } print " "; if ($total - $PP - $O > 0) { - print "" . diff --git a/web/template/header.php b/web/template/header.php index 352135a..dcf99f3 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -5,9 +5,9 @@ xml:lang=""> AUR (<?php print $LANG; ?>)<?php if ($title != "") { print " - " . $title; } ?> - - - + + + @@ -20,7 +20,7 @@