X-Git-Url: http://git.pk910.de/?p=phpgitweb.git;a=blobdiff_plain;f=htdocs%2Fpages%2Fshortlog.class.php;fp=htdocs%2Fpages%2Fshortlog.class.php;h=38c8db5e1139a1ff365f3e3fb6f11fa761a19dad;hp=34cfa8042f35aa6a8108e6c900a979fda062501d;hb=394a07ff3e283f94c7ead44e8bd02d44c223314b;hpb=ce9f1b8b05ff571f6922460cf91b45aa5a119d94

diff --git a/htdocs/pages/shortlog.class.php b/htdocs/pages/shortlog.class.php
index 34cfa80..38c8db5 100644
--- a/htdocs/pages/shortlog.class.php
+++ b/htdocs/pages/shortlog.class.php
@@ -22,6 +22,7 @@ class shortlog {
 	private $project;
 	private $graph_data;
 	private $first_commit;
+	private $have_more = false;
 	
 	public function generate_shortlog($project, $head, $max, $skip, $file = null, $pages = true, $next_page = 0) {
 		$this->project = $project;
@@ -66,6 +67,7 @@ class shortlog {
 			if($commit_counter < $skip)
 				continue;
 			if($commit_counter > $max+$skip) {
+				$this->have_more = true;
 				if($pages) {
 					$content->append('entries', new ContentProvider('shortlog', 'shortlog_page', array("page" => $next_page)));
 				} else
@@ -81,6 +83,10 @@ class shortlog {
 		return $this->first_commit;
 	}
 	
+	public function get_have_more() {
+		return $this->have_more;
+	}
+	
 	private function shortlog_entry($class, $commit) {
 		$entry = new ContentProvider('shortlog', 'shortlog_entry');
 		$entry->set('class', $class);
@@ -101,17 +107,17 @@ class shortlog {
 		if(GitConfig::GITGRAPH_ENABLE)
 			$entry->set('graph_data', $this->graph_data->get_graph($commit['id']));
 		
-		$entry->set('refs', $this->shortlog_commit_refs($commit['id']));
+		$entry->set('refs', $this->shortlog_commit_refs($this->project, $commit['id']));
 		
 		return $entry;
 	}
 	
-	private function shortlog_commit_refs($hash) {
-		if(!is_array($this->project['refs']))
+	public function shortlog_commit_refs($project, $hash) {
+		if(!is_array($project['refs']))
 			return "";
 		$refs = new ContentProvider('shortlog', 'shortlog_refs');
 		$found = false;
-		foreach($this->project['refs'] as $ref => $rhash) {
+		foreach($project['refs'] as $ref => $rhash) {
 			if(strtolower($rhash) == strtolower($hash)) {
 				$refexp = explode('/', $ref, 3);
 				$reftype = $refexp[1];
@@ -138,24 +144,45 @@ class page_shortlog {
 		$this->phpgitweb = $phpgitweb;
 		$this->project = $project;
 		if(!$this->project)
-			return;
+			return new ContentProvider('main', 'err400');
 		$project['refs'] = $phpgitweb->get_project_loader()->getProjectRefs($project);
 		$phpgitweb->append_header_nav("shortlog", null, true);
+		$phpgitweb->append_title("shortlog");
 		
 		$this->page = new ContentProvider('shortlog', 'main');
 		
 		//pages
 		if(array_key_exists('pg', $_GET)) {
+			$pg = $_GET['pg'];
+			if($pg < 0)
+				$pg = 0;
 			$skip = $_GET['pg'] * 100;
 			$next_page = $_GET['pg'] + 1;
 		} else {
+			$pg = 0;
 			$skip = 0;
 			$next_page = 1;
 		}
 		
+		$subnav = new ContentProvider('shortlog', 'shortlog_subnav');
+		$phpgitweb->append_sub_nav($subnav);
+		
+		if($pg) {
+			$subnav->set('first', new ContentProvider('shortlog', 'shortlog_subnav_first_link'));
+			$subnav->set('prev', new ContentProvider('shortlog', 'shortlog_subnav_prev_link', array('page' => ($pg - 1))));
+		} else {
+			$subnav->set('first', new ContentProvider('shortlog', 'shortlog_subnav_first'));
+			$subnav->set('prev', new ContentProvider('shortlog', 'shortlog_subnav_prev'));
+		}
+		
 		$shortlog = new shortlog();
 		$this->page->set('shortlog', $shortlog->generate_shortlog($project, null, 100, $skip, null, true, $next_page));
 		
+		if($shortlog->get_have_more())
+			$subnav->set('next', new ContentProvider('shortlog', 'shortlog_subnav_next_link', array('page' => ($pg + 1))));
+		else
+			$subnav->set('next', new ContentProvider('shortlog', 'shortlog_subnav_next'));
+		
 		return $this->page;
 	}