From 9c044fffcfdd37fb2618415059df805c6b621c9a Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Wed, 21 Jan 2004 18:08:17 +0000 Subject: - Patch #5281: removed hardcoded table and CSS from the queue module. Made the queue page-able. Patch by Stefan. --- modules/queue.module | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'modules/queue.module') diff --git a/modules/queue.module b/modules/queue.module index 58a57599e..1aee24bc8 100644 --- a/modules/queue.module +++ b/modules/queue.module @@ -105,25 +105,29 @@ function queue_vote($node, $vote) { function queue_overview() { global $user; - $result = db_query("SELECT n.*, u.name, u.uid FROM {node} n INNER JOIN {users} u ON n.uid = u.uid WHERE n.moderate = 1"); + $header = array(array("data" => t("subject")), array("data" => t("author")), array("data" => t("type")), array("data" => t("score"))); - $output .= ""; - $output .= " "; - while ($node = db_fetch_object($result)) { + $sresult = pager_query("SELECT n.*, u.name, u.uid FROM {node} n INNER JOIN {users} u ON n.uid = u.uid WHERE n.moderate = 1", 10, 0); + + while ($node = db_fetch_object($sresult)) { if ($user->uid == $node->uid || field_get($node->users, $user->uid)) { - $output .= " "; + $rows[] = array(array("data" => l($node->title, "queue/$node->nid"), "class" => "title"), array("data" => format_name($node), "class" => "name"), array("data" => module_invoke($node->type, "node", "name"), "class" => "type"), array("data" => queue_score($node->nid), "class" => "score")); } else { - $output .= " "; + $rows[] = array(array("data" => l($node->title, "queue/$node->nid"), "class" => "title"), array("data" => format_name($node), "class" => "name"), array("data" => module_invoke($node->type, "node", "name"), "class" => "type"), array("data" => l(t("vote"), "queue/$node->nid"), "class" => "score")); } + } - if ($node->teaser) { - $output .= " "; - } + if ($pager = theme("pager", NULL, 10, 0, tablesort_pager())) { + $rows[] = array(array("data" => $pager, "colspan" => 4)); } - $output .= "
". t("Subject") ."". t("Author") ."". t("Type") ."". t("Score") ."
". l($node->title, "queue/$node->nid") ."". format_name($node) ."". module_invoke($node->type, "node", "name") ."". queue_score($node->nid) ."
". l($node->title, "queue/$node->nid") ."". format_name($node) ."". module_invoke($node->type, "node", "name") ."". l(t("vote"), "queue/$node->nid") ."
". check_output($node->teaser) ."
"; + + $output = "
"; + $output .= theme("table", $header, $rows); + $output .= "
"; drupal_set_title(t("Submission queue")); + print theme("page", $output); } -- cgit v1.2.3