X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fall.php;h=44e3fd2394be28d1ff6dfc1e5edf3b8b71dcf514;hb=03a08efce9bfe3be1673581594498b5d856d08b0;hp=70641a0f652afdee3fe0752e6eb9bf43d6ed67f4;hpb=d0e03e8caddb9e8231c8ff79ac7359f630f001a1;p=quix0rs-gnu-social.git

diff --git a/actions/all.php b/actions/all.php
index 70641a0f65..44e3fd2394 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -45,14 +45,9 @@ class AllAction extends StreamAction {
 		# Looks like we're good; show the header
 
 		common_show_header($profile->nickname . _t(" and friends"),
-						   array($this, 'show_header'), $user);
-
-		$cur = common_current_user();
-
-		if ($cur && $profile->id == $cur->id) {
-			common_notice_form();
-		}
-
+						   array($this, 'show_header'), $user,
+						   array($this, 'show_top'));
+		
 		$this->show_notices($profile);
 		
 		common_show_footer();
@@ -66,6 +61,16 @@ class AllAction extends StreamAction {
 									 'title' => _t('Feed for friends of ') . $user->nickname));
 	}
 
+	function show_top($user) {
+		$cur = common_current_user();
+		
+		if ($cur && $cur->id == $user->id) {
+			common_notice_form();
+		}
+		
+		$this->views_menu();
+	}
+	
 	function show_notices($profile) {
 
 		$notice = DB_DataObject::factory('notice');
@@ -83,39 +88,20 @@ class AllAction extends StreamAction {
 
 		$cnt = $notice->find();
 
-		common_element_start('div', 'notices width100');
-		common_element('h2', 'notices', _t('Notices'));
-
-		for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-			if ($notice->fetch()) {
-				$this->show_notice($notice);
-			} else {
-				// shouldn't happen!
-				break;
+		if ($cnt > 0) {
+			common_element_start('ul', array('id' => 'notices'));
+			for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
+				if ($notice->fetch()) {
+					$this->show_notice($notice);
+				} else {
+					// shouldn't happen!
+					break;
+				}
 			}
-		}
-
-		if ($page > 1) {
-			common_element_start('span', 'floatLeft width25');
-			common_element('a', array('href' => common_local_url('all',
-																 array('nickname' => $profile->nickname,
-																	   'page' => $page-1)),
-									  'class' => 'newer'),
-						   _t('Newer'));
-			common_element_end('span');
+			common_element_end('ul');
 		}
 		
-		if ($cnt > NOTICES_PER_PAGE) {
-			common_element_start('span', 'floatRight width25');
-			common_element('a', array('href' => common_local_url('all', 
-																 array('nickname' => $profile->nickname,
-																	   'page' => $page+1)),
-									  'class' => 'older'),
-						   _t('Older'));
-			common_element_end('span');
-		}
-
-		# XXX: show a link for the next page
-		common_element_end('div');
+		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+						  $page, 'all', array('nickname' => $profile->nickname));
 	}
 }