From d14def92ff34122bffa4de1fac01598b1d913648 Mon Sep 17 00:00:00 2001 From: Callan Barrett Date: Fri, 18 Jan 2008 01:11:12 +0900 Subject: Turn action bar into drop box Moves the action bar down to the bottom right of the search results and turns it into a drop-down selection box. Signed-off-by: Callan Barrett Signed-off-by: Simo Leone --- web/html/packages.php | 26 +++++++++--------- web/lang/en/search_po.inc | 2 +- web/lib/pkgfuncs.inc | 67 +++++++++++++++-------------------------------- web/template/header.php | 2 +- 4 files changed, 35 insertions(+), 62 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 143fbdf6..a6e2ef9d 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -47,7 +47,7 @@ if (isset($_COOKIE["AURSID"])) { # grab the list of Package IDs to be operated on # -isset($_REQUEST["IDs"]) ? $ids = $_REQUEST["IDs"] : $ids = array(); +isset($_POST["IDs"]) ? $ids = $_POST["IDs"] : $ids = array(); #isset($_REQUEST["All_IDs"]) ? # $all_ids = explode(":", $_REQUEST["All_IDs"]) : # $all_ids = array(); @@ -55,7 +55,7 @@ isset($_REQUEST["IDs"]) ? $ids = $_REQUEST["IDs"] : $ids = array(); # determine what button the visitor clicked # -if (isset($_REQUEST["do_Flag"])) { +if ($_POST['action'] == "do_Flag") { if (!$atype) { print __("You must be logged in before you can flag packages."); print "
\n"; @@ -111,7 +111,7 @@ if (isset($_REQUEST["do_Flag"])) { } } -} elseif (isset($_REQUEST["do_UnFlag"])) { +} elseif ($_POST['action'] == "do_UnFlag") { if (!$atype) { print __("You must be logged in before you can unflag packages."); print "
\n"; @@ -148,7 +148,7 @@ if (isset($_REQUEST["do_Flag"])) { } -} elseif (isset($_REQUEST["do_Disown"])) { +} elseif ($_POST['action'] == "do_Disown") { if (!$atype) { print __("You must be logged in before you can disown packages."); print "
\n"; @@ -204,7 +204,7 @@ if (isset($_REQUEST["do_Flag"])) { } -} elseif (isset($_REQUEST["do_Delete"])) { +} elseif ($_POST['action'] == "do_Delete") { if (!$atype) { print __("You must be logged in before you can disown packages."); print "
\n"; @@ -309,7 +309,7 @@ if (isset($_REQUEST["do_Flag"])) { } # end if (!empty($ids)) } # end if (!atype) -} elseif (isset($_REQUEST["do_Adopt"])) { +} elseif ($_POST['action'] == "do_Adopt") { if (!$atype) { print __("You must be logged in before you can adopt packages."); print "
\n"; @@ -367,7 +367,7 @@ if (isset($_REQUEST["do_Flag"])) { } -} elseif (isset($_REQUEST["do_Vote"])) { +} elseif ($_POST['action'] == "do_Vote") { if (!$atype) { print __("You must be logged in before you can vote for packages."); print "
\n"; @@ -425,7 +425,7 @@ if (isset($_REQUEST["do_Flag"])) { } -} elseif (isset($_REQUEST["do_UnVote"])) { +} elseif ($_POST['action'] == "do_UnVote") { if (!$atype) { print __("You must be logged in before you can un-vote for packages."); print "
\n"; @@ -475,18 +475,16 @@ if (isset($_REQUEST["do_Flag"])) { } -} elseif (isset($_REQUEST["ID"])) { +} elseif (isset($_GET["ID"])) { - if (!intval($_REQUEST["ID"])) { + if (!intval($_GET["ID"])) { print __("Error trying to retrieve package details.")."
\n"; } else { - package_details($_REQUEST["ID"], $_COOKIE["AURSID"]); + package_details($_GET["ID"], $_COOKIE["AURSID"]); } - # FIXME: If someone hits the detail page's vote button, this link dies - -} elseif (isset($_REQUEST["do_Notify"])) { +} elseif ($_POST['action'] == "do_Notify") { # I realize that the implementation here seems a bit convoluted, but we want to # ensure that everything happens as it should, even if someone called this page # without having clicked a button somewhere (naughty naughty). This also leaves diff --git a/web/lang/en/search_po.inc b/web/lang/en/search_po.inc index 601782c0..6c73a1a0 100644 --- a/web/lang/en/search_po.inc +++ b/web/lang/en/search_po.inc @@ -39,7 +39,7 @@ $_t["en"]["Error trying to retrieve package details."] = "Error trying to retrie $_t["en"]["The selected packages have been adopted."] = "The selected packages have been adopted."; -$_t["en"]["You have been removed from the comment notification list for %s."] = "You have been removed from the comment notification listfor %s."; +$_t["en"]["You have been removed from the comment notification list for %s."] = "You have been removed from the comment notification list for %s."; $_t["en"]["Your votes have been cast for the selected packages."] = "Your votes have been cast for the selected packages."; diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 713eb6b2..36080124 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -766,8 +766,10 @@ function pkg_search_page($SID="") { print "\n"; print "\n"; print "\n"; + print ""; print "
\n"; + print "
\n"; # query to pull out package info # # $q = "SELECT Packages.*, IF(ISNULL(PackageID), 0, COUNT(*)) AS Votes "; @@ -879,51 +881,8 @@ function pkg_search_page($SID="") { $qnext = $q."LIMIT ".($O+$PP).", ".$PP; //next page's worth $q.= "LIMIT ".$O.", ".$PP; - if ($SID) { - # The 'Actions' table - # - print "
\n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "
\n"; - print " ".__("Actions")."\n"; - print "
\n"; - print "\n"; - print "\n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print "
"; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print "
\n"; - print "
\n"; - print "
\n"; - print "
\n"; - } - - // Why? - // print "\n"; + $result = db_query($q, $dbh); print "
\n"; @@ -1100,13 +1059,29 @@ function pkg_search_page($SID="") { if ($_REQUEST["do_Orphans"]) { print "\n"; } - + + if ($SID) { + # The 'Actions' box + # + print "
"; + print ""; + print ""; + print "
"; + } + print "\n"; print "\n"; print "
\n"; print " \n"; print " \n"; - + # figure out the results to use $first = $O + 1; diff --git a/web/template/header.php b/web/template/header.php index 6e114fdd..488d2906 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -93,7 +93,7 @@ if (isset($_COOKIE["AURSID"])) { } ?> - '> + '> -- cgit v1.2.3-24-g4f1b