*Index link fixed in uaser and site comment navigators

*No bloody idea why I added the assertions in display_all_user_comments();
*Commented out some doohickey thing that did something and borke other stuff
*Added index link and paginator in user comment list
This commit is contained in:
pachuco 2012-11-24 20:36:00 +02:00
parent f6f2638003
commit cfe3fabd6d

View File

@ -36,7 +36,7 @@ class CommentListTheme extends Themelet {
$h_prev = ($page_number <= 1) ? "Prev" : $h_prev = ($page_number <= 1) ? "Prev" :
'<a href="'.make_link('comment/list/'.$prev).'">Prev</a>'; '<a href="'.make_link('comment/list/'.$prev).'">Prev</a>';
$h_index = "<a href='".make_link("comment/list")."'>Index</a>"; $h_index = "<a href='".make_link("post/list")."'>Index</a>";
$h_next = ($page_number >= $total_pages) ? "Next" : $h_next = ($page_number >= $total_pages) ? "Next" :
'<a href="'.make_link('comment/list/'.$next).'">Next</a>'; '<a href="'.make_link('comment/list/'.$next).'">Next</a>';
@ -171,7 +171,11 @@ class CommentListTheme extends Themelet {
} }
public function display_all_user_comments($comments, $page_number, $total_pages) { public function display_all_user_comments($comments, $page_number, $total_pages) {
global $page; global $page, $user;
assert(is_numeric($page_number));
assert(is_numeric($total_pages));
$html = ""; $html = "";
foreach($comments as $comment) { foreach($comments as $comment) {
$html .= $this->comment_to_html($comment, true); $html .= $this->comment_to_html($comment, true);
@ -185,18 +189,19 @@ class CommentListTheme extends Themelet {
$prev = $page_number - 1; $prev = $page_number - 1;
$next = $page_number + 1; $next = $page_number + 1;
$u_tags = url_escape(implode(" ", $search_terms)); //$search_terms = array('I','have','no','idea','what','this','does!');
$query = empty($u_tags) ? "" : '/'.$u_tags; //$u_tags = url_escape(implode(" ", $search_terms));
//$query = empty($u_tags) ? "" : '/'.$u_tags;
$h_prev = ($page_number <= 1) ? "Prev" : "<a href='$prev'>Prev</a>"; $h_prev = ($page_number <= 1) ? "Prev" : "<a href='$prev'>Prev</a>";
$h_index = "<a href='".make_link("post/list")."'>Index</a>";
$h_next = ($page_number >= $total_pages) ? "Next" : "<a href='$next'>Next</a>"; $h_next = ($page_number >= $total_pages) ? "Next" : "<a href='$next'>Next</a>";
$page->add_block(new Block("Navigation", $h_prev.' | '.$h_next, "left", 0)); $page->add_block(new Block("Navigation", $h_prev.' | '.$h_index.' | '.$h_next, "left", 0));
$this->display_paginator($page, 'comment/beta-search/'.$user->name, null, $page_number, $total_pages);
} }
protected function comment_to_html($comment, $trim=false) { protected function comment_to_html($comment, $trim=false) {
global $config, $user; global $config, $user;