Revert "Didn't mean to include this"
Revert "Didn't mean to include this"

This reverts commit 3ba0ae41b8177e6a03049d6868c0dabc1bb2c5fe.

--- a/config/gitphp.conf.php.example
+++ b/config/gitphp.conf.php.example
@@ -169,6 +169,20 @@
 $gitphp_conf['filesearch'] = TRUE;
 
 /*
+ * debug
+ * Turns on extra warning messages and benchmarking.
+ * Not recommended for production systems
+ */
+$gitphp_conf['debug'] = FALSE;
+
+/*
+ * lang
+ * Sets the language of the interface
+ * Must be a valid translation in include/locale/
+ */
+$gitphp_conf['lang'] = "en_US";
+
+/*
  * git_projects
  * Two-dimensional array list of projects
  * First array index is the name of the category the projects

file:a/gitphp.css -> file:b/gitphp.css
--- a/gitphp.css
+++ b/gitphp.css
@@ -105,4 +105,17 @@
 div.error {
 	color: #ff0000;
 }
+.indent {
+	margin-left: 8px;
+}
+table.code td {
+	padding: 0px 0px;
+	font-family:monospace; font-size:12px; white-space:pre;
+}
+table.code td.num {
+	text-align: right;
+}
+table.code td.codeline {
+	padding-left: 5px;
+}
 

--- a/include/defs.constants.php
+++ b/include/defs.constants.php
@@ -15,5 +15,7 @@
 define("GITPHP_COMPRESS_GZ", 2);
 define("GITPHP_COMPRESS_ZIP", 3);
 
+define("GITPHP_LOCALE_DIR", "include/locale/");
+
 ?>
 

--- a/include/display.git_blob.php
+++ b/include/display.git_blob.php
@@ -18,15 +18,15 @@
 function git_blob($projectroot, $project, $hash, $file, $hashbase)
 {
 	global $gitphp_conf,$tpl;
+	$head = git_read_head($projectroot . $project);
 	if (!isset($hashbase))
-		$hashbase = git_read_head($projectroot . $project);
+		$hashbase = $head;
 	if (!isset($hash) && isset($file))
 		$hash = git_get_hash_by_path($projectroot . $project, $hashbase,$file,"blob");
 	$catout = git_cat_file($projectroot . $project, $hash);
-	$tpl->clear_all_assign();
 	$tpl->assign("hash",$hash);
-	$tpl->assign("project",$project);
 	$tpl->assign("hashbase",$hashbase);
+	$tpl->assign("head", $head);
 	if ($co = git_read_commit($projectroot . $project, $hashbase)) {
 		$tpl->assign("fullnav",TRUE);
 		$refs = read_info_ref($projectroot . $project);
@@ -34,8 +34,13 @@
 		$tpl->assign("title",$co['title']);
 		if (isset($file))
 			$tpl->assign("file",$file);
-		if (isset($refs[$hashbase]))
-			$tpl->assign("hashbaseref",$refs[$hashbase]);
+		if ($hashbase == "HEAD") {
+			if (isset($refs[$head]))
+				$tpl->assign("hashbaseref",$refs[$head]);
+		} else {
+			if (isset($refs[$hashbase]))
+				$tpl->assign("hashbaseref", $refs[$hashbase]);
+		}
 	}
 	$paths = git_path_trees($projectroot . $project, $hashbase, $file);
 	$tpl->assign("paths",$paths);
@@ -63,6 +68,7 @@
 					if (isset($lang) && (strlen($lang) > 0)) {
 						$geshi->set_source($catout);
 						$geshi->set_language($lang);
+						$geshi->set_header_type(GESHI_HEADER_DIV);
 						$geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS);
 						$tpl->assign("geshiout",$geshi->parse_code());
 						$usedgeshi = TRUE;

--- a/include/display.git_blobdiff.php
+++ b/include/display.git_blobdiff.php
@@ -21,11 +21,9 @@
 		echo $ret;
 		return;
 	}
-	$tpl->clear_all_assign();
 	$tpl->assign("hash",$hash);
 	$tpl->assign("hashparent",$hashparent);
 	$tpl->assign("hashbase",$hashbase);
-	$tpl->assign("project",$project);
 	if (isset($file))
 		$tpl->assign("file",$file);
 	if ($co = git_read_commit($projectroot . $project, $hashbase)) {

--- a/include/display.git_commit.php
+++ b/include/display.git_commit.php
@@ -28,13 +28,10 @@
 	}
 	$diffout = git_diff_tree($projectroot . $project, $root . " " . $parent . " " . $hash, TRUE);
 	$difftree = explode("\n",$diffout);
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("hash",$hash);
 	$tpl->assign("tree",$co['tree']);
 	if (isset($co['parent']))
 		$tpl->assign("parent",$co['parent']);
-	$tpl->display("commit_nav.tpl");
 	$tpl->assign("title",$co['title']);
 	$refs = read_info_ref($projectroot . $project);
 	if (isset($refs[$co['id']]))
@@ -53,52 +50,43 @@
 	$tpl->assign("parents",$co['parents']);
 	$tpl->assign("comment",$co['comment']);
 	$tpl->assign("difftreesize",count($difftree)+1);
-	$tpl->display("commit_data.tpl");
-	$alternate = FALSE;
+	$difftreelines = array();
 	foreach ($difftree as $i => $line) {
-		$tpl->clear_all_assign();
 		if (ereg("^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$",$line,$regs)) {
-			if ($alternate)
-				$tpl->assign("class","dark");
-			else
-				$tpl->assign("class","light");
-			$alternate = !$alternate;
-			$tpl->assign("project",$project);
-			$tpl->assign("hash",$hash);
-			$tpl->assign("from_mode",$regs[1]);
-			$tpl->assign("to_mode",$regs[2]);
-			$tpl->assign("from_mode_cut",substr($regs[1],-4));
-			$tpl->assign("to_mode_cut",substr($regs[2],-4));
-			$tpl->assign("from_id",$regs[3]);
-			$tpl->assign("to_id",$regs[4]);
-			$tpl->assign("status",$regs[5]);
-			$tpl->assign("similarity",$regs[6]);
-			$tpl->assign("file",$regs[7]);
-			$tpl->assign("from_file",strtok($regs[7],"\t"));
-			$tpl->assign("to_file",strtok("\t"));
-			$tpl->assign("to_filetype",file_type($regs[2]));
+			$difftreeline = array();
+			$difftreeline["from_mode"] = $regs[1];
+			$difftreeline["to_mode"] = $regs[2];
+			$difftreeline["from_mode_cut"] = substr($regs[1],-4);
+			$difftreeline["to_mode_cut"] = substr($regs[2],-4);
+			$difftreeline["from_id"] = $regs[3];
+			$difftreeline["to_id"] = $regs[4];
+			$difftreeline["status"] = $regs[5];
+			$difftreeline["similarity"] = ltrim($regs[6],"0");
+			$difftreeline["file"] = $regs[7];
+			$difftreeline["from_file"] = strtok($regs[7],"\t");
+			$difftreeline["from_filetype"] = file_type($regs[1]);
+			$difftreeline["from_filetype_localized"] = lookupstring($difftreeline["from_filetype"]);
+			$difftreeline["to_file"] = strtok("\t");
+			$difftreeline["to_filetype"] = file_type($regs[2]);
+			$difftreeline["to_filetype_localized"] = lookupstring($difftreeline["to_filetype"]);
 			if ((octdec($regs[2]) & 0x8000) == 0x8000)
-				$tpl->assign("isreg",TRUE);
+				$difftreeline["isreg"] = TRUE;
 			$modestr = "";
 			if ((octdec($regs[1]) & 0x17000) != (octdec($regs[2]) & 0x17000))
-				$modestr .= " from " . file_type($regs[1]) . " to " . file_type($regs[2]);
+				$difftreeline["typechange"] = TRUE;
 			if ((octdec($regs[1]) & 0777) != (octdec($regs[2]) & 0777)) {
 				if ((octdec($regs[1]) & 0x8000) && (octdec($regs[2]) & 0x8000))
-					$modestr .= " mode: " . (octdec($regs[1]) & 0777) . "->" . (octdec($regs[2]) & 0777);
+					$difftreeline["modechange"] = (octdec($regs[1]) & 0777) . "->" . (octdec($regs[2]) & 0777);
 				else if (octdec($regs[2]) & 0x8000)
-					$modestr .= " mode: " . (octdec($regs[2]) & 0777);
+					$difftreeline["modechange"] = (octdec($regs[2]) & 0777);
 			}
-			$tpl->assign("modechange",$modestr);
-			$simmodechg = "";
 			if ($regs[1] != $regs[2])
-				$simmodechg .= ", mode: " . (octdec($regs[2]) & 0777);
-			$tpl->assign("simmodechg",$simmodechg);
-
-			$tpl->display("commit_item.tpl");
+				$difftreeline["simmodechg"] = (octdec($regs[2]) & 0777);
+			$difftreelines[] = $difftreeline;
 		}
 	}
-	$tpl->clear_all_assign();
-	$tpl->display("commit_footer.tpl");
+	$tpl->assign("difftreelines",$difftreelines);
+	$tpl->display("commit.tpl");
 }
 
 ?>

--- a/include/display.git_commitdiff.php
+++ b/include/display.git_commitdiff.php
@@ -12,7 +12,8 @@
  require_once('gitutil.git_read_commit.php');
  require_once('gitutil.git_diff_tree.php');
  require_once('gitutil.read_info_ref.php');
- require_once('display.git_diff_print.php');
+ require_once('gitutil.git_diff.php');
+ require_once('i18n.lookupstring.php');
 
 function git_commitdiff($projectroot,$project,$hash,$hash_parent)
 {
@@ -28,43 +29,38 @@
 	$diffout = git_diff_tree($projectroot . $project, $hash_parent . " " . $hash);
 	$difftree = explode("\n",$diffout);
 	$refs = read_info_ref($projectroot . $project);
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("hash",$hash);
 	$tpl->assign("tree",$co['tree']);
 	$tpl->assign("hashparent",$hash_parent);
-	$tpl->display("commitdiff_nav.tpl");
 	$tpl->assign("title",$co['title']);
 	if (isset($refs[$co['id']]))
 		$tpl->assign("commitref",$refs[$co['id']]);
 	$tpl->assign("comment",$co['comment']);
-	$tpl->display("commitdiff_header.tpl");
-
+	$difftreelines = array();
 	foreach ($difftree as $i => $line) {
 		if (ereg("^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$",$line,$regs)) {
-			$tpl->clear_all_assign();
-			$tpl->assign("project",$project);
-			$tpl->assign("hash",$hash);
-			$tpl->assign("from_mode",$regs[1]);
-			$tpl->assign("to_mode",$regs[2]);
-			$tpl->assign("from_id",$regs[3]);
-			$tpl->assign("to_id",$regs[4]);
-			$tpl->assign("status",$regs[5]);
-			$tpl->assign("file",$regs[6]);
-			$tpl->assign("from_type",file_type($regs[1]));
-			$tpl->assign("to_type",file_type($regs[2]));
-			$tpl->display("commitdiff_item.tpl");
+			$difftreeline = array();
+			$difftreeline["from_mode"] = $regs[1];
+			$difftreeline["to_mode"] = $regs[2];
+			$difftreeline["from_id"] = $regs[3];
+			$difftreeline["to_id"] = $regs[4];
+			$difftreeline["status"] = $regs[5];
+			$difftreeline["file"] = $regs[6];
+			$difftreeline["from_type"] = file_type($regs[1]);
+			$difftreeline["to_type"] = file_type($regs[2]);
+			$difftreeline["from_type_localized"] = lookupstring($difftreeline["from_type"]);
+			$difftreeline["to_type_localized"] = lookupstring($difftreeline["to_type"]);
 			if ($regs[5] == "A")
-				git_diff_print($projectroot . $project, null,"/dev/null",$regs[4],"b/" . $regs[6]);
+				$difftreeline['diffout'] = explode("\n",git_diff($projectroot . $project, null,"/dev/null",$regs[4],"b/" . $regs[6]));
 			else if ($regs[5] == "D")
-				git_diff_print($projectroot . $project, $regs[3],"a/" . $regs[6],null,"/dev/null");
+				$difftreeline['diffout'] = explode("\n",git_diff($projectroot . $project, $regs[3],"a/" . $regs[6],null,"/dev/null"));
 			else if (($regs[5] == "M") && ($regs[3] != $regs[4]))
-				git_diff_print($projectroot . $project, $regs[3],"a/" . $regs[6],$regs[4],"b/" . $regs[6]);
+				$difftreeline['diffout'] = explode("\n",git_diff($projectroot . $project, $regs[3],"a/" . $regs[6],$regs[4],"b/" . $regs[6]));
+			$difftreelines[] = $difftreeline;
 		}
 	}
-
-	$tpl->clear_all_assign();
-	$tpl->display("commitdiff_footer.tpl");
+	$tpl->assign("difftreelines",$difftreelines);
+	$tpl->display("commitdiff.tpl");
 }
 
 ?>

--- a/include/display.git_commitdiff_plain.php
+++ b/include/display.git_commitdiff_plain.php
@@ -14,7 +14,7 @@
  require_once('gitutil.git_diff_tree.php');
  require_once('gitutil.git_rev_list.php');
  require_once('gitutil.read_info_ref.php');
- require_once('display.git_diff_print.php');
+ require_once('gitutil.git_diff.php');
 
 function git_commitdiff_plain($projectroot,$project,$hash,$hash_parent)
 {
@@ -42,7 +42,6 @@
 	header("Content-type: text/plain; charset=UTF-8");
 	header("Content-disposition: inline; filename=\"git-" . $hash . ".patch\"");
 	$ad = date_str($co['author_epoch'],$co['author_tz']);
-	$tpl->clear_all_assign();
 	$tpl->assign("from",$co['author']);
 	$tpl->assign("date",$ad['rfc2822']);
 	$tpl->assign("subject",$co['title']);
@@ -50,18 +49,19 @@
 		$tpl->assign("tagname",$tagname);
 	$tpl->assign("url",script_url() . "?p=" . $project . "&a=commitdiff&h=" . $hash);
 	$tpl->assign("comment",$co['comment']);
-	$tpl->display("diff_plaintext.tpl");
-	echo "\n\n";
+	$diffs = array();
 	foreach ($difftree as $i => $line) {
 		if (ereg("^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$",$line,$regs)) {
 			if ($regs[5] == "A")
-				git_diff_print($projectroot . $project, null, "/dev/null", $regs[4], "b/" . $regs[6], "plain");
+				$diffs[] = git_diff($projectroot . $project, null, "/dev/null", $regs[4], "b/" . $regs[6]);
 			else if ($regs[5] == "D")
-				git_diff_print($projectroot . $project, $regs[3], "a/" . $regs[6], null, "/dev/null", "plain");
+				$diffs[] = git_diff($projectroot . $project, $regs[3], "a/" . $regs[6], null, "/dev/null");
 			else if ($regs[5] == "M")
-				git_diff_print($projectroot . $project, $regs[3], "a/" . $regs[6], $regs[4], "b/" . $regs[6], "plain");
+				$diffs[] = git_diff($projectroot . $project, $regs[3], "a/" . $regs[6], $regs[4], "b/" . $regs[6]);
 		}
 	}
+	$tpl->assign("diffs",$diffs);
+	$tpl->display("diff_plaintext.tpl");
 }
 
 ?>

--- a/include/display.git_diff_print.php
+++ /dev/null
@@ -1,52 +1,1 @@
-<?php
-/*
- *  display.git_diff_print.php
- *  gitphp: A PHP git repository browser
- *  Component: Display - print a diff
- *
- *  Copyright (C) 2008 Christopher Han <xiphux@gmail.com>
- */
 
- require_once('gitutil.git_diff.php');
-
-function git_diff_print($proj,$from,$from_name,$to,$to_name,$format = "html")
-{
-	global $tpl;
-	$diffout = git_diff($proj, $from, $from_name, $to, $to_name);
-	if ($format == "plain")
-		echo $diffout;
-	else {
-		$line = strtok($diffout,"\n");
-		while ($line !== false) {
-			$start = substr($line,0,1);
-			unset($class);
-			if ($start == "+")
-				$class = "diffplus";
-			else if ($start == "-")
-				$class = "diffminus";
-			else if ($start == "@")
-				$class = "diffat";
-			if ($start != "\\") {
-			/*
-				while (($pos = strpos($line,"\t")) !== false) {
-					if ($c = (8 - (($pos - 1) % 8))) {
-						$spaces = "";
-						for ($i = 0; $i < $c; $i++)
-							$spaces .= " ";
-						preg_replace('/\t/',$spaces,$line,1);
-					}
-				}
-			 */
-				$tpl->clear_all_assign();
-				$tpl->assign("line",htmlentities($line));
-				if (isset($class))
-					$tpl->assign("class",$class);
-				$tpl->display("diff_line.tpl");
-			}
-			$line = strtok("\n");
-		}
-	}
-}
-
-?>
-

--- a/include/display.git_heads.php
+++ b/include/display.git_heads.php
@@ -14,29 +14,10 @@
 {
 	global $tpl;
 	$head = git_read_head($projectroot . $project);
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("head",$head);
-	$tpl->display("heads_nav.tpl");
-	$tpl->display("heads_header.tpl");
-	$taglist = git_read_refs($projectroot, $project, "refs/heads");
-	if (isset($taglist) && (count($taglist) > 0)) {
-		$alternate = FALSE;
-		foreach ($taglist as $i => $entry) {
-			$tpl->clear_all_assign();
-			if ($alternate)
-				$tpl->assign("class","dark");
-			else
-				$tpl->assign("class","light");
-			$alternate = !$alternate;
-			$tpl->assign("project",$project);
-			$tpl->assign("age",$entry['age']);
-			$tpl->assign("name",$entry['name']);
-			$tpl->display("heads_item.tpl");
-		}
-	}
-	$tpl->clear_all_assign();
-	$tpl->display("heads_footer.tpl");
+	$headlist = git_read_refs($projectroot, $project, "refs/heads");
+	$tpl->assign("headlist",$headlist);
+	$tpl->display("heads.tpl");
 }
 
 ?>

--- a/include/display.git_history.php
+++ b/include/display.git_history.php
@@ -21,53 +21,42 @@
 		$hash = git_read_head($projectroot . $project);
 	$co = git_read_commit($projectroot . $project, $hash);
 	$refs = read_info_ref($projectroot . $project);
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("hash",$hash);
 	if (isset($refs[$hash]))
 		$tpl->assign("hashbaseref",$refs[$hash]);
 	$tpl->assign("tree",$co['tree']);
-	$tpl->display("history_nav.tpl");
 	$tpl->assign("title",$co['title']);
 	$paths = git_path_trees($projectroot . $project, $hash, $file);
 	$tpl->assign("paths",$paths);
-	$tpl->display("history_header.tpl");
 	$cmdout = git_history_list($projectroot . $project, $hash, $file);
-	$alternate = FALSE;
 	$lines = explode("\n", $cmdout);
+	$historylines = array();
 	foreach ($lines as $i => $line) {
 		if (ereg("^([0-9a-fA-F]{40})",$line,$regs))
 			$commit = $regs[1];
 		else if (ereg(":([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$",$line,$regs) && isset($commit)) {
+				$historyline = array();
 				$co = git_read_commit($projectroot . $project, $commit);
-				$tpl->clear_all_assign();
-				if ($alternate)
-					$tpl->assign("class","dark");
-				else
-					$tpl->assign("class","light");
-				$alternate = !$alternate;
-				$tpl->assign("project",$project);
-				$tpl->assign("agestringage",$co['age_string_age']);
-				$tpl->assign("agestringdate",$co['age_string_date']);
-				$tpl->assign("authorname",$co['author_name']);
-				$tpl->assign("commit",$commit);
-				$tpl->assign("file",$file);
-				$tpl->assign("title",$co['title_short']);
+				$historyline["agestringage"] = $co['age_string_age'];
+				$historyline["agestringdate"] = $co['age_string_date'];
+				$historyline["authorname"] = $co['author_name'];
+				$historyline["commit"] = $commit;
+				$historyline["file"] = $file;
+				$historyline["title"] = $co['title_short'];
 				if (isset($refs[$commit]))
-					$tpl->assign("commitref",$refs[$commit]);
+					$historyline["commitref"] = $refs[$commit];
 				$blob = git_get_hash_by_path($projectroot . $project, $hash,$file);
 				$blob_parent = git_get_hash_by_path($projectroot . $project, $commit,$file);
 				if ($blob && $blob_parent && ($blob != $blob_parent)) {
-					$tpl->assign("blob",$blob);
-					$tpl->assign("blobparent",$blob_parent);
-					$tpl->assign("difftocurrent",TRUE);
+					$historyline["blob"] = $blob;
+					$historyline["blobparent"] = $blob_parent;
 				}
-				$tpl->display("history_item.tpl");
+				$historylines[] = $historyline;
 				unset($commit);
 		}
 	}
-	$tpl->clear_all_assign();
-	$tpl->display("history_footer.tpl");
+	$tpl->assign("historylines",$historylines);
+	$tpl->display("history.tpl");
 }
 
 ?>

--- a/include/display.git_log.php
+++ b/include/display.git_log.php
@@ -22,53 +22,45 @@
 	if (!isset($page))
 		$page = 0;
 	$refs = read_info_ref($projectroot . $project);
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("hash",$hash);
-	$tpl->display("log_nav.tpl");
+	$tpl->assign("head",$head);
+
+	if ($page)
+		$tpl->assign("page",$page);
 
 	$revlist = git_read_revlist($projectroot . $project, $hash, 101, ($page * 100));
 
-	if (($hash != $head) || $page)
-		$tpl->assign("headlink",TRUE);
-	if ($page > 0) {
-		$tpl->assign("prevlink",TRUE);
-		$tpl->assign("prevpage",$page-1);
-	}
-	if (count($revlist) > 100) {
-		$tpl->assign("nextlink",TRUE);
-		$tpl->assign("nextpage",$page+1);
-	}
-	$tpl->display("log_pagenav.tpl");
+	$revlistcount = count($revlist);
+	$tpl->assign("revlistcount",$revlistcount);
 
 	if (!$revlist) {
-		$tpl->clear_all_assign();
-		$tpl->assign("project",$project);
+		$tpl->assign("norevlist",TRUE);
 		$co = git_read_commit($hash);
-		$tpl->assign("age_string",$co['age_string']);
-		$tpl->display("log_info.tpl");
+		$tpl->assign("lastchange",$co['age_string']);
 	}
-	$commitcount = min(100,count($revlist));
+
+	$commitlines = array();
+	$commitcount = min(100,$revlistcount);
 	for ($i = 0; $i < $commitcount; $i++) {
 		$commit = $revlist[$i];
 		if (isset($commit) && strlen($commit) > 1) {
-			$tpl->clear_all_assign();
+			$commitline = array();
 			$co = git_read_commit($projectroot . $project, $commit);
 			$ad = date_str($co['author_epoch']);
-			$tpl->assign("project",$project);
-			$tpl->assign("commit",$commit);
+			$commitline["project"] = $project;
+			$commitline["commit"] = $commit;
 			if (isset($refs[$commit]))
-				$tpl->assign("commitref",$refs[$commit]);
-			$tpl->assign("agestring",$co['age_string']);
-			$tpl->assign("title",$co['title']);
-			$tpl->assign("authorname",$co['author_name']);
-			$tpl->assign("rfc2822",$ad['rfc2822']);
-			$tpl->assign("comment",$co['comment']);
-			if (count($co['comment']) > 0)
-				$tpl->assign("notempty",TRUE);
-			$tpl->display("log_item.tpl");
+				$commitline["commitref"] = $refs[$commit];
+			$commitline["agestring"] = $co['age_string'];
+			$commitline["title"] = $co['title'];
+			$commitline["authorname"] = $co['author_name'];
+			$commitline["rfc2822"] = $ad['rfc2822'];
+			$commitline["comment"] = $co['comment'];
+			$commitlines[] = $commitline;
 		}
 	}
+	$tpl->assign("commitlines",$commitlines);
+	$tpl->display("log.tpl");
 }
 
 ?>

--- /dev/null
+++ b/include/display.git_message.php
@@ -1,1 +1,22 @@
+<?php
+/*
+ *  display.git_message.php
+ *  gitphp: A PHP git repository browser
+ *  Component: Display - message
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ */
 
+function git_message($message, $error = FALSE, $standalone = TRUE)
+{
+	global $tpl;
+	$tpl->assign("message",$message);
+	if ($error)
+		$tpl->assign("error", TRUE);
+	if ($standalone)
+		$tpl->assign("standalone", TRUE);
+	$tpl->display("message.tpl");
+}
+
+?>
+

--- a/include/display.git_opml.php
+++ b/include/display.git_opml.php
@@ -9,42 +9,26 @@
 
  require_once('util.script_url.php');
  require_once('gitutil.git_read_projects.php');
- require_once('gitutil.git_read_head.php');
- require_once('gitutil.git_read_commit.php');
 
 function git_opml($projectroot,$projectlist)
 {
 	global $tpl,$gitphp_conf;
 	$projlist = git_read_projects($projectroot,$projectlist);
 	header("Content-type: text/xml; charset=UTF-8");
-	$tpl->clear_all_assign();
 	$tpl->assign("title",$gitphp_conf['title']);
-	$tpl->display("opml_header.tpl");
-	echo "\n";
+	$tpl->assign("self",script_url());
+	$opmllist = array();
 	foreach ($projlist as $cat => $plist) {
 		if (is_array($plist)) {
 			foreach ($plist as $i => $proj) {
-				$head = git_read_head($projectroot . $proj);
-				$co = git_read_commit($projectroot . $proj, $head);
-				$tpl->clear_all_assign();
-				$tpl->assign("proj",$proj);
-				$tpl->assign("self",script_url());
-				$tpl->display("opml_item.tpl");
-				echo "\n";
+				$opmllist[] = $proj;
 			}
 		} else {
-			$head = git_read_head($projectroot . $plist);
-			$co = git_read_commit($projectroot . $plist, $head);
-			$tpl->clear_all_assign();
-			$tpl->assign("proj",$plist);
-			$tpl->assign("self",script_url());
-			$tpl->display("opml_item.tpl");
-			echo "\n";
+			$opmllist[] = $plist;
 		}
 	}
-
-	$tpl->clear_all_assign();
-	$tpl->display("opml_footer.tpl");
+	$tpl->assign("opmllist",$opmllist);
+	$tpl->display("opml.tpl");
 }
 
 ?>

--- a/include/display.git_project_list.php
+++ b/include/display.git_project_list.php
@@ -11,19 +11,17 @@
  require_once('util.descrcmp.php');
  require_once('util.ownercmp.php');
  require_once('util.agecmp.php');
- require_once('display.git_project_listentry.php');
+ require_once('i18n.lookupstring.php');
  require_once('gitutil.git_read_projects.php');
 
 function git_project_list($projectroot,$projectlist,$order = "project")
 {
 	global $tpl,$git_projects;
-	$projects = git_read_projects($projectroot,$projectlist);
+	$projects = git_read_projects($projectroot,$projectlist, TRUE);
 	if (is_array($projects)) {
 		if (count($projects) > 0) {
-			$tpl->clear_all_assign();
 			if ($order)
 				$tpl->assign("order",$order);
-			$tpl->display("projlist_header.tpl");
 			if (!isset($git_projects)) {
 				switch ($order) {
 					case "project":
@@ -39,46 +37,35 @@
 						usort($projects,"agecmp");
 						break;
 				}
+				$tpl->assign("projects",$projects);
+			} else {
+				foreach ($projects as $cat => $plist) {
+					switch ($order) {
+						case "project":
+							usort($projects[$cat],"projectcmp");
+							break;
+						case "descr":
+							usort($projects[$cat],"descrcmp");
+							break;
+						case "owner":
+							usort($projects[$cat],"ownercmp");
+							break;
+						case "age":
+							usort($projects[$cat],"agecmp");
+							break;
+					}
+				}
+				$tpl->assign("categorizedprojects",$projects);
 			}
-			$alternate = false;
-			foreach ($projects as $cat => $plist) {
-				if (is_array($plist)) {
-					if ($cat != "none") {
-						$tpl->clear_all_assign();
-						$tpl->assign("category",$cat);
-						$tpl->display("projlist_category.tpl");
-					}
-					if (isset($git_projects)) {
-						switch ($order) {
-							case "project":
-								usort($plist,"projectcmp");
-								break;
-							case "descr":
-								usort($plist,"descrcmp");
-								break;
-							case "owner":
-								usort($plist,"ownercmp");
-								break;
-							case "age":
-								usort($plist,"agecmp");
-								break;
-						}
-					}
-					foreach ($plist as $i => $proj) {
-						git_project_listentry($projectroot,$proj,($alternate?"dark":"light"),($cat=="none"?FALSE:TRUE));
-						$alternate = !$alternate;
-					}
-				} else {
-					git_project_listentry($projectroot,$plist,($alternate?"dark":"light"),FALSE);
-					$alternate = !$alternate;
-				}
-			}
-			$tpl->clear_all_assign();
-			$tpl->display("projlist_footer.tpl");
-		} else
-			echo "No projects found";
-	} else
-		echo $projects;
+		} else {
+			$tpl->assign("message",lookupstring("No projects found"));
+			$tpl->assign("error",TRUE);
+		}
+	} else {
+		$tpl->assign("message",$projects);
+		$tpl->assign("error",TRUE);
+	}
+	$tpl->display("projectlist.tpl");
 }
 
 ?>

--- a/include/display.git_project_listentry.php
+++ /dev/null
@@ -1,36 +1,1 @@
-<?php
-/*
- *  display.git_project_listentry.php
- *  gitphp: A PHP git repository browser
- *  Component: Display - single project list item
- *
- *  Copyright (C) 2008 Christopher Han <xiphux@gmail.com>
- */
 
- require_once('gitutil.git_project_descr.php');
- require_once('gitutil.git_project_owner.php');
- require_once('gitutil.git_read_head.php');
- require_once('gitutil.git_read_commit.php');
-
-function git_project_listentry($projectroot,$project,$class,$indent)
-{
-	global $tpl;
-	$tpl->clear_all_assign();
-	$tpl->assign("class",$class);
-	$tpl->assign("project",$project);
-	$tpl->assign("descr",git_project_descr($projectroot,$project,TRUE));
-	$tpl->assign("owner",git_project_owner($projectroot,$project));
-	if ($indent)
-		$tpl->assign("idt",TRUE);
-	$head = git_read_head($projectroot . $project);
-	$commit = git_read_commit($projectroot . $project,$head);
-	if ($commit['age'] < 60*60*24*2)
-		$tpl->assign("age_colored",TRUE);
-	if ($commit['age'] < 60*60*2)
-		$tpl->assign("age_bold",TRUE);
-	$tpl->assign("age_string",$commit['age_string']);
-	$tpl->display("projlist_item.tpl");
-}
-
-?>
-

--- a/include/display.git_rss.php
+++ b/include/display.git_rss.php
@@ -21,11 +21,9 @@
 	$head = git_read_head($projectroot . $project);
 	$revlist = git_read_revlist($projectroot . $project, $head, GITPHP_RSS_ITEMS);
 	header("Content-type: text/xml; charset=UTF-8");
-	$tpl->clear_all_assign();
 	$tpl->assign("self",script_url());
-	$tpl->assign("project",$project);
-	$tpl->display("rss_header.tpl");
 
+	$commitlines = array();
 	for ($i = 0; $i <= count($revlist); $i++) {
 		$commit = $revlist[$i];
 		$co = git_read_commit($projectroot . $project, $commit);
@@ -40,24 +38,21 @@
 				$difftree[] = $regs[7];
 			$tok = strtok("\n");
 		}
-		$tpl->clear_all_assign();
-		$tpl->assign("cdmday",$cd['mday']);
-		$tpl->assign("cdmonth",$cd['month']);
-		$tpl->assign("cdhour",$cd['hour']);
-		$tpl->assign("cdminute",$cd['minute']);
-		$tpl->assign("title",htmlentities($co['title']));
-		$tpl->assign("author",htmlentities($co['author']));
-		$tpl->assign("cdrfc2822",$cd['rfc2822']);
-		$tpl->assign("self",script_url());
-		$tpl->assign("project",$project);
-		$tpl->assign("commit",$commit);
-		$tpl->assign("comment",$co['comment']);
-		$tpl->assign("difftree",$difftree);
-		$tpl->display("rss_item.tpl");
+		$commitline = array();
+		$commitline["cdmday"] = $cd['mday'];
+		$commitline["cdmonth"] = $cd['month'];
+		$commitline["cdhour"] = $cd['hour'];
+		$commitline["cdminute"] = $cd['minute'];
+		$commitline["title"] = $co['title'];
+		$commitline["author"] = $co['author'];
+		$commitline["cdrfc2822"] = $cd['rfc2822'];
+		$commitline["commit"] = $commit;
+		$commitline["comment"] = $co['comment'];
+		$commitline["difftree"] = $difftree;
+		$commitlines[] = $commitline;
 	}
-
-	$tpl->clear_all_assign();
-	$tpl->display("rss_footer.tpl");
+	$tpl->assign("commitlines",$commitlines);
+	$tpl->display("rss.tpl");
 }
 
 ?>

--- a/include/display.git_search.php
+++ b/include/display.git_search.php
@@ -9,25 +9,22 @@
 
 require_once('defs.constants.php');
 require_once('util.highlight.php');
+require_once('i18n.lookupstring.php');
 require_once('gitutil.git_read_commit.php');
 require_once('gitutil.git_rev_list.php');
+require_once('display.git_message.php');
 
 function git_search($projectroot, $project, $hash, $search, $searchtype, $page = 0)
 {
 	global $tpl,$gitphp_conf;
 
 	if (!$gitphp_conf['search']) {
-		$tpl->clear_all_assign();
-		$tpl->assign("message","Search has been disabled");
-		$tpl->display("message.tpl");
+		git_message(lookupstring('Search has been disabled'), TRUE, TRUE);
 		return;
 	}
 
 	if (!isset($search) || (strlen($search) < 2)) {
-		$tpl->clear_all_assign();
-		$tpl->assign("error",TRUE);
-		$tpl->assign("message","You must enter search text of at least 2 characters");
-		$tpl->display("message.tpl");
+		git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
 		return;
 	}
 	if (!isset($hash)) {
@@ -39,77 +36,49 @@
 
 	$revlist = explode("\n",trim(git_rev_list($projectroot . $project, $hash, 101, ($page * 100), FALSE, FALSE, $searchtype, $search)));
 	if (count($revlist) < 1 || (strlen($revlist[0]) < 1)) {
-		$tpl->clear_all_assign();
-		$tpl->assign("message","No matches for '" . $search . "'.");
-		$tpl->display("message.tpl");
+		git_message(sprintf(lookupstring('No matches for \'%1$s\'.'), $search), FALSE, TRUE);
 		return;
 	}
 
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("hash",$hash);
 	$tpl->assign("treehash",$co['tree']);
-	$tpl->display("search_nav.tpl");
 
 	$tpl->assign("search",$search);
 	$tpl->assign("searchtype",$searchtype);
-	if ($page > 0) {
-		$tpl->assign("firstlink",TRUE);
-		$tpl->assign("prevlink",TRUE);
-		if ($page > 1)
-			$tpl->assign("prevpage",$page-1);
-	}
-	if (count($revlist) > 100) {
-		$tpl->assign("nextlink",TRUE);
-		$tpl->assign("nextpage",$page+1);
-	}
-	$tpl->display("search_pagenav.tpl");
+	$tpl->assign("page",$page);
+	$revlistcount = count($revlist);
+	$tpl->assign("revlistcount",$revlistcount);
 
 	$tpl->assign("title",$co['title']);
-	$tpl->display("search_header.tpl");
 
-	$alternate = FALSE;
-	$commitcount = min(100,count($revlist));
+	$commitlines = array();
+	$commitcount = min(100,$revlistcount);
 	for ($i = 0; $i < $commitcount; $i++) {
-		$tpl->clear_all_assign();
 		$commit = $revlist[$i];
 		if (strlen(trim($commit)) > 0) {
+			$commitline = array();
 			$co2 = git_read_commit($projectroot . $project, $commit);
-			if ($alternate)
-				$tpl->assign("class","dark");
-			else
-				$tpl->assign("class","light");
-			$alternate = !$alternate;
-			$tpl->assign("project",$project);
-			$tpl->assign("commit",$commit);
-			$tpl->assign("agestringage",$co2['age_string_age']);
-			$tpl->assign("agestringdate",$co2['age_string_date']);
-			$tpl->assign("authorname",$co2['author_name']);
-			$tpl->assign("title_short",$co2['title_short']);
+			$commitline["commit"] = $commit;
+			$commitline["agestringage"] = $co2['age_string_age'];
+			$commitline["agestringdate"] = $co2['age_string_date'];
+			$commitline["authorname"] = $co2['author_name'];
+			$commitline["title_short"] = $co2['title_short'];
 			if (strlen($co2['title_short']) < strlen($co2['title']))
-				$tpl->assign("title",$co2['title']);
-			$tpl->assign("committree",$co2['tree']);
+				$commitline["title"] = $co2['title'];
+			$commitline["committree"] = $co2['tree'];
 			$matches = array();
 			foreach ($co2['comment'] as $comline) {
 				$hl = highlight($comline, $search, "searchmatch", GITPHP_TRIM_LENGTH);
 				if ($hl && (strlen($hl) > 0))
 					$matches[] = $hl;
 			}
-			$tpl->assign("matches",$matches);
-			$tpl->display("search_item.tpl");
+			$commitline["matches"] = $matches;
+			$commitlines[] = $commitline;
 		}
 	}
-
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
-	$tpl->assign("hash",$hash);
-	$tpl->assign("search",$search);
-	$tpl->assign("searchtype",$searchtype);
-	if (count($revlist) > 100) {
-		$tpl->assign("nextlink",TRUE);
-		$tpl->assign("nextpage",$page+1);
-	}
-	$tpl->display("search_footer.tpl");
+	
+	$tpl->assign("commitlines",$commitlines);
+	$tpl->display("search.tpl");
 }
 
 ?>

--- a/include/display.git_search_files.php
+++ b/include/display.git_search_files.php
@@ -9,25 +9,22 @@
 
 require_once('defs.constants.php');
 require_once('util.highlight.php');
+require_once('i18n.lookupstring.php');
 require_once('gitutil.git_filesearch.php');
 require_once('gitutil.git_read_commit.php');
+require_once('display.git_message.php');
 
 function git_search_files($projectroot, $project, $hash, $search, $page = 0)
 {
 	global $tpl,$gitphp_conf;
 
 	if (!($gitphp_conf['search'] && $gitphp_conf['filesearch'])) {
-		$tpl->clear_all_assign();
-		$tpl->assign("message","File search has been disabled");
-		$tpl->display("message.tpl");
+		git_message(lookupstring('File search has been disabled'), TRUE, TRUE);
 		return;
 	}
 
 	if (!isset($search) || (strlen($search) < 2)) {
-		$tpl->clear_all_assign();
-		$tpl->assign("error",TRUE);
-		$tpl->assign("message","You must enter search text of at least 2 characters");
-		$tpl->display("message.tpl");
+		git_message(lookupstring('You must enter search text of at least 2 characters'), TRUE, TRUE);
 		return;
 	}
 	if (!isset($hash)) {
@@ -40,47 +37,26 @@
 	$filesearch = git_filesearch($projectroot . $project, $hash, $search, false, ($page * 100), 101);
 
 	if (count($filesearch) < 1) {
-		$tpl->clear_all_assign();
-		$tpl->assign("message","No matches for '" . $search . "'.");
-		$tpl->display("message.tpl");
+		git_message(sprintf(lookupstring('No matches for \'%1$s\'.'), $search), FALSE, TRUE);
 		return;
 	}
 
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("hash",$hash);
 	$tpl->assign("treehash",$co['tree']);
-	$tpl->display("search_nav.tpl");
 
 	$tpl->assign("search",$search);
 	$tpl->assign("searchtype","file");
-	if ($page > 0) {
-		$tpl->assign("firstlink",TRUE);
-		$tpl->assign("prevlink",TRUE);
-		if ($page > 1)
-			$tpl->assign("prevpage",$page-1);
-	}
-	if (count($filesearch) > 100) {
-		$tpl->assign("nextlink",TRUE);
-		$tpl->assign("nextpage",$page+1);
-	}
-	$tpl->display("search_pagenav.tpl");
+	$tpl->assign("page",$page);
+	$filesearchcount = count($filesearch);
+	$tpl->assign("filesearchcount",$filesearchcount);
 
 	$tpl->assign("title",$co['title']);
-	$tpl->display("search_header.tpl");
 
-	$alternate = FALSE;
+	$filesearchlines = array();
 	$i = 0;
 	foreach ($filesearch as $file => $data) {
-		$tpl->clear_all_assign();
-		if ($alternate)
-			$tpl->assign("class","dark");
-		else
-			$tpl->assign("class","light");
-		$alternate = !$alternate;
-		$tpl->assign("project",$project);
-		$tpl->assign("hashbase",$hash);
-		$tpl->assign("file",$file);
+		$filesearchline = array();
+		$filesearchline["file"] = $file;
 		if (strpos($file,"/") !== false) {
 			$f = basename($file);
 			$d = dirname($file);
@@ -92,12 +68,12 @@
 		} else
 			$hlt = highlight($file, $search, "searchmatch");
 		if ($hlt)
-			$tpl->assign("filename",$hlt);
+			$filesearchline["filename"] = $hlt;
 		else
-			$tpl->assign("filename",$file);
-		$tpl->assign("hash",$data['hash']);
+			$filesearchline["filename"] = $file;
+		$filesearchline["hash"] = $data['hash'];
 		if ($data['type'] == "tree")
-			$tpl->assign("tree",TRUE);
+			$filesearchline["tree"] = TRUE;
 		if (isset($data['lines'])) {
 			$matches = array();
 			foreach ($data['lines'] as $line) {
@@ -106,24 +82,15 @@
 					$matches[] = $hlt;
 			}
 			if (count($matches) > 0)
-				$tpl->assign("matches",$matches);
+				$filesearchline["matches"] = $matches;
 		}
-		$tpl->display("search_fileitem.tpl");
+		$filesearchlines[] = $filesearchline;
 		$i++;
 		if ($i >= 100)
 			break;
 	}
-
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
-	$tpl->assign("hash",$hash);
-	$tpl->assign("search",$search);
-	$tpl->assign("searchtype","file");
-	if (count($filesearch) > 100) {
-		$tpl->assign("nextlink",TRUE);
-		$tpl->assign("nextpage",$page+1);
-	}
-	$tpl->display("search_footer.tpl");
+	$tpl->assign("filesearchlines",$filesearchlines);
+	$tpl->display("searchfiles.tpl");
 }
 
 ?>

--- a/include/display.git_shortlog.php
+++ b/include/display.git_shortlog.php
@@ -22,60 +22,39 @@
 	if (!isset($page))
 		$page = 0;
 	$refs = read_info_ref($projectroot . $project);
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("hash",$hash);
-	$tpl->display("shortlog_nav.tpl");
+	$tpl->assign("head",$head);
+
+	if ($page)
+		$tpl->assign("page",$page);
 
 	$revlist = git_read_revlist($projectroot . $project, $hash, 101, ($page * 100));
 
-	if (($hash != $head) || $page)
-		$tpl->assign("headlink",TRUE);
-	if ($page > 0) {
-		$tpl->assign("prevlink",TRUE);
-		$tpl->assign("prevpage",$page-1);
-	}
-	if (count($revlist) > 100) {
-		$tpl->assign("nextlink",TRUE);
-		$tpl->assign("nextpage",$page+1);
-	}
-	$tpl->display("shortlog_pagenav.tpl");
+	$revlistcount = count($revlist);
+	$tpl->assign("revlistcount",$revlistcount);
 
-	$alternate = FALSE;
+	$commitlines = array();
 	$commitcount = min(100,count($revlist));
 	for ($i = 0; $i < $commitcount; $i++) {
-		$tpl->clear_all_assign();
 		$commit = $revlist[$i];
 		if (strlen(trim($commit)) > 0) {
+			$commitline = array();
 			if (isset($refs[$commit]))
-				$tpl->assign("commitref",$refs[$commit]);
+				$commitline["commitref"] = $refs[$commit];
 			$co = git_read_commit($projectroot . $project, $commit);
 			$ad = date_str($co['author_epoch']);
-			if ($alternate)
-				$tpl->assign("class","dark");
-			else
-				$tpl->assign("class","light");
-			$alternate = !$alternate;
-			$tpl->assign("project",$project);
-			$tpl->assign("commit",$commit);
-			$tpl->assign("agestringage",$co['age_string_age']);
-			$tpl->assign("agestringdate",$co['age_string_date']);
-			$tpl->assign("authorname",$co['author_name']);
-			$tpl->assign("title_short",$co['title_short']);
+			$commitline["commit"] = $commit;
+			$commitline["agestringage"] = $co['age_string_age'];
+			$commitline["agestringdate"] = $co['age_string_date'];
+			$commitline["authorname"] = $co['author_name'];
+			$commitline["title_short"] = $co['title_short'];
 			if (strlen($co['title_short']) < strlen($co['title']))
-				$tpl->assign("title",$co['title']);
-			$tpl->display("shortlog_item.tpl");
+				$commitline["title"] = $co['title'];
+			$commitlines[] = $commitline;
 		}
 	}
-
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
-	$tpl->assign("hash",$hash);
-	if (count($revlist) > 100) {
-		$tpl->assign("nextlink",TRUE);
-		$tpl->assign("nextpage",$page+1);
-	}
-	$tpl->display("shortlog_footer.tpl");
+	$tpl->assign("commitlines",$commitlines);
+	$tpl->display("shortlog.tpl");
 }
 
 ?>

--- a/include/display.git_summary.php
+++ b/include/display.git_summary.php
@@ -25,109 +25,47 @@
 	$commitdate = date_str($commit['committer_epoch'],$commit['committer_tz']);
 	$owner = git_project_owner($projectroot,$project);
 	$refs = read_info_ref($projectroot . $project);
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("head",$head);
-	$tpl->display("project_nav.tpl");
-	$tpl->clear_all_assign();
 	$tpl->assign("description",$descr);
 	$tpl->assign("owner",$owner);
 	$tpl->assign("lastchange",$commitdate['rfc2822']);
-	$tpl->display("project_brief.tpl");
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
-	$tpl->display("project_revlist_header.tpl");
 	$revlist = git_read_revlist($projectroot . $project, $head, 17);
-	$alternate = FALSE;
 	foreach ($revlist as $i => $rev) {
-		$tpl->clear_all_assign();
+		$revdata = array();
 		$revco = git_read_commit($projectroot . $project, $rev);
 		$authordate = date_str($revco['author_epoch']);
-		if ($alternate)
-			$tpl->assign("class","dark");
-		else
-			$tpl->assign("class","light");
-		$alternate = !$alternate;
-		$tpl->assign("project",$project);
-		if ($i <= 16) {
-			$tpl->assign("commit",$rev);
-			if (isset($refs[$rev]))
-				$tpl->assign("commitref",$refs[$rev]);
-			$tpl->assign("commitage",$revco['age_string']);
-			$tpl->assign("commitauthor",$revco['author_name']);
-			if (strlen($revco['title_short']) < strlen($revco['title'])) {
-				$tpl->assign("title",$revco['title']);
-				$tpl->assign("title_short",$revco['title_short']);
-			} else
-				$tpl->assign("title_short",$revco['title']);
-		} else {
-			$tpl->assign("truncate",TRUE);
-		}
-		$tpl->display("project_revlist_item.tpl");
+		$revdata["commit"] = $rev;
+		if (isset($refs[$rev]))
+			$revdata["commitref"] = $refs[$rev];
+		$revdata["commitage"] = $revco['age_string'];
+		$revdata["commitauthor"] = $revco['author_name'];
+		if (strlen($revco['title_short']) < strlen($revco['title'])) {
+			$revdata["title"] = $revco['title'];
+			$revdata["title_short"] = $revco['title_short'];
+		} else
+			$revdata["title_short"] = $revco['title'];
+		$revlist[$i] = $revdata;
 	}
-	$tpl->clear_all_assign();
-	$tpl->display("project_revlist_footer.tpl");
+	$tpl->assign("revlist",$revlist);
 
 	$taglist = git_read_refs($projectroot,$project,"refs/tags");
 	if (isset($taglist) && (count($taglist) > 0)) {
-		$tpl->clear_all_assign();
-		$tpl->assign("project",$project);
-		$tpl->display("project_taglist_header.tpl");
-		$alternate = FALSE;
 		foreach ($taglist as $i => $tag) {
-			$tpl->clear_all_assign();
-			$tpl->assign("project",$project);
-			if ($alternate)
-				$tpl->assign("class","dark");
-			else
-				$tpl->assign("class","light");
-			$alternate = !$alternate;
-			if ($i < 16) {
-				$tpl->assign("tagage",$tag['age']);
-				$tpl->assign("tagname",$tag['name']);
-				$tpl->assign("tagid",$tag['id']);
-				$tpl->assign("tagtype",$tag['type']);
-				$tpl->assign("refid",$tag['refid']);
-				$tpl->assign("reftype",$tag['reftype']);
-				if (isset($tag['comment'])) {
-					$com = trim($tag['comment'][0]);
-					if (strlen($com) > GITPHP_TRIM_LENGTH)
-						$com = substr($trimmed,0,GITPHP_TRIM_LENGTH) . "...";
-					$tpl->assign("comment",$com);
-				}
-			} else
-				$tpl->assign("truncate",TRUE);
-			$tpl->display("project_taglist_item.tpl");
+			if (isset($tag['comment'])) {
+				$com = trim($tag['comment'][0]);
+				if (strlen($com) > GITPHP_TRIM_LENGTH)
+					$com = substr($trimmed,0,GITPHP_TRIM_LENGTH) . "...";
+				$taglist[$i]['comment'] = $com;
+			}
 		}
-		$tpl->clear_all_assign();
-		$tpl->display("project_taglist_footer.tpl");
+		$tpl->assign("taglist",$taglist);
 	}
 
 	$headlist = git_read_refs($projectroot,$project,"refs/heads");
 	if (isset($headlist) && (count($headlist) > 0)) {
-		$tpl->clear_all_assign();
-		$tpl->assign("project",$project);
-		$tpl->display("project_headlist_header.tpl");
-		$alternate = FALSE;
-		foreach ($headlist as $i => $head) {
-			$tpl->clear_all_assign();
-			$tpl->assign("project",$project);
-			if ($alternate)
-				$tpl->assign("class","dark");
-			else
-				$tpl->assign("class","light");
-			$alternate = !$alternate;
-			if ($i < 16) {
-				$tpl->assign("headage",$head['age']);
-				$tpl->assign("headname",$head['name']);
-			} else
-				$tpl->assign("truncate",TRUE);
-			$tpl->display("project_headlist_item.tpl");
-		}
-
-		$tpl->clear_all_assign();
-		$tpl->display("project_headlist_footer.tpl");
+		$tpl->assign("headlist",$headlist);
 	}
+	$tpl->display("project.tpl");
 }
 
 ?>

--- a/include/display.git_tag.php
+++ b/include/display.git_tag.php
@@ -16,29 +16,17 @@
 	global $tpl;
 
 	$head = git_read_head($projectroot . $project);
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("head",$head);
-	$tpl->display("tag_nav.tpl");
+	$tpl->assign("hash", $hash);
 
 	$tag = git_read_tag($projectroot . $project, $hash);
 
-	$tpl->clear_all_assign();
-	$tpl->assign("project", $project);
-	$tpl->assign("hash", $hash);
-	$tpl->assign("title",$tag['name']);
-	$tpl->assign("type",$tag['type']);
-	$tpl->assign("object",$tag['object']);
+	$tpl->assign("tag",$tag);
 	if (isset($tag['author'])) {
-		$tpl->assign("author",$tag['author']);
 		$ad = date_str($tag['epoch'],$tag['tz']);
-		$tpl->assign("adrfc2822",$ad['rfc2822']);
-		$tpl->assign("adhourlocal",$ad['hour_local']);
-		$tpl->assign("adminutelocal",$ad['minute_local']);
-		$tpl->assign("adtzlocal",$ad['tz_local']);
+		$tpl->assign("datedata",$ad);
 	}
-	$tpl->assign("comment",$tag['comment']);
-	$tpl->display("tag_data.tpl");
+	$tpl->display("tag.tpl");
 }
 
 ?>

--- a/include/display.git_tags.php
+++ b/include/display.git_tags.php
@@ -14,35 +14,12 @@
 {
 	global $tpl;
 	$head = git_read_head($projectroot . $project);
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
 	$tpl->assign("head",$head);
-	$tpl->display("tags_nav.tpl");
-	$tpl->display("tags_header.tpl");
 	$taglist = git_read_refs($projectroot, $project, "refs/tags");
 	if (isset($taglist) && (count($taglist) > 0)) {
-		$alternate = FALSE;
-		foreach ($taglist as $i => $entry) {
-			$tpl->clear_all_assign();
-			if ($alternate)
-				$tpl->assign("class","dark");
-			else
-				$tpl->assign("class","light");
-			$alternate = !$alternate;
-			$tpl->assign("project",$project);
-			$tpl->assign("age",$entry['age']);
-			$tpl->assign("name",$entry['name']);
-			$tpl->assign("reftype",$entry['reftype']);
-			$tpl->assign("refid",$entry['refid']);
-			$tpl->assign("id",$entry['id']);
-			$tpl->assign("type",$entry['type']);
-			if (isset($entry['comment']) && isset($entry['comment'][0]))
-				$tpl->assign("comment",$entry['comment'][0]);
-			$tpl->display("tags_item.tpl");
-		}
+		$tpl->assign("taglist",$taglist);
 	}
-	$tpl->clear_all_assign();
-	$tpl->display("tags_footer.tpl");
+	$tpl->display("tags.tpl");
 }
 
 ?>

--- a/include/display.git_tree.php
+++ b/include/display.git_tree.php
@@ -27,52 +27,37 @@
 	}
 	$lsout = git_ls_tree($projectroot . $project, $hash, TRUE);
 	$refs = read_info_ref($projectroot . $project);
-	$tpl->clear_all_assign();
+	$tpl->assign("hash",$hash);
+	if (isset($hashbase))
+		$tpl->assign("hashbase",$hashbase);
 	if (isset($hashbase) && ($co = git_read_commit($projectroot . $project, $hashbase))) {
 		$basekey = $hashbase;
-		$tpl->assign("hashbase",$hashbase);
-		$tpl->assign("project",$project);
+		$tpl->assign("fullnav",TRUE);
 		$tpl->assign("title",$co['title']);
 		if (isset($refs[$hashbase]))
 			$tpl->assign("hashbaseref",$refs[$hashbase]);
-		$tpl->display("tree_nav.tpl");
-	} else {
-		$tpl->assign("hash",$hash);
-		$tpl->display("tree_emptynav.tpl");
 	}
-	$tpl->clear_all_assign();
-	$tpl->assign("project",$project);
-	$tpl->assign("hashbase",$hashbase);
 	$paths = git_path_trees($projectroot . $project, $hashbase, $file);
 	$tpl->assign("paths",$paths);
-	$tpl->display("tree_filelist_header.tpl");
 
+	if (isset($file))
+		$tpl->assign("base",$file . "/");
+
+	$treelines = array();
 	$tok = strtok($lsout,"\0");
-	$alternate = FALSE;
 	while ($tok !== false) {
 		if (ereg("^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$",$tok,$regs)) {
-			$tpl->clear_all_assign();
-			if ($alternate)
-				$tpl->assign("class","dark");
-			else
-				$tpl->assign("class","light");
-			$alternate = !$alternate;
-			$tpl->assign("filemode",mode_str($regs[1]));
-			$tpl->assign("type",$regs[2]);
-			$tpl->assign("hash",$regs[3]);
-			$tpl->assign("name",$regs[4]);
-			$tpl->assign("project",$project);
-			if (isset($file))
-				$tpl->assign("base",$file . "/");
-			if (isset($basekey))
-				$tpl->assign("hashbase",$basekey);
-			$tpl->display("tree_filelist_item.tpl");
+			$treeline = array();
+			$treeline["filemode"] = mode_str($regs[1]);
+			$treeline["type"] = $regs[2];
+			$treeline["hash"] = $regs[3];
+			$treeline["name"] = $regs[4];
+			$treelines[] = $treeline;
 		}
 		$tok = strtok("\0");
 	}
-
-	$tpl->clear_all_assign();
-	$tpl->display("tree_filelist_footer.tpl");
+	$tpl->assign("treelines",$treelines);
+	$tpl->display("tree.tpl");
 }
 
 ?>

--- /dev/null
+++ b/include/gitutil.git_project_info.php
@@ -1,1 +1,29 @@
+<?php
+/*
+ *  gitutil.git_project_info.php
+ *  gitphp: A PHP git repository browser
+ *  Component: Git utility - single project info
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ */
 
+ require_once('gitutil.git_project_descr.php');
+ require_once('gitutil.git_project_owner.php');
+ require_once('gitutil.git_read_head.php');
+ require_once('gitutil.git_read_commit.php');
+
+function git_project_info($projectroot,$project)
+{
+	$projinfo = array();
+	$projinfo["project"] = $project;
+	$projinfo["descr"] = git_project_descr($projectroot,$project,TRUE);
+	$projinfo["owner"] = git_project_owner($projectroot,$project);
+	$head = git_read_head($projectroot . $project);
+	$commit = git_read_commit($projectroot . $project,$head);
+	$projinfo["age"] = $commit['age'];
+	$projinfo["age_string"] = $commit['age_string'];
+	return $projinfo;
+}
+
+?>
+

--- a/include/gitutil.git_read_projects.php
+++ b/include/gitutil.git_read_projects.php
@@ -7,9 +7,11 @@
  *  Copyright (C) 2008 Christopher Han <xiphux@gmail.com>
  */
 
+ require_once('i18n.lookupstring.php');
  require_once('gitutil.git_recurse_projects.php');
+ require_once('gitutil.git_project_info.php');
 
-function git_read_projects($projectroot,$projectlist)
+function git_read_projects($projectroot,$projectlist,$projdata = FALSE)
 {
 	$projects = array();
 	if (isset($projectroot)) {
@@ -19,8 +21,12 @@
 					if (is_array($plist)) {
 						$projs = array();
 						foreach ($plist as $pname => $ppath) {
-							if (is_dir($projectroot . $ppath) && is_file($projectroot . $ppath . "/HEAD"))
-								$projs[] = $ppath;
+							if (is_dir($projectroot . $ppath) && is_file($projectroot . $ppath . "/HEAD")) {
+								if ($projdata)
+									$projs[] = git_project_info($projectroot, $ppath);
+								else
+									$projs[] = $ppath;
+							}
 						}
 						if (count($projs) > 0) {
 							sort($projs);
@@ -33,13 +39,17 @@
 				$len = count($projects);
 				$cut = strlen($projectroot);
 				for ($i = 0; $i < $len; $i++) {
-					$projects[$i] = substr($projects[$i],$cut + 1);
+					$p = substr($projects[$i],$cut + 1);
+					if ($projdata)
+						$projects[$i] = git_project_info($projectroot, $p);
+					else
+						$projects[$i] = $p;
 				}
 			}
 		} else
-			return "Projectroot is not a directory";
+			return lookupstring("Projectroot is not a directory");
 	} else
-		return "No projectroot set";
+		return lookupstring("No projectroot set");
 	return $projects;
 }
 

--- a/include/gitutil.git_read_refs.php
+++ b/include/gitutil.git_read_refs.php
@@ -13,6 +13,7 @@
  require_once('gitutil.git_read_hash.php');
  require_once('gitutil.git_read_tag.php');
  require_once('gitutil.git_read_commit.php');
+ require_once('i18n.lookupstring.php');
 
 function git_read_refs($projectroot,$project,$refdir)
 {
@@ -44,6 +45,7 @@
 		if ($type) {
 			$ref_item = array();
 			$ref_item['type'] = $type;
+			$ref_item['type_localized'] = lookupstring($type);
 			$ref_item['id'] = $ref_id;
 			$ref_item['epoch'] = 0;
 			$ref_item['age'] = "unknown";
@@ -72,6 +74,7 @@
 				$ref_item['epoch'] = $co['committer_epoch'];
 				$ref_item['age'] = $co['age_string'];
 			}
+			$ref_item['reftype_localized'] = lookupstring($ref_item['reftype']);
 			$reflist[] = $ref_item;
 		}
 	}

--- a/include/gitutil.git_read_tag.php
+++ b/include/gitutil.git_read_tag.php
@@ -8,6 +8,7 @@
  */
 
  require_once('gitutil.git_cat_file.php');
+ require_once('i18n.lookupstring.php');
 
 function git_read_tag($project, $tag_id)
 {
@@ -19,9 +20,10 @@
 	while ($tok !== false) {
 		if (ereg("^object ([0-9a-fA-F]{40})$",$tok,$regs))
 			$tag['object'] = $regs[1];
-		else if (ereg("^type (.+)$",$tok,$regs))
+		else if (ereg("^type (.+)$",$tok,$regs)) {
 			$tag['type'] = $regs[1];
-		else if (ereg("^tag (.+)$",$tok,$regs))
+			$tag['type_localized'] = lookupstring($tag['type']);
+		} else if (ereg("^tag (.+)$",$tok,$regs))
 			$tag['name'] = $regs[1];
 		else if (ereg("^tagger (.*) ([0-9]+) (.*)$",$tok,$regs)) {
 			$tag['author'] = $regs[1];

--- /dev/null
+++ b/include/i18n.initlocale.php
@@ -1,1 +1,27 @@
+<?php
+/*
+ *  i18n.initlocale.php
+ *  gitphp: A PHP git repository browser
+ *  Component: i18n - load locale
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ */
 
+require_once('i18n.lookupstring.php');
+
+function initlocale($locale = "en_US")
+{
+	global $tpl;
+
+	if (!include(GITPHP_LOCALE_DIR . $locale . ".php"))
+		include(GITPHP_LOCALE_DIR . "en_US.php");
+
+	if (isset($strings)) {
+		$tpl->assign("localize",$strings);
+	}
+
+	return $strings;
+}
+
+?>
+

--- /dev/null
+++ b/include/i18n.lookupstring.php
@@ -1,1 +1,29 @@
+<?php
+/*
+ *  i18n.lookupstring.php
+ *  gitphp: A PHP git repository browser
+ *  Component: i18n - look up a string
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ */
 
+function lookupstring($str, $strings = null)
+{
+	global $localestrings;
+
+	if (!$str)
+		return null;
+
+	if (isset($strings) && (count($strings) > 0)) {
+		if (isset($strings[$str]))
+			return $strings[$str];
+	} else {
+		if (isset($localestrings[$str]))
+			return $localestrings[$str];
+	}
+
+	return $str;
+}
+
+?>
+

 Binary files /dev/null and b/include/locale/._zz_DEBUG.php differ
--- /dev/null
+++ b/include/locale/en_US.php
@@ -1,1 +1,366 @@
-
+<?php
+/*
+ *  en_US.php
+ *  gitphp: A PHP git repository browser
+ *  Component: i18n - en_US
+ */
+
+$strings = array(
+	/*
+	 * Error message that tells the user that
+	 * there were no projects found in the projectroot
+	 */
+	'No projects found' => 'No projects found',
+
+	/*
+	 * Error message that tells the user that the projectroot
+	 * they have set up is not a directory
+	 */
+	'Projectroot is not a directory' => 'Projectroot is not a directory',
+
+	/*
+	 * Error message that tells the user that they have not set
+	 * a projectroot
+	 */
+	'No projectroot set' => 'No projectroot set',
+
+	/*
+	 * Tells the user that all searching has been disabled
+	 */
+	'Search has been disabled' => 'Search has been disabled',
+
+	/*
+	 * Tells the user that searching with files has been disabled
+	 */
+	'File search has been disabled' => 'File search has been disabled',
+
+	/*
+	 * Tells the user that their search string must be a minimum of 2 characters
+	 */
+	'You must enter search text of at least 2 characters' => 'You must enter search text of at least 2 characters',
+
+	/*
+	 * Tells the user that no matches were found for their search, where
+	 * %1$s is the search string
+	 */
+	'No matches for \'%1$s\'.' => 'No matches for \'%1$s\'.',
+
+	/*
+	 * Used to indicate multiple projects - links back to the project
+	 * listing page
+	 */
+	'projects' => 'projects',
+
+	/*
+	 * Used as the header for the project name column on the project list
+	 */
+	'headerproject' => 'Project',
+
+	/*
+	 * Used as the header for the description column on the project list
+	 */
+	'headerdescription' => 'Description',
+
+	/*
+	 * Used as the header for the owner column on the project list
+	 */
+	'headerowner' => 'Owner',
+
+	/*
+	 * Used as the header for the age (last time project was changed) column in the
+	 * project list
+	 */
+	'headerlastchange' => 'Last Change',
+
+	/*
+	 * Used as the header for the actions column (links to various other pages for
+	 * that project)
+	 */
+	'headeractions' => 'Actions',
+
+	/*
+	 * Used as the name for the main project summary page
+	 */
+	'summary' => 'summary',
+
+	/*
+	 * Used as the name for the shortlog (abbreviated commit log) page
+	 */
+	'shortlog' => 'shortlog',
+
+	/*
+	 * Used as the name for the log (full commit log) page
+	 */
+	'log' => 'log',
+
+	/*
+	 * Used as the name for a single "commit" to the repository - 
+	 * for the commit page, as well as on other pages when referencing
+	 * a single commit object
+	 */
+	'commit' => 'commit',
+
+	/*
+	 * Used as the name for the commitdiff page, which shows all changes
+	 * in a single commit
+	 */
+	'commitdiff' => 'commitdiff',
+
+	/*
+	 * Used as the name for the tree page and to reference tree objects - 
+	 * "trees" being a particular project's directory of files (or subdirectory)
+	 * at a given revision
+	 */
+	'tree' => 'tree',
+
+	/*
+	 * Used as the name for the snapshot action, which sends a tarball of the
+	 * project at a given revision
+	 */
+	'snapshot' => 'snapshot',
+
+	/*
+	 * Used as the name for the tags page/section, which lists all tags for a project
+	 */
+	'tags' => 'tags',
+
+	/*
+	 * Used as the name for the single tag page, which shows all info on a single
+	 * tag object
+	 */
+	'tag' => 'tag',
+
+	/*
+	 * Used as the name for the heads page/section, which lists all heads for a project
+	 */
+	'heads' => 'heads',
+
+	/*
+	 * Used as the name for the history page, which lists all commits where a particular
+	 * file was changed
+	 */
+	'history' => 'history',
+
+	/*
+	 * Used as the name for the blob page, which shows the content of a file at a given
+	 * revision (its 'blob' data)
+	 */
+	'blob' => 'blob',
+
+	/*
+	 * Used as a link to show the differences in a file for a commit
+	 */
+	'diff' => 'diff',
+
+	/*
+	 * Used as a link to diff a particular revision of a file to the current version
+	 */
+	'difftocurrent' => 'diff to current',
+
+	/*
+	 * Used as the name for the search action, and to caption the search box
+	 */
+	'search' => 'search',
+
+	/*
+	 * Used as the caption on the 'RSS' button, which gets a feed of the most recent
+	 * commits to a project
+	 */
+	'RSS' => 'RSS',
+
+	/*
+	 * Used as the caption for the 'OPML' button, which gets a list of projects in OPML format
+	 */
+	'OPML' => 'OPML',
+
+	/*
+	 * Used as the caption for the 'TXT' button, which gets a list of projects in plaintext
+	 */
+	'TXT' => 'TXT',
+
+	/*
+	 * Used as a link on various actions (blob, blobdiff, commitdiff, etc) to get the plaintext
+	 * version of it
+	 */
+	'plain' => 'plain',
+
+	/*
+	 * Used as an indicator that something was added
+	 */
+	'new' => 'new',
+
+	/*
+	 * Used as an indicator that something was deleted
+	 */
+	'deleted' => 'deleted',
+
+	/*
+	 * Used as an indicator that something is a file - for example, that we are diffing a
+	 * file or searching within files
+	 */
+	'file' => 'file',
+
+	/*
+	 * Used to denote the author of a particular commit, or that we want to search
+	 * authors
+	 */
+	'author' => 'author',
+
+	/*
+	 * Used to denote the committer of a particular commit, or that we want to search
+	 * committers
+	 */
+	'committer' => 'committer',
+
+	/*
+	 * Used as the link to the previous page, when paginating through log entries
+	 * or search results
+	 */
+	'prev' => 'prev',
+
+	/*
+	 * Used as the link to the next page, when paginating through log entries
+	 * or search results
+	 */
+	'next' => 'next',
+
+	/*
+	 * Used as the link to the first page, when paginating through search results
+	 */
+	'first' => 'first',
+
+	/*
+	 * Used as the link to the HEAD, when paginating through log entries
+	 */
+	'HEAD' => 'HEAD',
+
+	/*
+	 * Used to indicate the description of the project, on the project summary page
+	 */
+	'description' => 'description',
+
+	/*
+	 * Used to indicate the owner of the project, on the project summary page
+	 */
+	'owner' => 'owner',
+
+	/*
+	 * Used to indicate the age (last change) of the project, on the project summary page
+	 */
+	'lastchange' => 'last change',
+
+	/*
+	 * Used to indicate the object that is the parent of this one (eg the commit that
+	 * came right before this one)
+	 */
+	'parent' => 'parent',
+
+	/*
+	 * Used to indicate the object (commit, etc) that is attached to a tag
+	 */
+	'object' => 'object',
+
+	/*
+	 * Used to indicate a new object was added, where
+	 * %1$s is the type of object (file or tree)
+	 */
+	'newobject' => 'new %1$s',
+
+	/*
+	 * Used to indicate a new object was added, where
+	 * %1$s is the type of object (file or tree) and
+	 * %2$s is the new mode
+	 */
+	'newobjectwithmode' => 'new %1$s with mode: %2$s',
+
+	/*
+	 * Used to indicate an object was deleted, where
+	 * %1$s is the type of object (file or tree)
+	 */
+	'deletedobject' => 'deleted %1$s',
+
+	/*
+	 * Used to indicate an object's type was changed, where
+	 * %1$s is the old type and %2$s is the new type
+	 */
+	'changedobjecttype' => 'changed from %1$s to %2$s',
+
+	/*
+	 * Used to indicate an object's mode was changed, where
+	 * %1$s is the mode change (either just one mode or
+	 * mode1->mode2)
+	 */
+	'changedobjectmode' => 'changed mode: %1$s',
+
+	/*
+	 * Used to indicate that an object was moved/renamed,
+	 * where %1$s is the original name, and
+	 * %2$d is the percentage similarity
+	 */
+	'movedobjectwithsimilarity' => 'moved from %1$s with %2$d%% similarity',
+
+	/*
+	 * Used to indicate that an object was moved/renamed,
+	 * where %1$s is the original name,
+	 * %2$d is the percentage similarity, and
+	 * %3$s is the mode
+	 */
+	'movedobjectwithsimilaritymodechange' => 'moved from %1$s with %2$d%% similarity, mode: $3$s',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * years ago, where %1$d is the number of years
+	 */
+	'ageyearsago' => '%1$d years ago',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * years ago, where %1$d is the number of years
+	 */
+	'agemonthsago' => '%1$d months ago',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * weeks ago, where %1$d is the number of weeks
+	 */
+	'ageweeksago' => '%1$d weeks ago',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * days ago, where %1$d is the number of days
+	 */
+	'agedaysago' => '%1$d days ago',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * hours ago, where %1$d is the number of hours
+	 */
+	'agehoursago' => '%1$d hours ago',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * minutes ago, where %1$d is the number of minutes
+	 */
+	'ageminago' => '%1$d min ago',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * seconds ago, where %1$d is the number of seconds
+	 */
+	'agesecago' => '%1$d sec ago',
+
+	/*
+	 * Used to indicate something is happening right now
+	 * (less than 3 seconds ago)
+	 */
+	'agerightnow' => 'right now',
+
+	/*
+	 * Used to indicate a certain number of files were changed in a commit
+	 * where %1$d is the numebr of files changed
+	 */
+	'fileschanged' => '%1$d files changed',
+);
+
+?>
+

--- /dev/null
+++ b/include/locale/zz_DEBUG.php
@@ -1,1 +1,366 @@
-
+<?php
+/*
+ *  zz_DEBUG.php
+ *  gitphp: A PHP git repository browser
+ *  Component: i18n - zz_DEBUG
+ */
+
+$strings = array(
+	/*
+	 * Error message that tells the user that
+	 * there were no projects found in the projectroot
+	 */
+	'No projects found' => 'No projects found',
+
+	/*
+	 * Error message that tells the user that the projectroot
+	 * they have set up is not a directory
+	 */
+	'Projectroot is not a directory' => 'Projectroot is not a directory',
+
+	/*
+	 * Error message that tells the user that they have not set
+	 * a projectroot
+	 */
+	'No projectroot set' => 'No projectroot set',
+
+	/*
+	 * Tells the user that all searching has been disabled
+	 */
+	'Search has been disabled' => 'Search has been disabled',
+
+	/*
+	 * Tells the user that searching with files has been disabled
+	 */
+	'File search has been disabled' => 'File search has been disabled',
+
+	/*
+	 * Tells the user that their search string must be a minimum of 2 characters
+	 */
+	'You must enter search text of at least 2 characters' => 'You must enter search text of at least 2 characters',
+
+	/*
+	 * Tells the user that no matches were found for their search, where
+	 * %1$s is the search string
+	 */
+	'No matches for \'%1$s\'.' => 'No matches for \'%1$s\'.',
+
+	/*
+	 * Used to indicate multiple projects - links back to the project
+	 * listing page
+	 */
+	'projects' => '{prőjėčts••}',
+
+	/*
+	 * Used as the header for the project name column on the project list
+	 */
+	'headerproject' => '{Pröjèct••}',
+
+	/*
+	 * Used as the header for the description column on the project list
+	 */
+	'headerdescription' => '{Dèscrîptîön•••}',
+
+	/*
+	 * Used as the header for the owner column on the project list
+	 */
+	'headerowner' => '{Öwnèr•}',
+
+	/*
+	 * Used as the header for the age (last time project was changed) column in the
+	 * project list
+	 */
+	'headerlastchange' => '{Låst Chångè•••}',
+
+	/*
+	 * Used as the header for the actions column (links to various other pages for
+	 * that project)
+	 */
+	'headeractions' => '{Åctîöns••}',
+
+	/*
+	 * Used as the name for the main project summary page
+	 */
+	'summary' => '{sûmmäry••}',
+
+	/*
+	 * Used as the name for the shortlog (abbreviated commit log) page
+	 */
+	'shortlog' => '{shõrtlög••}',
+
+	/*
+	 * Used as the name for the log (full commit log) page
+	 */
+	'log' => '{lõg•}',
+
+	/*
+	 * Used as the name for a single "commit" to the repository - 
+	 * for the commit page, as well as on other pages when referencing
+	 * a single commit object
+	 */
+	'commit' => '{cömmït•}',
+
+	/*
+	 * Used as the name for the commitdiff page, which shows all changes
+	 * in a single commit
+	 */
+	'commitdiff' => '{cõmmïtdîff•••}',
+
+	/*
+	 * Used as the name for the tree page and to reference tree objects - 
+	 * "trees" being a particular project's directory of files (or subdirectory)
+	 * at a given revision
+	 */
+	'tree' => '{tréè•}',
+
+	/*
+	 * Used as the name for the snapshot action, which sends a tarball of the
+	 * project at a given revision
+	 */
+	'snapshot' => '{snãpshöt••}',
+
+	/*
+	 * Used as the name for the tags page/section, which lists all tags for a project
+	 */
+	'tags' => '{tágs•}',
+
+	/*
+	 * Used as the name for the single tag page, which shows all info on a single
+	 * tag object
+	 */
+	'tag' => '{tàg•}',
+
+	/*
+	 * Used as the name for the heads page/section, which lists all heads for a project
+	 */
+	'heads' => '{hèáds•}',
+
+	/*
+	 * Used as the name for the history page, which lists all commits where a particular
+	 * file was changed
+	 */
+	'history' => '{hîstöry••}',
+
+	/*
+	 * Used as the name for the blob page, which shows the content of a file at a given
+	 * revision (its 'blob' data)
+	 */
+	'blob' => '{blôb•}',
+	
+	/*
+	 * Used as a link to show the differences in a file for a commit
+	 */
+	'diff' => '{dîff•}',
+
+	/*
+	 * Used as a link to diff a particular revision of a file to the current version
+	 */
+	'difftocurrent' => '{dîff tò cürrênt••••}',
+
+	/*
+	 * Used as the name for the search action, and to caption the search box
+	 */
+	'search' => '{sêàrch••}',
+
+	/*
+	 * Used as the caption on the 'RSS' button, which gets a feed of the most recent
+	 * commits to a project
+	 */
+	'RSS' => '{RSS•}',
+
+	/*
+	 * Used as the caption for the 'OPML' button, which gets a list of projects in OPML format
+	 */
+	'OPML' => '{ÖPML•}',
+
+	/*
+	 * Used as the caption for the 'TXT' button, which gets a list of projects in plaintext
+	 */
+	'TXT' => '{TXT•}',
+
+	/*
+	 * Used as a link on various actions (blob, blobdiff, commitdiff, etc) to get the plaintext
+	 * version of it
+	 */
+	'plain' => '{plåïn•}',
+
+    /*
+     * Used as an indicator that something was added
+     */
+    'new' => '{ñêw•}',
+
+	/*
+	 * Used as an indicator that something was deleted
+	 */
+	'deleted' => '{délètëd••}',
+
+	/*
+	 * Used as an indicator that something is a file - for example, that we are diffing a
+	 * file or searching within files
+	 */
+	'file' => '{fílĕ•}',
+
+	/*
+	 * Used to denote the author of a particular commit, or that we want to search
+	 * authors
+	 */
+	'author' => '{åûthōr••}',
+
+	/*
+	 * Used to denote the committer of a particular commit, or that we want to search
+	 * committers
+	 */
+	'committer' => '{cōmmĩttęr••}',
+
+	/*
+	 * Used as the link to the previous page, when paginating through log entries
+	 * or search results
+	 */
+	'prev' => '{prěv•}',
+
+	/*
+	 * Used as the link to the next page, when paginating through log entries
+	 * or search results
+	 */
+	'next' => '{ńėxt•}',
+
+	/*
+	 * Used as the link to the first page, when paginating through search results
+	 */
+	'first' => '{fĩrst•}',
+
+	/*
+	 * Used as the link to the HEAD, when paginating through log entries
+	 */
+	'HEAD' => '{HĚĂD•}',
+	
+	/*
+     * Used to indicate the description of the project, on the project summary page
+     */
+    'description' => '{dêscrïptìõn•••}',
+
+    /*
+     * Used to indicate the owner of the project, on the project summary page
+     */
+    'owner' => '{öwnêr•}',
+
+    /*
+     * Used to indicate the age (last change) of the project, on the project summary page
+     */
+    'lastchange' => '{låst chãngë•••}',
+
+	/*
+	 * Used to indicate the object that is the parent of this one (eg the commit that
+	 * came right before this one)
+	 */
+	'parent' => '{pārėnt••}',
+
+	/*
+	 * Used to indicate the object (commit, etc) that is attached to a tag
+	 */
+	'object' => '{őbjěct••}',
+
+	/*
+	 * Used to indicate a new object was added, where
+	 * %1$s is the type of object (file or tree)
+	 */
+	'newobject' => '{‹%1$s› ñėw•}',
+
+	/*
+	 * Used to indicate a new object was added, where
+	 * %1$s is the type of object (file or tree) and
+	 * %2$s is the new mode
+	 */
+	'newobjectwithmode' => '{mõdę ‹%2$s› ñėw ‹%1$s›•••••}',
+
+	/*
+	 * Used to indicate an object was deleted, where
+	 * %1$s is the type of object (file or tree)
+	 */
+	'deletedobject' => '{‹%1$s› dėlětē••}',
+	
+	/*
+	 * Used to indicate an object's type was changed, where
+	 * %1$s is the old type and %2$s is the new type
+	 */
+	'changedobjecttype' => '{‹%1$s› tö ‹%2$s› chăngěd•••••}',
+	
+	/*
+	 * Used to indicate an object's mode was changed, where
+	 * %1$s is the mode change (either just one mode or
+	 * mode1->mode2)
+	 */
+    'changedobjectmode' => '{‹%1$s› mõdêchångè••••}',
+
+	/*
+	 * Used to indicate that an object was moved/renamed,
+	 * where %1$s is the original name, ande
+	 * %2$d is the percentage similarity,
+	 */
+	'movedobjectwithsimilarity' => '{%%‹%2$d› sĩmīląrĭtŷ, mővɛd frŏm ‹%1$s›•••••••••}',
+	
+    /*
+     * Used to indicate that an object was moved/renamed,
+     * where %1$s is the original name,
+     * %2$d is the percentage similarity, and
+     * %3$s is the mode
+     */
+    'movedobjectwithsimilaritymodechange' => '{%%‹%2$d› sĩmīląrĭtŷ, mővɛd frŏm ‹%1$s› mode ‹%3$s›•••••••••}',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * years ago, where %1$d is the number of years
+	 */
+	'ageyearsago' => '{ŷrs ‹%1$d› ăgő•••}',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * years ago, where %1$d is the number of years
+	 */
+	'agemonthsago' => '{mős ‹%1$d› ăgő•••}',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * weeks ago, where %1$d is the number of weeks
+	 */
+	'ageweeksago' => '{wks ‹%1$d› ăgő•••}',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * days ago, where %1$d is the number of days
+	 */
+	'agedaysago' => '{dŷs ‹%1$d› ăgő•••}',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * hours ago, where %1$d is the number of hours
+	 */
+	'agehoursago' => '{hrs ‹%1$d› ăgő•••}',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * minutes ago, where %1$d is the number of minutes
+	 */
+	'ageminago' => '{mñs ‹%1$d› ăgő••}',
+
+	/*
+	 * Used to indicate something happened a certain number of
+	 * seconds ago, where %1$d is the number of seconds
+	 */
+	'agesecago' => '{scs ‹%1$d› ăgő••}',
+
+	/*
+	 * Used to indicate something is happening right now
+	 * (less than 3 seconds ago)
+	 */
+	'agerightnow' => '{rĩght nøw•••}',
+	
+     /*
+      * Used to indicate a certain number of files were changed in a commit
+      * where %1$d is the numebr of files changed
+      */
+     'fileschanged' => '{chângëd ‹%1$d› fĭlēs••••}',
+);
+
+?>
+

--- a/include/util.age_string.php
+++ b/include/util.age_string.php
@@ -7,23 +7,34 @@
  *  Copyright (C) 2008 Christopher Han <xiphux@gmail.com>
  */
 
+include('i18n.lookupstring.php');
+
 function age_string($age)
 {
-	if ($age > 60*60*24*365*2)
-		return (int)($age/60/60/24/365) . " years ago";
-	else if ($age > 60*60*24*(365/12)*2)
-		return (int)($age/60/60/24/(365/12)) . " months ago";
-	else if ($age > 60*60*24*7*2)
-		return (int)($age/60/60/24/7) . " weeks ago";
-	else if ($age > 60*60*24*2)
-		return (int)($age/60/60/24) . " days ago";
-	else if ($age > 60*60*2)
-		return (int)($age/60/60) . " hours ago";
-	else if ($age > 60*2)
-		return (int)($age/60) . " min ago";
-	else if ($age > 2)
-		return (int)$age . " sec ago";
-	return "right now";
+	if ($age > 60*60*24*365*2) {
+		return sprintf(lookupstring('ageyearsago'), (int)($age/60/60/24/365));
+		//i18n: return sprintf(lookupstring('%1$d years ago'), (int)($age/60/60/24/365));
+	} else if ($age > 60*60*24*(365/12)*2) {
+		return sprintf(lookupstring('agemonthsago'), (int)($age/60/60/24/(365/12)));
+		//i18n: return sprintf(lookupstring('%1$d months ago'), (int)($age/60/60/24/(365/12)));
+	} else if ($age > 60*60*24*7*2) {
+		return sprintf(lookupstring('ageweeksago'), (int)($age/60/60/24/7));
+		//i18n: return sprintf(lookupstring('%1$d weeks ago'), (int)($age/60/60/24/7));
+	} else if ($age > 60*60*24*2) {
+		return sprintf(lookupstring('agedaysago'), (int)($age/60/60/24));
+		//i18n: return sprintf(lookupstring('%1$d days ago'), (int)($age/60/60/24));
+	} else if ($age > 60*60*2) {
+		return sprintf(lookupstring('agehoursago'), (int)($age/60/60));
+		//i18n: return sprintf(lookupstring('%1$d hours ago'), (int)($age/60/60));
+	} else if ($age > 60*2) {
+		return sprintf(lookupstring('ageminago'), (int)($age/60));
+		//i18n: return sprintf(lookupstring('%1$d min ago'), (int)($age/60));
+	} else if ($age > 2) {
+		return sprintf(lookupstring('agesecago'), (int)$age);
+		//i18n: return sprintf(lookupstring('%1$d sec ago'), (int)$age);
+	}
+	return lookupstring('agerightnow');
+	//i18n: return lookupstring("right now");
 }
 
 ?>

--- a/include/util.agecmp.php
+++ b/include/util.agecmp.php
@@ -7,17 +7,11 @@
  *  Copyright (C) 2008 Christopher Han <xiphux@gmail.com>
  */
 
- require_once('gitutil.git_read_commit.php');
- require_once('gitutil.git_read_head.php');
-
 function agecmp($a,$b)
 {
-	global $gitphp_conf;
-	$ca = git_read_commit($gitphp_conf['projectroot'] . $a, git_read_head($gitphp_conf['projectroot'] . $a));
-	$cb = git_read_commit($gitphp_conf['projectroot'] . $b, git_read_head($gitphp_conf['projectroot'] . $b));
-	if ($ca['age'] == $cb['age'])
+	if ($a["age"] == $b["age"])
 		return 0;
-	return ($ca['age'] < $cb['age'] ? -1 : 1);
+	return ($a["age"] < $b["age"] ? -1 : 1);
 }
 
 ?>

--- a/include/util.descrcmp.php
+++ b/include/util.descrcmp.php
@@ -7,12 +7,9 @@
  *  Copyright (C) 2008 Christopher Han <xiphux@gmail.com>
  */
 
- require_once('gitutil.git_project_descr.php');
-
 function descrcmp($a,$b)
 {
-	global $gitphp_conf;
-	return strcmp(git_project_descr($gitphp_conf['projectroot'],$a),git_project_descr($gitphp_conf['projectroot'],$b));
+	return strcmp($a["descr"],$b["descr"]);
 }
 
 ?>

--- a/include/util.ownercmp.php
+++ b/include/util.ownercmp.php
@@ -7,12 +7,9 @@
  *  Copyright (C) 2008 Christopher Han <xiphux@gmail.com>
  */
 
- require_once('gitutil.git_project_owner.php');
-
 function ownercmp($a,$b)
 {
-	global $gitphp_conf;
-	return strcmp(git_project_owner($gitphp_conf['projectroot'],$a),git_project_owner($gitphp_conf['projectroot'],$b));
+	return strcmp($a["owner"],$b["owner"]);
 }
 
 ?>

--- a/include/util.projectcmp.php
+++ b/include/util.projectcmp.php
@@ -9,7 +9,7 @@
 
 function projectcmp($a,$b)
 {
-	return strcmp($a,$b);
+	return strcmp($a["project"],$b["project"]);
 }
 
 ?>

file:a/index.php -> file:b/index.php
--- a/index.php
+++ b/index.php
@@ -6,7 +6,6 @@
  *
  *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
  */
- ob_start();
 
  /*
   * Version
@@ -22,33 +21,83 @@
   * Configuration
   */
  require_once('config/gitphp.conf.php');
+
+ /*
+  * Debug
+  */
+ if ($gitphp_conf['debug']) {
+ 	define('GITPHP_START_TIME', microtime(true));
+	error_reporting(E_ALL|E_STRICT);
+ }
 
  /*
   * Instantiate Smarty
   */
  require_once($gitphp_conf['smarty_prefix'] . "Smarty.class.php");
  $tpl =& new Smarty;
- $tpl->load_filter('output','trimwhitespace');
-
- $rss_link = FALSE;
- $suppress_headers = FALSE;
-
- ob_start();
+ if (isset($_GET['a']) &&
+     ($_GET['a'] != "commitdiff_plain") &&
+     ($_GET['a'] != "blob_plain") &&
+     ($_GET['a'] != "blobdiff_plain") &&
+     ($_GET['a'] != "rss") &&
+     ($_GET['a'] != "opml")) {
+	$tpl->load_filter('output','trimwhitespace');
+}
+
+ /*
+  * Init i18n
+  */
+ require_once('include/i18n.initlocale.php');
+ $localestrings = initlocale($gitphp_conf['lang']);
+
+/*
+ * Setup global assigns used everywhere (such as header/footer)
+ */
+ $tpl->assign("stylesheet",$gitphp_conf['stylesheet']);
+ $tpl->assign("version",$gitphp_version);
+ $tpl->assign("pagetitle",$gitphp_conf['title']);
+ if (isset($_GET['p'])) {
+	$tpl->assign("validproject",TRUE);
+	$tpl->assign("project",$_GET['p']);
+	require_once('include/gitutil.git_project_descr.php');
+	$tpl->assign("projectdescription",git_project_descr($gitphp_conf['projectroot'],$_GET['p']));
+	if (isset($_GET['a'])) {
+		$tpl->assign("action",$_GET['a']);
+		$tpl->assign("validaction", TRUE);
+	}
+ }
+ if (isset($_GET['st']))
+ 	$tpl->assign("currentsearchtype",$_GET['st']);
+ else
+	$tpl->assign("currentsearchtype","commit");
+if (isset($_GET['s']))
+	$tpl->assign("currentsearch",$_GET['s']);
+if (isset($_GET['hb']))
+	$tpl->assign("currentsearchhash",$_GET['hb']);
+else if (isset($_GET['h']))
+	$tpl->assign("currentsearchhash",$_GET['h']);
+if ($gitphp_conf['search'])
+	$tpl->assign("enablesearch",TRUE);
+if ($gitphp_conf['filesearch'])
+	$tpl->assign("filesearch",TRUE);
+
+
  if (isset($_GET['a']) && $_GET['a'] == "opml") {
-	$suppress_headers = TRUE;
 	require_once('include/display.git_opml.php');
 	git_opml($gitphp_conf['projectroot'],$git_projects);
  } else if (isset($_GET['a']) && $_GET['a'] == "project_index") {
-	$suppress_headers = TRUE;
 	require_once('include/display.git_project_index.php');
 	git_project_index($gitphp_conf['projectroot'],$git_projects);
  } else if (isset($_GET['p'])) {
- 	if (!is_dir($gitphp_conf['projectroot'] . $_GET['p']))
-		echo "No such directory";
-	else if (!is_file($gitphp_conf['projectroot'] . $_GET['p'] . "/HEAD"))
-		echo "No such project";
-	else {
-		$rss_link = TRUE;
+ 	if (!is_dir($gitphp_conf['projectroot'] . $_GET['p'])) {
+		$tpl->assign("validproject",FALSE);
+		require_once('include/display.git_message.php');
+		git_message("No such directory",TRUE);
+	} else if (!is_file($gitphp_conf['projectroot'] . $_GET['p'] . "/HEAD")) {
+		$tpl->assign("validproject",FALSE);
+		require_once('include/display.git_message.php');
+		git_message("No such project",TRUE);
+	} else {
 		if (!isset($_GET['a'])) {
 			require_once('include/display.git_summary.php');
 			git_summary($gitphp_conf['projectroot'],$_GET['p']);
@@ -79,7 +128,6 @@
 					git_commitdiff($gitphp_conf['projectroot'],$_GET['p'],$_GET['h'], (isset($_GET['hp']) ? $_GET['hp'] : NULL));
 					break;
 				case "commitdiff_plain":
-					$suppress_headers = TRUE;
 					require_once('include/display.git_commitdiff_plain.php');
 					git_commitdiff_plain($gitphp_conf['projectroot'],$_GET['p'],$_GET['h'],(isset($_GET['hp']) ? $_GET['hp'] : NULL));
 					break;
@@ -92,7 +140,6 @@
 					git_tags($gitphp_conf['projectroot'],$_GET['p']);
 					break;
 				case "rss":
-					$suppress_headers = TRUE;
 					require_once('include/display.git_rss.php');
 					git_rss($gitphp_conf['projectroot'],$_GET['p']);
 					break;
@@ -101,7 +148,6 @@
 					git_blob($gitphp_conf['projectroot'],$_GET['p'], (isset($_GET['h']) ? $_GET['h'] : NULL), (isset($_GET['f']) ? $_GET['f'] : NULL), (isset($_GET['hb']) ? $_GET['hb'] : NULL));
 					break;
 				case "blob_plain":
-					$suppress_headers = TRUE;
 					require_once('include/display.git_blob_plain.php');
 					git_blob_plain($gitphp_conf['projectroot'],$_GET['p'],$_GET['h'],(isset($_GET['f']) ? $_GET['f'] : NULL));
 					break;
@@ -110,12 +156,10 @@
 					git_blobdiff($gitphp_conf['projectroot'],$_GET['p'],$_GET['h'],$_GET['hb'],$_GET['hp'],(isset($_GET['f']) ? $_GET['f'] : NULL));
 					break;
 				case "blobdiff_plain":
-					$suppress_headers = TRUE;
 					require_once('include/display.git_blobdiff_plain.php');
 					git_blobdiff_plain($gitphp_conf['projectroot'],$_GET['p'],$_GET['h'],$_GET['hb'],$_GET['hp'], (isset($_GET['f']) ? $_GET['f'] : NULL));
 					break;
 				case "snapshot":
-					$suppress_headers = TRUE;
 					require_once('include/display.git_snapshot.php');
 					git_snapshot($gitphp_conf['projectroot'],$_GET['p'], (isset($_GET['h']) ? $_GET['h'] : NULL));
 					break;
@@ -137,63 +181,20 @@
 					git_tag($gitphp_conf['projectroot'],$_GET['p'],$_GET['h']);
 					break;
 				default:
-					echo "Unknown action";
+					$tpl->assign("validaction", FALSE);
+					require_once('include/display.git_message.php');
+					git_message("Unknown action", TRUE);
 					break;
 			}
 		}
 	}
  } else {
- 	$tpl->display("hometext.tpl");
 	require_once('include/display.git_project_list.php');
  	git_project_list($gitphp_conf['projectroot'],$git_projects,(isset($_GET['o']) ? $_GET['o'] : "project"));
  }
- $main = ob_get_contents();
- ob_end_clean();
-
- if (!$suppress_headers) {
-	 $tpl->clear_all_assign();
-	 $tpl->assign("stylesheet",$gitphp_conf['stylesheet']);
-	 $tpl->assign("version",$gitphp_version);
-	 $title = $gitphp_conf['title'];
-	 if ($rss_link) {
-		$tpl->assign("rss_link",TRUE);
-		$tpl->assign("project",$_GET['p']);
-		$title .= " :: " . $_GET['p'];
-		if (isset($_GET['a'])) {
-			$tpl->assign("action",$_GET['a']);
-			$title .= "/" . $_GET['a'];
-		}
-	 }
-	 $tpl->assign("title",$title);
-	 if (isset($_GET['st']))
-	 	$tpl->assign("searchtype",$_GET['st']);
-	else
-		$tpl->assign("searchtype","commit");
-	if (isset($_GET['s']))
-		$tpl->assign("search",$_GET['s']);
-	if (isset($_GET['hb']))
-		$tpl->assign("hash",$_GET['hb']);
-	else if (isset($_GET['h']))
-		$tpl->assign("hash",$_GET['h']);
-	if ($gitphp_conf['search'])
-		$tpl->assign("enablesearch",TRUE);
-	if ($gitphp_conf['filesearch'])
-		$tpl->assign("filesearch",TRUE);
-	 $tpl->display("header.tpl");
- }
-
- echo $main;
-
- if (!$suppress_headers) {
-	 if ($rss_link) {
-		$tpl->assign("project",$_GET['p']);
-		require_once('include/gitutil.git_project_descr.php');
-		$tpl->assign("descr",git_project_descr($gitphp_conf['projectroot'],$_GET['p']));
-	 }
-	 $tpl->display("footer.tpl");
- }
-
- ob_end_flush();
+
+ if ($gitphp_conf['debug'])
+ 	echo "Execution time: " . round(microtime(true) - GITPHP_START_TIME, 8) . " sec";
 
 ?>
 

--- a/templates/blob.tpl
+++ b/templates/blob.tpl
@@ -5,14 +5,31 @@
  *
  *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
  *}
+
+ {include file='header.tpl'}
+
  {* If we managed to look up commit info, we have enough info to display the full header - othewise just use a simple header *}
  <div class="page_nav">
    {if $fullnav}
-     <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hashbase}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hashbase}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hashbase}">tree</a><br />
+     {* i18n: summary = summary *}
+     {* i18n: shortlog = shortlog *}
+     {* i18n: log = log *}
+     {* i18n: commit = commit *}
+     {* i18n: comitdiff = commitdiff *}
+     {* i18n: tree = tree *}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hashbase}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hashbase}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hashbase}">{$localize.tree}</a><br />
+     {* i18n: plain = plain *}
      {if $file}
-       <a href="{$SCRIPT_NAME}?p={$project}&a=blob_plain&h={$hash}&f={$file}">plain</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=blob&hb=HEAD&f={$file}">head</a><br />
+       <a href="{$SCRIPT_NAME}?p={$project}&a=blob_plain&h={$hash}&f={$file}">{$localize.plain}</a> | 
+       {* i18n: HEAD = HEAD *}
+       {if ($hashbase != "HEAD") && ($hashbase != $head)}
+         <a href="{$SCRIPT_NAME}?p={$project}&a=blob&hb=HEAD&f={$file}">{$localize.HEAD}</a>
+       {else}
+         {$localize.HEAD}
+       {/if}
+       <br />
      {else}
-       <a href="{$SCRIPT_NAME}?p={$project}&a=blob_plain&h={$hash}">plain</a><br />
+       <a href="{$SCRIPT_NAME}?p={$project}&a=blob_plain&h={$hash}">{$localize.plain}</a><br />
      {/if}
    {else}
      <br /><br />
@@ -53,11 +70,15 @@
      {$geshiout}
    {else}
      {* Just plain display *}
-     <div class="pre">
+     <table class="code">
      {foreach from=$lines item=line name=lines}
-       {if $smarty.foreach.lines.iteration < 10} {/if}{if $smarty.foreach.lines.iteration < 100} {/if}{if $smarty.foreach.lines.iteration < 1000} {/if}<a id="l{$smarty.foreach.lines.iteration}" href="#l{$smarty.foreach.lines.iteration}" class="linenr">{$smarty.foreach.lines.iteration}</a> {$line|escape:'htmlall'}
+       <tr>
+         <td class="num"><a id="l{$smarty.foreach.lines.iteration}" href="#l{$smarty.foreach.lines.iteration}" class="linenr">{$smarty.foreach.lines.iteration}</a></td>
+	 <td class="codeline">{$line|escape:'htmlall'}</td>
      {/foreach}
-     </div>
+     </table>
    {/if}
  </div>
 
+ {include file='footer.tpl'}
+

--- a/templates/blobdiff.tpl
+++ b/templates/blobdiff.tpl
@@ -5,12 +5,22 @@
  *
  *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
  *}
+
+ {include file='header.tpl'}
+
  {* If we managed to look up commit info, we have enough info to display the full header - othewise just use a simple header *}
  <div class="page_nav">
    {if $fullnav}
-     <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hashbase}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hashbase}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hashbase}">tree</a>
+     {* i18n: summary = summary *}
+     {* i18n: shortlog = shortlog *}
+     {* i18n: log = log *}
+     {* i18n: commit = commit *}
+     {* i18n: commitdiff = commitdiff *}
+     {* i18n: tree = tree *}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hashbase}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hashbase}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hashbase}">{$localize.tree}</a>
      <br />
-     <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff_plain&h={$hash}&hp={$hashparent}&f={$file}">plain</a>
+     {* i18n: plain = plain *}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff_plain&h={$hash}&hp={$hashparent}&f={$file}">{$localize.plain}</a>
    {else}
      <br /><br />
    {/if}
@@ -42,9 +52,13 @@
  <div class="page_body">
    <div class="diff_info">
      {* Display the from -> to diff header *}
-     blob:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$hashparent}&hb={$hashbase}&f={$file}">{if $file}a/{$file}{else}{$hashparent}{/if}</a> -&gt; blob:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$hash}&hb={$hashbase}&f={$file}">{if $file}b/{$file}{else}{$hash}{/if}</a>
+     {* i18n: blob = blob *}
+     {$localize.blob}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$hashparent}&hb={$hashbase}&f={$file}">{if $file}a/{$file}{else}{$hashparent}{/if}</a> -&gt; {$localize.blob}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$hash}&hb={$hashbase}&f={$file}">{if $file}b/{$file}{else}{$hash}{/if}</a>
    </div>
    {* Display the diff *}
    {include file='filediff.tpl'}
  </div>
 
+ {include file='footer.tpl'}
+
+

--- /dev/null
+++ b/templates/commit.tpl
@@ -1,1 +1,162 @@
+{*
+ *  commit.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Commit view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ <div class="page_nav">
+   {* Nav *}
+   {* i18n: summary = summary *}
+   {* i18n: shortlog = shortlog *}
+   {* i18n: log = log *}
+   {* i18n: commit = commit *}
+   {* i18n: commitdiff = commitdiff *}
+   {* i18n: tree = tree *}
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}">{$localize.log}</a> | {$localize.commit} | {if $parent}<a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">{$localize.commitdiff}</a> | {/if}<a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}">{$localize.tree}</a>
+   <br /><br />
+ </div>
+ <div>
+   {* Commit header *}
+   {if $parent}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}" class="title">{$title}
+     {if $commitref}
+       <span class="tag">{$commitref}</span>
+     {/if}
+     </a>
+   {else}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}" class="title">{$title}</a>
+   {/if}
+ </div>
+ <div class="title_text">
+   {* Commit data *}
+   <table cellspacing="0">
+     <tr>
+       {* i18n: author = author *}
+       <td>{$localize.author}</td>
+       <td>{$author}</td>
+     </tr>
+     <tr>
+       <td></td>
+       <td> {$adrfc2822} ({if $adhourlocal < 6}<span class="latenight">{/if}{$adhourlocal}:{$adminutelocal}{if $adhourlocal < 6}</span>{/if} {$adtzlocal})</td>
+     </tr>
+     <tr>
+       {* i18n: committer = committer *}
+       <td>{$localize.committer}</td>
+       <td>{$committer}</td>
+     </tr>
+     <tr>
+       <td></td>
+       <td> {$cdrfc2822} ({$cdhourlocal}:{$cdminutelocal} {$cdtzlocal})</td>
+     </tr>
+     <tr>
+       {* i18n: commit = commit *}
+       <td>{$localize.commit}</td>
+       <td class="monospace">{$id}</td>
+     <tr>
+     <tr>
+       {* i18n: tree = tree *}
+       <td>{$localize.tree}</td>
+       <td class="monospace"><a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}" class="list">{$tree}</a></td>
+       {* i18n: snapshot = snapshot *}
+       {* i18n: tree = tree *}
+       <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}">{$localize.tree}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$hash}">{$localize.snapshot}</a></td>
+     </tr>
+     {foreach from=$parents item=par}
+       <tr>
+         {* i18n: parent = parent *}
+         <td>{$localize.parent}</td>
+	 <td class="monospace"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$par}" class="list">{$par}</a></td>
+	 {* i18n: commit = commit *}
+	 {* i18n: commitdiff = commitdiff *}
+         <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$par}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}&hp={$par}">{$localize.commitdiff}</a></td>
+       </tr>
+     {/foreach}
+   </table>
+ </div>
+ <div class="page_body">
+   {foreach from=$comment item=line}
+     {$line}<br />
+   {/foreach}
+ </div>
+ <div class="list_head">
+   {if $difftreesize > 11}
+     {* i18n: fileschanged = %1$d files changed *}
+     {$localize.fileschanged|sprintf:$difftreesize}:
+   {/if}
+ </div>
+ <table cellspacing="0">
+   {* Loop and show files changed *}
+   {section name=difftree loop=$difftreelines}
+     <tr class="{cycle values="light,dark"}">
+	 
+       {if $difftreelines[difftree].status == "A"}
+         <td><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].to_id}&hb={$hash}&f={$difftreelines[difftree].file}" class="list">{$difftreelines[difftree].file}</a></td>
+	 {if $difftreelines[difftree].isreg}
+	   {* i18n: newobjectwithmode = new %1$s with mode: %2$s *}
+           <td><span class="newfile">[{$localize.newobjectwithmode|sprintf:$difftreelines[difftree].to_filetype_localized:$difftreelines[difftree].to_mode_cut}]</span></td>
+	 {else}
+	   {* i18n: newobject = new %1$s *}
+           <td><span class="newfile">[{$localize.newobject|sprintf:$difftreelines[difftree].to_filetype_localized}]</span></td>
+	 {/if}
+	 {* i18n: blob = blob *}
+         <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].to_id}&hb={$hash}&f={$difftreelines[difftree].file}">{$localize.blob}</a></td>
+       {elseif $difftreelines[difftree].status == "D"}
+         <td><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].from_id}&hb={$hash}&f={$difftreelines[difftree].file}" class="list">{$difftreelines[difftree].file}</a></td>
+	 {* i18n: deletedobject = deleted %1$s *}
+         <td><span class="deletedfile">[{$localize.deletedobject|sprintf:$difftreelines[difftree].from_filetype_localized}]</span></td>
+	 {* i18n: blob = blob *}
+	 {* i18n: history = history *}
+         <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].from_id}&hb={$hash}&f={$difftreelines[difftree].file}">{$localize.blob}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=history&h={$hash}&f={$difftreelines[difftree].file}">{$localize.history}</a></td>
+       {elseif $difftreelines[difftree].status == "M" || $difftreelines[difftree].status == "T"}
+         <td>
+           {if $difftreelines[difftree].to_id != $difftreelines[difftree].from_id}
+             <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff&h={$difftreelines[difftree].to_id}&hp={$difftreelines[difftree].from_id}&hb={$hash}&f={$difftreelines[difftree].file}" class="list">{$difftreelines[difftree].file}</a>
+           {else}
+             <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].to_id}&hb={$hash}&f={$difftreelines[difftree].file}" class="list">{$difftreelines[difftree].file}</a>
+           {/if}
+         </td>
+         <td>
+	   {if $difftreelines[difftree].from_mode != $difftreelines[difftree].to_mode}
+	     <span class="changedfile">
+	       {if $difftreelines[difftree].typechange}
+	         {* i18n: changedobjecttype = changed from %1$s to %2$s *}
+	         [{$localize.changedobjecttype|sprintf:$difftreelines[difftree].from_filetype_localized:$difftreelines[difftree].to_filetype_localized}]
+	       {/if}
+	       {if $difftreelines[difftree].modechange}
+	         {* i18n: changedobjectmode = changed mode: %1$s *}
+	         [{$localize.changedobjectmode|sprintf:$difftreelines[difftree].modechange}]
+	       {/if}
+	     </span>
+	   {/if}
+	 </td>
+         <td class="link">
+	   {* i18n: blob = blob *}
+	   {* i18n: diff = diff *}
+	   {* i18n: history = history *}
+           <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].to_id}&hb={$hash}&f={$difftreelines[difftree].file}">{$localize.blob}</a>{if $difftreelines[difftree].to_id != $difftreelines[difftree].from_id} | <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff&h={$difftreelines[difftree].to_id}&hp={$difftreelines[difftree].from_id}&hb={$hash}&f={$difftreelines[difftree].file}">{$localize.diff}</a>{/if} | <a href="{$SCRIPT_NAME}?p={$project}&a=history&h={$hash}&f={$difftreelines[difftree].file}">{$localize.history}</a></td>
+       {elseif $difftreelines[difftree].status == "R"}
+         <td><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].to_id}&hb={$hash}&f={$difftreelines[difftree].to_file}" class="list">{$difftreelines[difftree].to_file}</a></td>
+	 {capture name='oldfile' assign='oldfile'}<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].from_id}&hb={$hash}&f={$difftreelines[difftree].from_file}" class="list">{$difftreelines[difftree].from_file}</a>{/capture}
+         {if $difftreelines[difftree].simmodechg}
+           {* i18n: movedobjectwithsimilaritymodechange = moved from %1$s with %2$d%% similarity, mode: %3$s *}
+           <td><span class="movedfile">[{$localize.movedobjectwithsimilaritymodechange|sprintf:$oldfile:$difftreelines[difftree].similarity:$difftreelines[difftree].simmodechg}]</span></td>
+	 {else}
+           {* i18n: movedobjectwithsimilarity = moved from %1$s with %2$d%% similarity *}
+           <td><span class="movedfile">[{$localize.movedobjectwithsimilarity|sprintf:$oldfile:$difftreelines[difftree].similarity}]</span></td>
+	 {/if}
+	 {* i18n: blob = blob *}
+	 {* i18n: diff = diff *}
+         <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].to_id}&hb={$hash}&f={$difftreelines[difftree].to_file}">{$localize.blob}</a>{if $difftreelines[difftree].to_id != $difftreelines[difftree].from_id} | <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff&h={$difftreelines[difftree].to_id}&hp={$difftreelines[difftree].from_id}&hb={$hash}&f={$difftreelines[difftree].to_file}">{$localize.diff}</a>{/if}</td>
+       {/if}
+
+     </tr>
+   {/section}
+ </table>
+
+ {include file='footer.tpl'}
+
+

--- a/templates/commit_data.tpl
+++ /dev/null
@@ -1,46 +1,1 @@
-{*
- *  commit_data.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Commit view data template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div>
- {if $parent}
-   <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}" class="title">{$title}
-   {if $commitref}
-   <span class="tag">{$commitref}</span>
-   {/if}
-   </a>
- {else}
-   <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}" class="title">{$title}</a>
- {/if}
- </div>
- <div class="title_text">
- <table cellspacing="0">
- <tr><td>author</td><td>{$author}</td></tr>
- <tr><td></td><td> {$adrfc2822} ({if $adhourlocal < 6}<span class="latenight">{/if}{$adhourlocal}:{$adminutelocal}{if $adhourlocal < 6}</span>{/if} {$adtzlocal})
- </td></tr>
- <tr><td>committer</td><td>{$committer}</td></tr>
- <tr><td></td><td> {$cdrfc2822} ({$cdhourlocal}:{$cdminutelocal} {$cdtzlocal})</td></tr>
- <tr><td>commit</td><td class="monospace">{$id}</td><tr>
- <tr><td>tree</td><td class="monospace"><a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}" class="list">{$tree}</a></td>
- <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}">tree</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$hash}">snapshot</a></td></tr>
- {foreach from=$parents item=par}
- <tr><td>parent</td><td class="monospace"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$par}" class="list">{$par}</a></td>
- <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$par}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}&hp={$par}">commitdiff</a></td></tr>
- {/foreach}
- </table>
- </div>
- <div class="page_body">
- {foreach from=$comment item=line}
- {$line}<br />
- {/foreach}
- </div>
- <div class="list_head">
- {if $difftreesize > 11}
-   {$difftreesize} files changed:
- {/if}
- </div>
- <table cellspacing="0">
 

--- a/templates/commit_footer.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  commit_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Commit view footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- </table>
 

--- a/templates/commit_item.tpl
+++ /dev/null
@@ -1,36 +1,1 @@
-{*
- *  commit_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Commit view item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <tr class="{$class}">
- 
- {if $status == "A"}
-  <td><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$to_id}&hb={$hash}&f={$file}" class="list">{$file}</a></td>
-  <td><span class="newfile">[new {$to_filetype}{if $isreg} with mode: {$to_mode_cut}{/if}]</span></td>
-  <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$to_id}&hb={$hash}&f={$file}">blob</a></td>
- {elseif $status == "D"}
-  <td><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$from_id}&hb={$hash}&f={$file}" class="list">{$file}</a></td>
-  <td><span class="deletedfile">[deleted {$from_filetype}]</span></td>
-  <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$from_id}&hb={$hash}&f={$file}">blob</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=history&h={$hash}&f={$file}">history</a></td>
- {elseif $status == "M" || $status == "T"}
-  <td>
-  {if $to_id != $from_id}
-    <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff&h={$to_id}&hp={$from_id}&hb={$hash}&f={$file}" class="list">{$file}</a>
-  {else}
-    <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$to_id}&hb={$hash}&f={$file}" class="list">{$file}</a>
-  {/if}
-  </td>
-  <td>{if $from_mode != $to_mode} <span class="changedfile">[changed{$modechange}]</span>{/if}</td>
-  <td class="link">
-  <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$to_id}&hb={$hash}&f={$file}">blob</a>{if $to_id != $from_id} | <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff&h={$to_id}&hp={$from_id}&hb={$hash}&f={$file}">diff</a>{/if} | <a href="{$SCRIPT_NAME}?p={$project}&a=history&h={$hash}&f={$file}">history</a></td>
- {elseif $status == "R"}
-  <td><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$to_id}&hb={$hash}&f={$to_file}" class="list">{$to_file}</a></td>
-  <td><span class="movedfile">[moved from <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$from_id}&hb={$hash}&f={$from_file}" class="list">{$from_file}</a> with {$similarity}% similarity{$simmodechg}]</span></td>
-  <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$to_id}&hb={$hash}&f={$to_file}">blob</a>{if $to_id != $from_id} | <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff&h={$to_id}&hp={$from_id}&hb={$hash}&f={$to_file}">diff</a>{/if}</td>
- {/if}
 
- </tr>
-

--- a/templates/commit_nav.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  commit_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Commit view nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav">
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}">log</a> | commit | {if $parent}<a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">commitdiff</a> | {/if}<a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}">tree</a>
- <br /><br />
- </div>
 

--- /dev/null
+++ b/templates/commitdiff.tpl
@@ -1,1 +1,58 @@
+{*
+ *  commitdiff.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Commitdiff view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ {* Nav *}
+ <div class="page_nav">
+   {* i18n: summary = summary *}
+   {* i18n: shortlog = shortlog *}
+   {* i18n: log = log *}
+   {* i18n: commit = commit *}
+   {* i18n: commitdiff = commitdiff *}
+   {* i18n: plain = plain *}
+   {* i18n: tree = tree *}
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">{$localize.commit}</a> | {$localize.commitdiff} | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}">{$localize.tree}</a><br /><a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff_plain&h={$hash}&hp={$hashparent}">{$localize.plain}</a>
+ </div>
+ <div>
+   <br /><br />
+ </div>
+ <div>
+   <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}" class="title">{$title}{if $commitref} <span class="tag">{$commitref}</span>{/if}</a>
+ </div>
+ <div class="page_body">
+   {foreach from=$comment item=line}
+     {$line}<br />
+   {/foreach}
+   <br />
+   {* Diff each file changed *}
+   {section name=difftree loop=$difftreelines}
+     {if $difftreelines[difftree].status == "A"}
+       <div class="diff_info">
+         {* i18n: deleted = deleted *}
+         {$difftreelines[difftree].to_type_localized}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].to_id}&hb={$hash}&f={$difftreelines[difftree].file}">{if $difftreelines[difftree].file}{$difftreelines[difftree].file}{else}{$difftreelines[difftree].to_id}{/if}</a>({$localize.new})
+       </div>
+     {elseif $difftreelines[difftree].status == "D"}
+       <div class="diff_info">
+         {* i18n: deleted = deleted *}
+         {$difftreelines[difftree].from_type_localized}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].from_id}&hb={$hash}&f={$difftreelines[difftree].file}">{if $difftreelines[difftree].file}{$difftreelines[difftree].file}{else}{$difftreelines[difftree].from_id}{/if}</a>({$localize.deleted})
+       </div>
+     {elseif $difftreelines[difftree].status == "M"}
+       {if $difftreelines[difftree].from_id != $difftreelines[difftree].to_id}
+         <div class="diff_info">
+	   {$difftreelines[difftree].from_type_localized}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].from_id}&hb={$hash}&f={$difftreelines[difftree].file}">{if $difftreelines[difftree].file}a/{$difftreelines[difftree].file}{else}{$difftreelines[difftree].from_id}{/if}</a> -&gt; {$difftreelines[difftree].to_type_localized}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$difftreelines[difftree].to_id}&hb={$hash}&f={$difftreelines[difftree].file}">{if $difftreelines[difftree].file}b/{$difftreelines[difftree].file}{else}{$difftreelines[difftree].to_id}{/if}</a>
+	 </div>
+       {/if}
+     {/if}
+     {include file='filediff.tpl' diff=$difftreelines[difftree].diffout}
+   {/section}
+ </div>
+
+ {include file='footer.tpl'}
+
+

--- a/templates/commitdiff_footer.tpl
+++ /dev/null
@@ -1,10 +1,1 @@
-{*
- *  commitdiff_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Commitdiff view footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <br />
- </div>
 

--- a/templates/commitdiff_header.tpl
+++ /dev/null
@@ -1,14 +1,1 @@
-{*
- *  commitdiff_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Commitdiff view header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}" class="title">{$title}{if $commitref} <span class="tag">{$commitref}</span>{/if}</a></div>
- <div class="page_body">
- {foreach from=$comment item=line}
- {$line}<br />
- {/foreach}
- <br />
 

--- a/templates/commitdiff_item.tpl
+++ /dev/null
@@ -1,23 +1,1 @@
-{*
- *  commitdiff_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Commitdiff view item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- {if $status == "A"}
-   <div class="diff_info">
-   {$to_type}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$to_id}&hb={$hash}&f={$file}">{if $file}{$file}{else}{$to_id}{/if}</a>(new)
-   </div>
- {elseif $status == "D"}
-   <div class="diff_info">
-   {$from_type}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$from_id}&hb={$hash}&f={$file}">{if $file}{$file}{else}{$from_id}{/if}</a>(deleted)
-   </div>
- {elseif $status == "M"}
-   {if $from_id != $to_id}
-     <div class="diff_info">
-     {$from_type}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$from_id}&hb={$hash}&f={$file}">{if $file}a/{$file}{else}{$from_id}{/if}</a> -&gt; {$to_type}:<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$to_id}&hb={$hash}&f={$file}">{if $file}b/{$file}{else}{$to_id}{/if}</a>
-     </div>
-   {/if}
- {/if}
 

--- a/templates/commitdiff_nav.tpl
+++ /dev/null
@@ -1,13 +1,1 @@
-{*
- *  commitdiff_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Commitdiff view nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav">
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">commit</a> | commitdiff | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}">tree</a><br /><a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff_plain&h={$hash}&hp={$hashparent}">plain</a>
- </div>
- <br /><br />
- </div>
 

file:a/templates/diff_line.tpl (deleted)
--- a/templates/diff_line.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  diff_line.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Diff line template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="pre{if $class} {$class}{/if}">{$line}</div>
 

--- a/templates/diff_plaintext.tpl
+++ b/templates/diff_plaintext.tpl
@@ -18,3 +18,8 @@
 {/foreach}
 ---
 
+
+{foreach from=$diffs item=diffout}
+{$diffout}
+{/foreach}
+

--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -5,17 +5,22 @@
  *
  *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
  *}
-<div class="page_footer">
-{if $project}
-  {if $descr}
-    <div class="page_footer_text">{$descr}</div>
-  {/if}
-  <a href="{$SCRIPT_NAME}?p={$project}&a=rss" class="rss_logo">RSS</a>
-{else}
-  <a href="{$SCRIPT_NAME}?a=opml" class="rss_logo">OPML</a>
-  <a href="{$SCRIPT_NAME}?a=project_index" class="rss_logo">TXT</a>
-{/if}
-</div>
-</body>
+    <div class="page_footer">
+      {if $project}
+        {if $projectdescription}
+          <div class="page_footer_text">{$projectdescription}</div>
+        {/if}
+	{if $validproject}
+	  {* i18n: RSS = RSS *}
+          <a href="{$SCRIPT_NAME}?p={$project}&a=rss" class="rss_logo">{$localize.RSS}</a>
+	{/if}
+      {else}
+        {* i18n: OPML = OPML *}
+        <a href="{$SCRIPT_NAME}?a=opml" class="rss_logo">{$localize.OPML}</a>
+	{* i18n: TXT = TXT *}
+        <a href="{$SCRIPT_NAME}?a=project_index" class="rss_logo">{$localize.TXT}</a>
+      {/if}
+    </div>
+  </body>
 </html>
 

--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -5,48 +5,53 @@
  *
  *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
  *}
-{* $contentType = strpos($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml') === false ? 'text/html' : 'application/xhtml+xml';
-header("Content-Type: $contentType; charset=utf-8"); *}
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<!-- gitphp web interface {$version}, (C) 2006 Christopher Han <xiphux@gmail.com> -->
-<head>
-<title>{$title}</title>
-{if $rss_link}
-<link rel="alternate" title="{$project} log" href="{$SCRIPT_NAME}?p={$project}&a=rss" type="application/rss+xml" />
-{/if}
-<link rel="stylesheet" href="{$stylesheet}" type="text/css" />
-{$smarty.capture.header}
-</head>
-<body>
-<div class="page_header">
-<a href="http://www.kernel.org/pub/software/scm/git/docs/" title="git documentation">
-<img src="git-logo.png" width="72" height="27" alt="git" class="logo" />
-</a>
-<a href="index.php">projects</a> / 
-{if $project}
-  <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$project}</a>
-  {if $action}
-    / {$action}
-  {/if}
-  {if $enablesearch}
-<form method="get" action="index.php" enctype="application/x-www-form-urlencoded">
-<div class="search">
-<input type="hidden" name="p" value="{$project}" />
-<input type="hidden" name="a" value="search" />
-<input type="hidden" name="h" value="{if $hash}{$hash}{else}HEAD{/if}" />
-<select name="st">
-<option {if $searchtype == 'commit'}selected="selected"{/if} value="commit">commit</option>
-<option {if $searchtype == 'author'}selected="selected"{/if} value="author">author</option>
-<option {if $searchtype == 'committer'}selected="selected"{/if} value="committer">committer</option>
-{if $filesearch}
-<option {if $searchtype == 'file'}selected="selected"{/if} value="file">file</option>
-{/if}
-</select> search: <input type="text" name="s" {if $search}value="{$search}"{/if} />
-</div>
-</form>
-  {/if}
-{/if}
-</div>
+  <!-- gitphp web interface {$version}, (C) 2006 Christopher Han <xiphux@gmail.com> -->
+  <head>
+    <title>{$pagetitle}{if $project && $validproject} :: {$project}{if $action && $validaction}/{$localize.$action}{/if}{/if}</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    {if $validproject}
+      <link rel="alternate" title="{$project} log" href="{$SCRIPT_NAME}?p={$project}&a=rss" type="application/rss+xml" />
+    {/if}
+    <link rel="stylesheet" href="{$stylesheet}" type="text/css" />
+    {$smarty.capture.header}
+  </head>
+  <body>
+    <div class="page_header">
+      <a href="http://www.kernel.org/pub/software/scm/git/docs/" title="git documentation">
+        <img src="git-logo.png" width="72" height="27" alt="git" class="logo" />
+      </a>
+      {* i18n: projects = projects *}
+      <a href="index.php">{$localize.projects}</a> / 
+      {if $project && $validproject}
+        <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$project}</a>
+        {if $action && $validaction}
+           / {$localize.$action}
+        {/if}
+        {if $enablesearch}
+          <form method="get" action="index.php" enctype="application/x-www-form-urlencoded">
+            <div class="search">
+              <input type="hidden" name="p" value="{$project}" />
+              <input type="hidden" name="a" value="search" />
+              <input type ="hidden" name="h" value="{if $currentsearchhash}{$currentsearchhash}{else}HEAD{/if}" />
+              <select name="st">
+	        {* i18n: commit = commit *}
+                <option {if $currentsearchtype == 'commit'}selected="selected"{/if} value="commit">{$localize.commit}</option>
+                {* i18n: author = author *}
+                <option {if $currentsearchtype == 'author'}selected="selected"{/if} value="author">{$localize.author}</option>
+                {* i18n: committer = committer *}
+                <option {if $currentsearchtype == 'committer'}selected="selected"{/if} value="committer">{$localize.committer}</option>
+                {if $filesearch}
+		  {* i18n: file = file *}
+                  <option {if $currentsearchtype == 'file'}selected="selected"{/if} value="file">{$localize.file}</option>
+                {/if}
+		{* i18n: search = search *}
+              </select> {$localize.search}: <input type="text" name="s" {if $currentsearch}value="{$currentsearch}"{/if} />
+            </div>
+          </form>
+        {/if}
+      {/if}
+    </div>
 

--- /dev/null
+++ b/templates/heads.tpl
@@ -1,1 +1,41 @@
+{*
+ *  heads.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Head view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ {* Nav *}
+ <div class="page_nav">
+   {* i18n: summary = summary *}
+   {* i18n: shortlog = shortlog *}
+   {* i18n: log = log *}
+   {* i18n: commit = commit *}
+   {* i18n: commitdiff = commitdiff *}
+   {* i18n: tree = tree *}
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$head}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$head}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$head}">{$localize.tree}</a>
+   <br /><br />
+ </div>
+ <div>
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary" class="title">&nbsp;</a>
+ </div>
+ <table cellspacing="0">
+   {* Loop and display each head *}
+   {foreach from=$headlist item=head}
+     <tr class="{cycle values="light,dark"}">
+       <td><i>{$head.age}</i></td>
+       <td><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/heads/{$head.name}" class="list"><b>{$head.name}</b></a></td>
+       {* i18n: shortlog = shortlog *}
+       {* i18n: log = log *}
+       {* i18n: tree = tree *}
+       <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/heads/{$head.name}">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h=refs/heads/{$head.name}">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h=refs/heads/{$head.name}&hb={$head.name}">{$localize.tree}</a></td>
+     </tr>
+   {/foreach}
+ </table>
+
+ {include file='footer.tpl'}
+
+

--- a/templates/heads_footer.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  heads_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Head view footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- </table>
 

--- a/templates/heads_header.tpl
+++ /dev/null
@@ -1,10 +1,1 @@
-{*
- *  heads_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Head view header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div><a href="{$SCRIPT_NAME}?p={$project}&a=summary" class="title">&nbsp;</a></div>
- <table cellspacing="0">
 

--- a/templates/heads_item.tpl
+++ /dev/null
@@ -1,13 +1,1 @@
-{*
- *  heads_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Head view item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <tr class="{$class}">
- <td><i>{$age}</i></td>
- <td><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/heads/{$name}" class="list"><b>{$name}</b></a></td>
- <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/heads/{$name}">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h=refs/heads/{$name}">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h=refs/heads/{$name}&hb={$name}">tree</a></td>
- </tr>
 

file:a/templates/heads_nav.tpl (deleted)
--- a/templates/heads_nav.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  heads_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Head view nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav">
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$head}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$head}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$head}">tree</a>
- <br /><br />
- </div>
 

--- /dev/null
+++ b/templates/history.tpl
@@ -1,1 +1,61 @@
+{*
+ *  history.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: History view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ {* Page header *}
+ <div class="page_nav">
+   {* i18n: summary = summary *}
+   {* i18n: shortlog = shortlog *}
+   {* i18n: log = log *}
+   {* i18n: commit = commit *}
+   {* i18n: commitdiff = commitdiff *}
+   {* i18n: tree = tree *}
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}">{$localize.tree}</a>
+   <br /><br />
+ </div>
+ <div>
+   <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}" class="title">{$title}
+   {if $hashbaseref}
+     <span class="tag">{$hashbaseref}</span>
+   {/if}
+   </a>
+ </div>
+ <div class="page_path">
+   {* File path *}
+   <b>
+     <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$hash}&h={$hash}">[{$project}]</a> / 
+     {foreach from=$paths item=path name=paths}
+       {if $smarty.foreach.paths.last}
+         <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$path.tree}&f={$path.full}">{$path.short}</a>
+       {else}
+         <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$hash}&h={$path.tree}&f={$path.full}">{$path.short}</a> / 
+       {/if}
+     {/foreach}
+   </b>
+ </div>
+ <table cellspacing="0">
+   {* Display each history line *}
+   {section name=history loop=$historylines}
+     <tr class="{cycle values="light,dark"}">
+       <td title="{$historylines[history].agestringage}"><i>{$historylines[history].agestringdate}</i></td>
+       <td><i>{$historylines[history].authorname}</i></td>
+       <td><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$historylines[history].commit}" class="list"><b>{$historylines[history].title}{if $historylines[history].commitref} <span class="tag">{$historylines[history].commitref}</span>{/if}</b></a></td>
+       {* i18n: difftocurrent = diff to current *}
+       {* i18n: blob = blob *}
+       {* i18n: commit = commit *}
+       {* i18n: commitdiff = commitdiff *}
+       <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$historylines[history].commit}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$historylines[history].commit}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=blob&hb={$historylines[history].commit}&f={$historylines[history].file}">{$localize.blob}</a>{if $historylines[history].blob && $historylines[history].blobparent} | <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff&h={$historylines[history].blob}&hp={$historylines[history].blobparent}&hb={$historylines[history].commit}&f={$historylines[history].file}">{$localize.difftocurrent}</a>{/if}
+       </td>
+     </tr>
+   {/section}
+ </table>
+
+ {include file='footer.tpl'}
+
+

--- a/templates/history_footer.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  history_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: History view footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- </table>
 

--- a/templates/history_header.tpl
+++ /dev/null
@@ -1,16 +1,1 @@
-{*
- *  history_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: History view header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}" class="title">{$title}
- {if $hashbaseref}
- <span class="tag">{$hashbaseref}</span>
- {/if}
- </a>
- </div>
- <div class="page_path"><b><a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$hash}&h={$hash}">[{$project}]</a> / {foreach from=$paths item=path name=paths}{if $smarty.foreach.paths.last}<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$path.tree}&f={$path.full}">{$path.short}</a>{else}<a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$hash}&h={$path.tree}&f={$path.full}">{$path.short}</a> / {/if}{/foreach}</b></div>
- <table cellspacing="0">
 

--- a/templates/history_item.tpl
+++ /dev/null
@@ -1,14 +1,1 @@
-{*
- *  history_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: History view item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <tr class="{$class}">
- <td title="{$agestringage}"><i>{$agestringdate}</i></td>
- <td><i>{$authorname}</i></td>
- <td><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}" class="list"><b>{$title}{if $commitref} <span class="tag">{$commitref}</span>{/if}</b></a></td>
- <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$commit}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=blob&hb={$commit}&f={$file}">blob</a>{if $difftocurrent} | <a href="{$SCRIPT_NAME}?p={$project}&a=blobdiff&h={$blob}&hp={$blobparent}&hb={$commit}&f={$file}">diff to current</a>{/if}
- </td></tr>
 

--- a/templates/history_nav.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  history_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: History view nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav">
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$tree}&hb={$hash}">tree</a>
- <br /><br />
- </div>
 

file:b/templates/log.tpl (new)
--- /dev/null
+++ b/templates/log.tpl
@@ -1,1 +1,83 @@
+{*
+ *  log.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Log view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ {* Nav *}
+ <div class="page_nav">
+   {* i18n: summary = summary *}
+   {* i18n: shortlog = shortlog *}
+   {* i18n: log = log *}
+   {* i18n: commit = commit *}
+   {* i18n: commitdiff = commitdiff *}
+   {* i18n: tree = tree *}
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}">{$localize.shortlog}</a> | {$localize.log} | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$hash}&hb={$hash}">{$localize.tree}</a>
+   <br />
+   {* i18n: HEAD = HEAD *}
+   {if ($hash != $head) || $page}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=log">{$localize.HEAD}</a>
+   {else}
+     {$localize.HEAD}
+   {/if}
+   &sdot; 
+   {* i18n: prev = prev *}
+   {if $page > 0}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}&pg={$page-1}" accesskey="p" title="Alt-p">{$localize.prev}</a>
+   {else}
+     {$localize.prev}
+   {/if}
+   &sdot; 
+   {* i18n: next = next *}
+   {if $revlistcount > 100}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}&pg={$page+1}" accesskey="n" title="Alt-n">{$localize.next}</a>
+   {else}
+     {$localize.next}
+   {/if}
+   <br />
+ </div>
+ {if $norevlist}
+   <div>
+     <a href="{$SCRIPT_NAME}?p={$project}&a=summary" class="title">&nbsp</a>
+   </div>
+   <div class="page_body">
+     Last change {$lastchange}.
+     <br /><br />
+   </div>
+ {/if}
+ {* Display each commit *}
+ {section name=log loop=$commitlines}
+   <div>
+     <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commitlines[log].commit}" class="title"><span class="age">{$commitlines[log].agestring}</span>{$commitlines[log].title}
+       {if $commitlines[log].commitref}
+         <span class="tag">{$commitlines[log].commitref}</span>
+       {/if}
+     </a>
+   </div>
+   <div class="title_text">
+     <div class="log_link">
+       {* i18n: tree = tree *}
+       {* i18n: commit = commit *}
+       {* i18n: commitdiff = commitdiff *}
+       <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commitlines[log].commit}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$commitlines[log].commit}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$commitlines[log].commit}&hb={$commitlines[log].commit}">{$localize.tree}</a>
+       <br />
+     </div>
+     <i>{$commitlines[log].authorname} [{$commitlines[log].rfc2822}]</i><br />
+   </div>
+   <div class="log_body">
+     {foreach from=$commitlines[log].comment item=line}
+       {$line}<br />
+     {/foreach}
+     {if count($commitlines[log].comment) > 0}
+       <br />
+     {/if}
+   </div>
+ {/section}
+
+ {include file='footer.tpl'}
+
+

file:a/templates/log_info.tpl (deleted)
--- a/templates/log_info.tpl
+++ /dev/null
@@ -1,13 +1,1 @@
-{*
- *  log_info.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Log view info template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div>
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary" class="title">&nbsp</a>
- </div>
- <div class="page_body"> Last change {$agestring}.<br /><br />
- </div>
 

file:a/templates/log_item.tpl (deleted)
--- a/templates/log_item.tpl
+++ /dev/null
@@ -1,30 +1,1 @@
-{*
- *  log_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Log view item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div>
- <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}" class="title"><span class="age">{$agestring}</span>{$title}
- {if $commitref}
-  <span class="tag">{$commitref}</span>
- {/if}
- </a>
- </div>
- <div class="title_text">
- <div class="log_link">
- <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$commit}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$commit}&hb={$commit}">tree</a>
- <br />
- </div>
- <i>{$authorname} [{$rfc2822}]</i><br />
- </div>
- <div class="log_body">
- {foreach from=$comment item=line}
- {$line}<br />
- {/foreach}
- {if $notempty}
- <br />
- {/if}
- </div>
 

file:a/templates/log_nav.tpl (deleted)
--- a/templates/log_nav.tpl
+++ /dev/null
@@ -1,11 +1,1 @@
-{*
- *  log_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Log view nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav">
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}">shortlog</a> | log | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$hash}&hb={$hash}">tree</a>
- <br />
 

--- a/templates/log_pagenav.tpl
+++ /dev/null
@@ -1,11 +1,1 @@
-{*
- *  log_pagenav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Log view page nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- {if $headlink}<a href="{$SCRIPT_NAME}?p={$project}&a=log">{/if}HEAD{if $headlink}</a>{/if} &sdot; {if $prevlink}<a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}&pg={$prevpage}" accesskey="p" title="Alt-p">{/if}prev{if $prevlink}</a>{/if} &sdot; {if $nextlink}<a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}&pg={$nextpage}" accesskey="n" title="Alt-n">{/if}next{if $nextlink}</a>{/if}
- <br />
- </div>
 

--- a/templates/message.tpl
+++ b/templates/message.tpl
@@ -1,9 +1,18 @@
 {*
- *  error.tpl
+ *  message.tpl
  *  gitphp: A PHP git repository browser
- *  Component: Error message template
+ *  Component: Warning/error message template
  *
  *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
  *}
+
+{if $standalone}
+  {include file='header.tpl'}
+{/if}
+
 <div class="message {if $error}error{/if}">{$message}</div>
 
+{if $standalone}
+  {include file='footer.tpl'}
+{/if}
+

--- /dev/null
+++ b/templates/opml.tpl
@@ -1,1 +1,23 @@
+{*
+ *  opml.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: OPML template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
+<?xml version="1.0" encoding="utf-8"?>
+<opml version="1.0">
+  <head>
+    <title>{$title} OPML Export</title>
+  </head>
+  <body>
+    <outline text="git RSS feeds">
 
+      {foreach from=$opmllist item=proj}
+      <outline type="rss" text="{$proj}" title="{$proj}" xmlUrl="{$self}?p={$proj}&amp;a=rss" htmlUrl="{$self}?p={$proj}&amp;a=summary" />
+
+      {/foreach}
+    </outline>
+  </body>
+</opml>
+

--- a/templates/opml_footer.tpl
+++ /dev/null
@@ -1,11 +1,1 @@
-{*
- *  opml_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: OPML footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- </outline>
- </body>
- </opml>
 

--- a/templates/opml_header.tpl
+++ /dev/null
@@ -1,16 +1,1 @@
-{*
- *  opml_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: OPML header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
-<?xml version="1.0" encoding="utf-8"?>
-<opml version="1.0">
-<head>
-  <title>{$title} OPML Export</title>
-</head>
-<body>
-<outline text="git RSS feeds">
 
-

file:a/templates/opml_item.tpl (deleted)
--- a/templates/opml_item.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  opml_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: OPML item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
-<outline type="rss" text="{$proj}" title="{$proj}" xmlUrl="{$self}?p={$proj}&amp;a=rss" htmlUrl="{$self}?p={$proj}&amp;a=summary"/>
 

--- /dev/null
+++ b/templates/project.tpl
@@ -1,1 +1,123 @@
+{*
+ *  project.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Project summary template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ {* Nav *}
+ <div class="page_nav">
+   {* i18n: summary = summary *}
+   {* i18n: shortlog = shortlog *}
+   {* i18n: log = log *}
+   {* i18n: commit = commit *}
+   {* i18n: commitdiff = commitdiff *}
+   {* i18n: tree = tree *}
+   {$localize.summary} | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$head}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$head}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree">{$localize.tree}</a>
+   <br /><br />
+ </div>
+ <div class="title">&nbsp;</div>
+ {* Project brief *}
+ <table cellspacing="0">
+   {* i18n: description = description *}
+   {* i18n: owner = owner *}
+   {* i18n: lastchange = last change *}
+   <tr><td>{$localize.description}</td><td>{$description}</td></tr>
+   <tr><td>{$localize.owner}</td><td>{$owner}</td></tr>
+   <tr><td>{$localize.lastchange}</td><td>{$lastchange}</td></tr>
+ </table>
+ <div>
+   {* i18n: shortlog = shortlog *}
+   <a class="title" href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{$localize.shortlog}</a>
+ </div>
+ <table cellspacing="0">
+   {* Recent revisions *}
+   {section name=rev max=17 loop=$revlist}
+     {if $smarty.section.rev.index == 16}
+       <tr class="light">
+         <td><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">...</a></td>
+       </tr>
+     {else}
+         <tr class="{cycle name=revs values="light,dark"}">
+         <td><i>{$revlist[rev].commitage}</i></td>
+         <td><i>{$revlist[rev].commitauthor}</i></td>
+         <td>
+           <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$revlist[rev].commit}" class="list" {if $revlist[rev].title}title="{$revlist[rev].title}"{/if}><b>{$revlist[rev].title_short}
+             {if $revlist[rev].commitref}
+               <span class="tag">{$revlist[rev].commitref}</span>
+             {/if}
+           </b></a>
+         </td>
+	 {* i18n: snapshot = snapshot *}
+	 {* i18n: tree = tree *}
+	 {* i18n: commit = commit *}
+	 {* i18n: commitdiff = commitdiff *}
+         <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$revlist[rev].commit}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$revlist[rev].commit}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$revlist[rev].commit}&hb={$revlist[rev].commit}">{$localize.tree}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$revlist[rev].commit}">{$localize.snapshot}</a></td>
+       </tr>
+     {/if}
+   {/section}
+ </table>
+ {if $taglist}
+   {* Tags *}
+   <div>
+     {* i18n: tags = tags *}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=tags" class="title">{$localize.tags}</a>
+   </div>
+   <table cellspacing="0">
+     {section name=tag max=17 loop=$taglist}
+       <tr class="{cycle name=tags values="light,dark"}">
+         {if $smarty.section.tag.index == 16}
+           <td><a href="{$SCRIPT_NAME}?p={$project}&a=tags">...</a></td>
+         {else}
+           <td><i>{$taglist[tag].age}</i></td>
+           <td><a href="{$SCRIPT_NAME}?p={$project}&a={$taglist[tag].reftype}&h={$taglist[tag].refid}" class="list"><b>{$taglist[tag].name}</b></a></td>
+           <td>
+             {if $taglist[tag].comment}
+               <a class="list" href="{$SCRIPT_NAME}?p={$project}&a=tag&h={$taglist[tag].id}">{$taglist[tag].comment}</a>
+             {/if}
+           </td>
+           <td class="link">
+             {if $taglist[tag].type == "tag"}
+	       {* i18n: tag = tag *}
+   	       <a href="{$SCRIPT_NAME}?p={$project}&a=tag&h={$taglist[tag].id}">{$localize.tag}</a> | 
+             {/if}
+	     {* i18n: shortlog = shortlog *}
+	     {* i18n: log = log *}
+	     {* i18n: snapshot = snapshot *}
+             <a href="{$SCRIPT_NAME}?p={$project}&a={$taglist[tag].reftype}&h={$taglist[tag].refid}">{$taglist[tag].reftype_localized}</a>{if $taglist[tag].reftype == "commit"} | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/tags/{$taglist[tag].name}">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h=refs/tags/{$taglist[tag].name}">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$taglist[tag].refid}">{$localize.snapshot}</a>{/if}
+           </td>
+         {/if}
+       </tr>
+     {/section}
+   </table>
+ {/if}
+ {if $headlist}
+   {* Heads *}
+   <div>
+     {* i18n: heads = heads *}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=heads" class="title">{$localize.heads}</a>
+   </div>
+   <table cellspacing="0">
+     {section name=head max=17 loop=$headlist}
+       <tr class="{cycle name=heads values="light,dark"}">
+         {if $smarty.section.head.index == 16}
+           <td><a href="{$SCRIPT_NAME}?p={$project}&a=heads">...</a></td>
+         {else}
+           <td><i>{$headlist[head].age}</i></td>
+           <td><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/heads/{$headlist[head].name}" class="list"><b>{$headlist[head].name}</b></td>
+	   {* i18n: shortlog = shortlog *}
+	   {* i18n: log = log *}
+	   {* i18n: tree = tree *}
+           <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/heads/{$headlist[head].name}">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h=refs/heads/{$headlist[head].name}">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h=refs/heads/{$headlist[head].name}&hb={$headlist[head].name}">{$localize.tree}</a></td>
+         {/if}
+       </tr>
+     {/section}
+   </table>
+ {/if}
+
+ {include file='footer.tpl'}
+
+

--- a/templates/project_brief.tpl
+++ /dev/null
@@ -1,14 +1,1 @@
-{*
- *  project_brief.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project brief info template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="title">&nbsp;</div>
- <table cellspacing="0">
- <tr><td>description</td><td>{$description}</td></tr>
- <tr><td>owner</td><td>{$owner}</td></tr>
- <tr><td>last change</td><td>{$lastchange}</td></tr>
- </table>
 

--- a/templates/project_headlist_footer.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  project_headlist_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project head list footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- </table>
 

--- a/templates/project_headlist_header.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  project_headlist_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project head list header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div>
- <a href="{$SCRIPT_NAME}?p={$project}&a=heads" class="title">heads</a>
- </div>
- <table cellspacing="0">
 

--- a/templates/project_headlist_item.tpl
+++ /dev/null
@@ -1,17 +1,1 @@
-{*
- *  project_headlist_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project head list item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <tr class="{$class}">
- {if $truncate}
-   <td><a href="{$SCRIPT_NAME}?p={$project}&a=heads">...</a></td>
- {else}
-   <td><i>{$headage}</i></td>
-   <td><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/heads/{$headname}" class="list"><b>{$headname}</b></td>
-   <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/heads/{$headname}">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h=refs/heads/{$headname}">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h=refs/heads/{$headname}&hb={$headname}">tree</a></td>
- {/if}
- </tr>
 

--- a/templates/project_nav.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  project_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project navbar template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav">
- summary | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$head}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$head}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree">tree</a>
- <br /><br />
- </div>
 

--- a/templates/project_revlist_footer.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  project_revlist_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project revision list footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- </table>
 

--- a/templates/project_revlist_header.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  project_revlist_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project revision list header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div>
- <a class="title" href="{$SCRIPT_NAME}?p={$project}&a=shortlog">shortlog</a>
- </div>
- <table cellspacing="0">
 

--- a/templates/project_revlist_item.tpl
+++ /dev/null
@@ -1,25 +1,1 @@
-{*
- *  project_revlist_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project revision list item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- {if $truncate}
- <tr class="light">
-  <td><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">...</td>
- {else}
- <tr class="{$class}">
-  <td><i>{$commitage}</i></td>
-  <td><i>{$commitauthor}</i></td>
-  <td>
-  <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}" class="list" {if $title}title="{$title}"{/if}><b>{$title_short}
-  {if $commitref}
-  <span class="tag">{$commitref}</span>
-  {/if}
-  </b>
-  </td>
-  <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$commit}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$commit}&hb={$commit}">tree</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$commit}">snapshot</a></td>
-  </tr>
- {/if}
 

--- a/templates/project_taglist_footer.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  project_taglist_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project tag list footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- </table>
 

--- a/templates/project_taglist_header.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  project_taglist_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project tag list header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div>
- <a href="{$SCRIPT_NAME}?p={$project}&a=tags" class="title">tags</a>
- </div>
- <table cellspacing="0">
 

--- a/templates/project_taglist_item.tpl
+++ /dev/null
@@ -1,27 +1,1 @@
-{*
- *  project_taglist_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project tag list item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <tr class="{$class}">
- {if $truncate}
-   <td><a href="{$SCRIPT_NAME}?p={$project}&a=tags">...</a></td>
- {else}
-   <td><i>{$tagage}</i></td>
-   <td><a href="{$SCRIPT_NAME}?p={$project}&a={$reftype}&h={$refid}" class="list"><b>{$tagname}</b></a></td>
-   <td>
-   {if $comment}
-     <a class="list" href="{$SCRIPT_NAME}?p={$project}&a=tag&h={$tagid}">{$comment}</a>
-   {/if}
-   </td>
-   <td class="link">
-   {if $tagtype == "tag"}
-   	<a href="{$SCRIPT_NAME}?p={$project}&a=tag&h={$tagid}">tag</a> | 
-   {/if}
-   <a href="{$SCRIPT_NAME}?p={$project}&a={$reftype}&h={$refid}">{$reftype}</a>{if $reftype == "commit"} | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/tags/{$tagname}">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h=refs/tags/{$tagname}">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$refid}">snapshot</a>{/if}
-   </td>
- {/if}
- </tr>
 

--- /dev/null
+++ b/templates/projectlist.tpl
@@ -1,1 +1,122 @@
+{*
+ *  projectlist.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Project list template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+{include file='header.tpl'}
+
+{include file='hometext.tpl'}
+
+{if $message}
+  {* Something is wrong; display an error message instead of trying to list *}
+  {include file='message.tpl'}
+{else}
+  <table cellspacing="0">
+    {* Header *}
+    <tr>
+      {* i18n: headerproject = Project *}
+      {if $order == "project"}
+        <th>{$localize.headerproject}</th>
+      {else}
+        <th><a class="header" href="{$SCRIPT_NAME}?o=project">{$localize.headerproject}</a></th>
+      {/if}
+      {* i18n: headerdescription = Description *}
+      {if $order == "descr"}
+        <th>{$localize.headerdescription}</th>
+      {else}
+        <th><a class="header" href="{$SCRIPT_NAME}?o=descr">{$localize.headerdescription}</a></th>
+      {/if}
+      {* i18n: headerowner = Owner *}
+      {if $order == "owner"}
+        <th>{$localize.headerowner}</th>
+      {else}
+        <th><a class="header" href="{$SCRIPT_NAME}?o=owner">{$localize.headerowner}</a></th>
+      {/if}
+      {* i18n: headerlastchange = Last Change *}
+      {if $order == "age"}
+        <th>{$localize.headerlastchange}</th>
+      {else}
+        <th><a class="header" href="{$SCRIPT_NAME}?o=age">{$localize.headerlastchange}</a></th>
+      {/if}
+      {* i18n: headeractions = Actions *}
+      <th>{$localize.headeractions}</th>
+    </tr>
+
+    {if $categorizedprojects}
+      {* Show categorized; categorized project lists nested associatively in the project
+         list by category key *}
+      {foreach from=$categorizedprojects key=categ item=plist}
+        {if $categ != "none"}
+          <tr>
+            <th>{$categ}</th>
+            <th></th>
+            <th></th>
+            <th></th>
+            <th></th>
+          </tr>
+	{/if}
+        {section name=proj loop=$plist}
+          <tr class="{cycle values="light,dark"}">
+            <td>
+              <a href="{$SCRIPT_NAME}?p={$plist[proj].project}&a=summary" class="list {if $categ != "none"}indent{/if}">{$plist[proj].project}</a>
+            </td>
+            <td>{$plist[proj].descr}</td>
+            <td><i>{$plist[proj].owner}</i></td>
+            <td>
+              {if $plist[proj].age < 7200}   {* 60*60*2, or 2 hours *}
+                <span class="agehighlight"><b><i>{$plist[proj].age_string}</i></b></span>
+	      {elseif $plist[proj].age < 172800}   {* 60*60*24*2, or 2 days *}
+                <span class="agehighlight"><i>{$plist[proj].age_string}</i></span>
+              {else}
+                <i>{$plist[proj].age_string}</i>
+              {/if}
+            </td>
+	    {* i18n: summary = summary *}
+	    {* i18n: shortlog = shortlog *}
+	    {* i18n: log = log *}
+	    {* i18n: snapshot = snapshot *}
+	    {* i18n: tree = tree *}
+            <td class="link"><a href="{$SCRIPT_NAME}?p={$plist[proj].project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$plist[proj].project}&a=shortlog">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$plist[proj].project}&a=log">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$plist[proj].project}&a=tree">{$localize.tree}</a> | <a href="{$SCRIPT_NAME}?p={$plist[proj].project}&a=snapshot&h=HEAD">{$localize.snapshot}</a></td>
+          </tr>
+        {/section}
+      {/foreach}
+
+    {else}
+      
+      {* Show flat uncategorized project array *}
+      {section name=proj loop=$projects}
+        <tr class="{cycle values="light,dark"}">
+          <td>
+            <a href="{$SCRIPT_NAME}?p={$projects[proj].project}&a=summary" class="list">{$projects[proj].project}</a>
+          </td>
+          <td>{$projects[proj].descr}</td>
+          <td><i>{$projects[proj].owner}</i></td>
+          <td>
+            {if $projects[proj].age < 7200}   {* 60*60*2, or 2 hours *}
+              <span class="agehighlight"><b><i>{$projects[proj].age_string}</i></b></span>
+	    {elseif $projects[proj].age < 172800}   {* 60*60*24*2, or 2 days *}
+              <span class="agehighlight"><i>{$projects[proj].age_string}</i></span>
+	    {else}
+              <i>{$projects[proj].age_string}</i>
+            {/if}
+          </td>
+	  {* i18n: summary = summary *}
+	  {* i18n: shortlog = shortlog *}
+	  {* i18n: log = log *}
+	  {* i18n: snapshot = snapshot *}
+	  {* i18n: tree = tree *}
+          <td class="link"><a href="{$SCRIPT_NAME}?p={$projects[proj].project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$projects[proj].project}&a=shortlog">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$projects[proj].project}&a=log">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$projects[proj].project}&a=tree">{$localize.tree}</a> | <a href="{$SCRIPT_NAME}?p={$projects[proj].project}&a=snapshot&h=HEAD">{$localize.snapshot}</a></td>
+        </tr>
+      {/section}
+
+    {/if}
+
+  </table>
+{/if}
+
+{include file='footer.tpl'}
+
+

--- a/templates/projlist_category.tpl
+++ /dev/null
@@ -1,15 +1,1 @@
-{*
- *  projlist_category.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project list category template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
-<tr>
-<th>{$category}</th>
-<th></th>
-<th></th>
-<th></th>
-<th></th>
-</tr>
 

--- a/templates/projlist_footer.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  projlist_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project list footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
-</table>
 

--- a/templates/projlist_header.tpl
+++ /dev/null
@@ -1,32 +1,1 @@
-{*
- *  projlist_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project list header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
-<table cellspacing="0">
-<tr>
-{if $order == "project"}
-<th>Project</th>
-{else}
-<th><a class="header" href="{$SCRIPT_NAME}?o=project">Project</a></th>
-{/if}
-{if $order == "descr"}
-<th>Description</th>
-{else}
-<th><a class="header" href="{$SCRIPT_NAME}?o=descr">Description</a></th>
-{/if}
-{if $order == "owner"}
-<th>Owner</th>
-{else}
-<th><a class="header" href="{$SCRIPT_NAME}?o=owner">Owner</a></th>
-{/if}
-{if $order == "age"}
-<th>Last Change</th>
-{else}
-<th><a class="header" href="{$SCRIPT_NAME}?o=age">Last Change</a></th>
-{/if}
-<th>Actions</th>
-</tr>
 

--- a/templates/projlist_item.tpl
+++ /dev/null
@@ -1,33 +1,1 @@
-{*
- *  projlist_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Project list item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
-<tr class="{$class}">
-<td>
-{if $idt}<span class="respectwhitespace">  {/if}<a href="{$SCRIPT_NAME}?p={$project}&a=summary" class="list">{$project}</a>{if $idt}</span>{/if}
-</td>
-<td>{$descr}</td>
-<td><i>{$owner}</i></td>
-<td>
-{if $age_colored}
-<span class="agehighlight">
-{/if}
-{if $age_bold}
-<b>
-{/if}
-<i>
-{$age_string}
-</i>
-{if $age_bold}
-</b>
-{/if}
-{if $age_colored}
-</span>
-{/if}
-</td>
-<td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree">tree</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h=HEAD">snapshot</a></td>
-</tr>
 

file:b/templates/rss.tpl (new)
--- /dev/null
+++ b/templates/rss.tpl
@@ -1,1 +1,39 @@
+{*
+ *  rss.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: RSS template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
+  <channel>
+    <title>{$project}</title>
+    <link>{$self}?p={$project}&amp;a=summary</link>
+    <description>{$project} log</description>
+    <language>en</language>
 
+    {section name=rssitem loop=$commitlines}
+      <item>
+        <title>{$commitlines[rssitem].cdmday} {$commitlines[rssitem].cdmonth} {$commitlines[rssitem].cdhour}:{$commitlines[rssitem].cdminute} - {$commitlines[rssitem].title|escape:'htmlall'}</title>
+        <author>{$commitlines[rssitem].author|escape:'htmlall'}</author>
+        <pubDate>{$commitlines[rssitem].cdrfc2822}</pubDate>
+        <guid isPermaLink="true">{$self}?p={$project}&amp;a=commit&amp;h={$commitlines[rssitem].commit}</guid>
+        <link>{$self}?p={$project}&amp;a=commit&amp;h={$commitlines[rssitem].commit}</link>
+        <description>{$commitlines[rssitem].title|escape:'htmlall'}</description>
+        <content:encoded>
+          <![CDATA[
+          {foreach from=$commitlines[rssitem].comment item=line}
+            {$line}<br />
+          {/foreach}
+          {foreach from=$commitlines[rssitem].difftree item=line}
+            {$line}<br />
+          {/foreach}
+          ]]>
+        </content:encoded>
+      </item>
+    {/section}
+
+  </channel>
+</rss>
+

--- a/templates/rss_footer.tpl
+++ /dev/null
@@ -1,10 +1,1 @@
-{*
- *  rss_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: RSS footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
-</channel>
-</rss>
 

--- a/templates/rss_header.tpl
+++ /dev/null
@@ -1,15 +1,1 @@
-{*
- *  rss_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: RSS header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
-<?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
-<channel>
-<title>{$project}</title>
-<link>{$self}?p={$project}&amp;a=summary</link>
-<description>{$project} log</description>
-<language>en</language>
 

file:a/templates/rss_item.tpl (deleted)
--- a/templates/rss_item.tpl
+++ /dev/null
@@ -1,26 +1,1 @@
-{*
- *  rss_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: RSS item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
-<item>
-<title>{$cdmday} {$cdmonth} {$cdhour}:{$cdminute} - {$title}</title>
-<author>{$author}</author>
-<pubDate>{$cdrfc2822}</pubDate>
-<guid isPermaLink="true">{$self}?p={$project}&amp;a=commit&amp;h={$commit}</guid>
-<link>{$self}?p={$project}&amp;a=commit&amp;h={$commit}</link>
-<description>{$title}</description>
-<content:encoded>
-<![CDATA[
-{foreach from=$comment item=line}
-{$line}<br />
-{/foreach}
-{foreach from=$difftree item=line}
-{$line}<br />
-{/foreach}
-]]>
-</content:encoded>
-</item>
 

--- /dev/null
+++ b/templates/search.tpl
@@ -1,1 +1,76 @@
+{*
+ *  search.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Search view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+{include file='header.tpl'}
+
+{* Nav *}
+<div class="page_nav">
+  {* i18n: summary = summary *}
+  {* i18n: shortlog = shortlog *}
+  {* i18n: log = log *}
+  {* i18n: commit = commit *}
+  {* i18n: commitdiff = commitdiff *}
+  {* i18n: tree = tree *}
+  <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$treehash}&hb={$hash}">{$localize.tree}</a>
+  <br />
+  {* i18n: first = first *}
+  {if $page > 0}
+    <a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}">{$localize.first}</a>
+  {else}
+    {$localize.first}
+  {/if}
+    &sdot; 
+  {* i18n: prev = prev *}
+  {if $page > 0}
+    <a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}{if $page > 1}&pg={$page-1}{/if}" accesskey="p" title="Alt-p">{$localize.prev}</a>
+  {else}
+    {$localize.prev}
+  {/if}
+    &sdot; 
+  {* i18n: next = next *}
+  {if $revlistcount > 100}
+    <a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}&pg={$page+1}" accesskey="n" title="Alt-n">{$localize.next}</a>
+  {else}
+    {$localize.next}
+  {/if}
+  <br />
+</div>
+<div>
+  <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}" class="title">{$title}</a>
+</div>
+<table cellspacing="0">
+  {* Print each match *}
+  {section name=match loop=$commitlines}
+    <tr class="{cycle values="light,dark"}">
+      <td title="{$commitlines[match].agestringage}"><i>{$commitlines[match].agestringdate}</i></td>
+      <td><i>{$commitlines[match].authorname}</i></td>
+      <td><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commitlines[match].commit}" class="list" {if $title}title="{$commitlines[match].title}"{/if}><b>{$commitlines[match].title_short}</b></a>
+        {foreach from=$commitlines[match].matches item=line name=match}
+          {if $smarty.foreach.match.first}<br />{/if}{$line}<br />
+        {/foreach}
+      </td>
+      {* i18n: snapshot = snapshot *}
+      {* i18n: tree = tree *}
+      {* i18n: commit = commit *}
+      {* i18n: commitdiff = commitdiff *}
+      <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commitlines[match].commit}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$commitlines[match].commit}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$commitlines[match].committree}&hb={$commitlines[match].commit}">{$localize.tree}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$commitlines[match].commit}">{$localize.snapshot}</a>
+      </td>
+    </tr>
+  {/section}
+
+  {if $revlistcount > 100}
+    <tr>
+      {* i18n: next = next *}
+      <td><a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}&pg={$page+1}" title="Alt-n">{$localize.next}</a></td>
+    </tr>
+  {/if}
+</table>
+
+{include file='footer.tpl'}
+
+

--- a/templates/search_fileitem.tpl
+++ /dev/null
@@ -1,21 +1,1 @@
-{*
- *  search_fileitem.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Search file item template
- *
- *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
- *}
-<tr class="{$class}">
-<td>
-{if $tree}
-<a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$hash}&hb={$hashbase}&f={$file}" class="list"><b>{$filename}</b></a>
-{else}
-<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$hash}&hb={$hashbase}&f={$file}" class="list"><b>{$filename}</b></a>
-{foreach from=$matches item=line name=match}
-{if $smarty.foreach.match.first}<br />{/if}<span class="respectwhitespace">{$line}</span><br />
-{/foreach}
-{/if}
-</td>
-<td class="link">{if $tree}<a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$hash}&hb={$hashbase}&f={$file}">tree</a>{else}<a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$hash}&hb={$hashbase}&f={$file}">blob</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=history&h={$hashbase}&f={$file}">history</a>{/if}</td>
-</tr>
 

--- a/templates/search_footer.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  search_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Search view footer template
- *
- *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
- *}
- {if $nextlink}
- <tr><td><a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}&pg={$nextpage}" title="Alt-n">next</a></td></tr>
- {/if}
- </table>
 

--- a/templates/search_header.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  search_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Search header template
- *
- *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
- *}
-<div>
-<a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}" class="title">{$title}</a>
-</div>
-<table cellspacing="0">
 

--- a/templates/search_item.tpl
+++ /dev/null
@@ -1,19 +1,1 @@
-{*
- *  search_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Search view item template
- *
- *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
- *}
-<tr class="{$class}">
-<td title="{$agestringage}"><i>{$agestringdate}</i></td>
-<td><i>{$authorname}</i></td>
-<td><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}" class="list" {if $title}title="{$title}"{/if}><b>{$title_short}</b>
-{foreach from=$matches item=line name=match}
-{if $smarty.foreach.match.first}<br />{/if}{$line}<br />
-{/foreach}
-</td>
-<td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$commit}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$committree}&hb={$commit}">tree</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$commit}">snapshot</a>
-</td>
-</tr>
 

--- a/templates/search_nav.tpl
+++ /dev/null
@@ -1,11 +1,1 @@
-{*
- *  search_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Search view nav template
- *
- *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
- *}
-<div class="page_nav">
-<a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$treehash}&hb={$hash}">tree</a>
-<br />
 

--- a/templates/search_pagenav.tpl
+++ /dev/null
@@ -1,11 +1,1 @@
-{*
- *  search_pagenav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Log view page nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- {if $firstlink}<a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}">{/if}first{if $firstlink}</a>{/if} &sdot; {if $prevlink}<a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}{if $prevpage}&pg={$prevpage}{/if}" accesskey="p" title="Alt-p">{/if}prev{if $prevlink}</a>{/if} &sdot; {if $nextlink}<a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}&pg={$nextpage}" accesskey="n" title="Alt-n">{/if}next{if $nextlink}</a>{/if}
- <br />
- </div>
 

--- /dev/null
+++ b/templates/searchfiles.tpl
@@ -1,1 +1,83 @@
+{*
+ *  searchfiles.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Search files template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+{include file='header.tpl'}
+
+{* Nav *}
+<div class="page_nav">
+  {* i18n: summary = summary *}
+  {* i18n: shortlog = shortlog *}
+  {* i18n: log = log *}
+  {* i18n: commit = commit *}
+  {* i18n: commitdiff = commitdiff *}
+  {* i18n: tree = tree *}
+  <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$treehash}&hb={$hash}">{$localize.tree}</a>
+  <br />
+  {* i18n: first = first *}
+  {if $page > 0}
+    <a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}">{$localize.first}</a>
+  {else}
+    {$localize.first}
+  {/if}
+    &sdot; 
+  {* i18n: prev = prev *}
+  {if $page > 0}
+    <a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}{if $page > 1}&pg={$page-1}{/if}" accesskey="p" title="Alt-p">{$localize.prev}</a>
+  {else}
+    {$localize.prev}
+  {/if}
+    &sdot; 
+  {* i18n: next = next *}
+  {if $filesearchcount > 100}
+    <a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}&pg={$page+1}" accesskey="n" title="Alt-n">{$localize.next}</a>
+  {else}
+    {$localize.next}
+  {/if}
+  <br />
+</div>
+<div>
+  <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}" class="title">{$title}</a>
+</div>
+<table cellspacing="0">
+  {* Print each match *}
+  {section name=match loop=$filesearchlines}
+    <tr class="{cycle values="light,dark"}">
+      <td>
+        {if $filesearchlines[match].tree}
+          <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$filesearchlines[match].hash}&hb={$hash}&f={$filesearchlines[match].file}" class="list"><b>{$filesearchlines[match].filename}</b></a>
+        {else}
+          <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$filesearchlines[match].hash}&hb={$hash}&f={$filesearchlines[match].file}" class="list"><b>{$filesearchlines[match].filename}</b></a>
+          {foreach from=$filesearchlines[match].matches item=line name=match}
+            {if $smarty.foreach.match.first}<br />{/if}<span class="respectwhitespace">{$line}</span><br />
+          {/foreach}
+        {/if}
+      </td>
+      <td class="link">
+        {if $filesearchlines[match].tree}
+	  {* i18n: tree = tree *}
+          <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$filesearchlines[match].hash}&hb={$hash}&f={$filesearchlines[match].file}">{$localize.tree}</a>
+        {else}
+	  {* i18n: blob = blob *}
+	  {* i18n: history = history *}
+          <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$filesearchlines[match].hash}&hb={$hash}&f={$filesearchlines[match].file}">{$localize.blob}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=history&h={$hash}&f={$filesearchlines[match].file}">{$localize.history}</a>
+        {/if}
+      </td>
+    </tr>
+  {/section}
+
+  {if $filesearchcount > 100}
+    <tr>
+      {* i18n: next = next *}
+      <td><a href="{$SCRIPT_NAME}?p={$project}&a=search&h={$hash}&s={$search}&st={$searchtype}&pg={$page+1}" title="Alt-n">{$localize.next}</a></td>
+    </tr>
+  {/if}
+</table>
+
+{include file='footer.tpl'}
+
+

--- /dev/null
+++ b/templates/shortlog.tpl
@@ -1,1 +1,78 @@
+{*
+ *  shortlog.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Shortlog view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ {* Nav *}
+ <div class="page_nav">
+   {* i18n: summary = summary *}
+   {* i18n: shortlog = shortlog *}
+   {* i18n: log = log *}
+   {* i18n: commit = commit *}
+   {* i18n: commitdiff = commitdiff *}
+   {* i18n: tree = tree *}
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | {$localize.shortlog} | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$hash}&hb={$hash}">{$localize.tree}</a>
+   <br />
+   {* i18n: HEAD = HEAD *}
+   {if ($hash != $head) || $page}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{$localize.HEAD}</a>
+   {else}
+     {$localize.HEAD}
+   {/if}
+     &sdot; 
+   {* i18n: prev = prev *}
+   {if $page > 0}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}&pg={$page-1}" accesskey="p" title="Alt-p">{$localize.prev}</a>
+   {else}
+     {$localize.prev}
+   {/if}
+     &sdot; 
+   {* i18n: next = next *}
+   {if $revlistcount > 100}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}&pg={$page+1}" accesskey="n" title="Alt-n">{$localize.next}</a>
+   {else}
+     {$localize.next}
+   {/if}
+   <br />
+ </div>
+ <div>
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary" class="title">&nbsp;</a>
+ </div>
+ <table cellspacing="0">
+   {* Display each log entry *}
+   {section name=log loop=$commitlines}
+     <tr class="{cycle values="light,dark"}">
+       <td title="{$commitlines[log].agestringage}"><i>{$commitlines[log].agestringdate}</i></td>
+       <td><i>{$commitlines[log].authorname}</i></td>
+       <td>
+         <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commitlines[log].commit}" class="list" {if $commitlines[log].title}title="{$commitlines[log].title}"{/if}><b>{$commitlines[log].title_short}
+         {if $commitlines[log].commitref}
+           <span class="tag">{$commitlines[log].commitref}</span>
+         {/if}
+         </b></a>
+       </td>
+       {* i18n: snapshot = snapshot *}
+       {* i18n: commit = commit *}
+       {* i18n: commitdiff = commitdiff *}
+       {* i18n: tree = tree *}
+       <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commitlines[log].commit}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$commitlines[log].commit}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$commitlines[log].commit}&hb={$commitlines[log].commit}">{$localize.tree}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$commitlines[log].commit}">{$localize.snapshot}</a>
+       </td>
+     </tr>
+   {/section}
+
+   {if $revlistcount > 100}
+     <tr>
+       {* i18n: next = next *}
+       <td><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}&pg={$page+1}" title="Alt-n">{$localize.next}</a></td>
+     </tr>
+   {/if}
+ </table>
+
+ {include file='footer.tpl'}
+
+

--- a/templates/shortlog_footer.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  shortlog_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Shortlog view footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- {if $nextlink}
- <tr><td><a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}&pg={$nextpage}" title="Alt-n">next</a></td></tr>
- {/if}
- </table>
 

--- a/templates/shortlog_item.tpl
+++ /dev/null
@@ -1,21 +1,1 @@
-{*
- *  shortlog_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Shortlog view item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <tr class="{$class}">
- <td title="{$agestringage}"><i>{$agestringdate}</i></td>
- <td><i>{$authorname}</i></td>
- <td>
- <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}" class="list" {if $title}title="{$title}"{/if}><b>{$title_short}
- {if $commitref}
- <span class="tag">{$commitref}</span>
- {/if}
- </b>
- </td>
- <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$commit}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$commit}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$commit}&hb={$commit}">tree</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$commit}">snapshot</a>
- </td>
- </tr>
 

--- a/templates/shortlog_nav.tpl
+++ /dev/null
@@ -1,11 +1,1 @@
-{*
- *  shortlog_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Shortlog view nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav">
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | shortlog | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hash}">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hash}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$hash}&hb={$hash}">tree</a>
- <br />
 

--- a/templates/shortlog_pagenav.tpl
+++ /dev/null
@@ -1,15 +1,1 @@
-{*
- *  shortlog_pagenav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Shortlog view page nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- {if $headlink}<a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{/if}HEAD{if $headlink}</a>{/if} &sdot; {if $prevlink}<a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}&pg={$prevpage}" accesskey="p" title="Alt-p">{/if}prev{if $prevlink}</a>{/if} &sdot; {if $nextlink}<a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hash}&pg={$nextpage}" accesskey="n" title="Alt-n">{/if}next{if $nextlink}</a>{/if}
- <br />
- </div>
- <div>
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary" class="title">&nbsp;</a>
- </div>
- <table cellspacing="0">
 

file:b/templates/tag.tpl (new)
--- /dev/null
+++ b/templates/tag.tpl
@@ -1,1 +1,56 @@
+{*
+ *  tag.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Tag view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ {* Nav *}
+ <div class="page_nav">
+   {* i18n: summary = summary *}
+   {* i18n: shortlog = shortlog *}
+   {* i18n: log = log *}
+   {* i18n: commit = commit *}
+   {* i18n: commitdiff = commitdiff *}
+   {* i18n: tree = tree *}
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$head}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$head}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$head}">{$localize.tree}</a>
+   <br /><br />
+ </div>
+ {* Tag data *}
+ <div>
+   <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}" class="title">{$tag.name}</a>
+ </div>
+ <div class="title_text">
+   <table cellspacing="0">
+     <tr>
+       {* i18n: object = object *}
+       <td>{$localize.object}</td>
+       <td class="monospace"><a href="{$SCRIPT_NAME}?p={$project}&a={$tag.type}&h={$tag.object}" class="list">{$tag.object}</a></td>
+       <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a={$tag.type}&h={$tag.object}">{$tag.type_localized}</a></td>
+     </tr>
+     {if $tag.author}
+       <tr>
+         {* i18n: author = author *}
+         <td>{$localize.author}</td>
+	 <td>{$tag.author}</td>
+       </tr>
+       <tr>
+         <td></td>
+	 <td> {$datedata.rfc2822} ({if $datedata.hour_local < 6}<span class="latenight">{/if}{$datedata.hour_local}:{$datedata.minute_local}{if $datedata.hour_local < 6}</span>{/if} {$datedata.tz_local})
+         </td>
+       </tr>
+     {/if}
+   </table>
+ </div>
+ <div class="page_body">
+   {foreach from=$tag.comment item=line}
+     {$line}<br />
+   {/foreach}
+ </div>
+
+ {include file='footer.tpl'}
+
+

file:a/templates/tag_data.tpl (deleted)
--- a/templates/tag_data.tpl
+++ /dev/null
@@ -1,26 +1,1 @@
-{*
- *  tag_data.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tag view data template
- *
- *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
- *}
- <div>
-   <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hash}" class="title">{$title}</a>
- </div>
- <div class="title_text">
- <table cellspacing="0">
- <tr><td>object</td><td class="monospace"><a href="{$SCRIPT_NAME}?p={$project}&a={$type}&h={$object}" class="list">{$object}</a></td><td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a={$type}&h={$object}">{$type}</a></td></tr>
- {if $author}
- <tr><td>author</td><td>{$author}</td></tr>
- <tr><td></td><td> {$adrfc2822} ({if $adhourlocal < 6}<span class="latenight">{/if}{$adhourlocal}:{$adminutelocal}{if $adhourlocal < 6}</span>{/if} {$adtzlocal})
- </td></tr>
- {/if}
- </table>
- </div>
- <div class="page_body">
- {foreach from=$comment item=line}
- {$line}<br />
- {/foreach}
- </div>
 

file:a/templates/tag_nav.tpl (deleted)
--- a/templates/tag_nav.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  tag_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tag navbar template
- *
- *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav">
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$head}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$head}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$head}">tree</a>
- <br /><br />
- </div>
 

--- /dev/null
+++ b/templates/tags.tpl
@@ -1,1 +1,55 @@
+{*
+ *  tags.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Tag view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ {* Nav *}
+ <div class="page_nav">
+   {* i18n: summary = summary *}
+   {* i18n: shortlog = shortlog *}
+   {* i18n: log = log *}
+   {* i18n: commit = commit *}
+   {* i18n: commitdiff = commitdiff *}
+   {* i18n: tree = tree *}
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$head}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$head}">{$localize.commitdiff}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$head}">{$localize.tree}</a>
+   <br /><br />
+ </div>
+ <div>
+   <a href="{$SCRIPT_NAME}?p={$project}&a=summary" class="title">&nbsp;</a>
+ </div>
+ {* Display tags *}
+ <table cellspacing="0">
+   {section name=tag loop=$taglist}
+     <tr class="{cycle values="light,dark"}">
+       <td><i>{$taglist[tag].age}</i></td>
+       <td><a href="{$SCRIPT_NAME}?p={$project}&a={$taglist[tag].reftype}&h={$taglist[tag].refid}" class="list"><b>{$taglist[tag].name}</b></a></td>
+       <td>
+         {if count($taglist[tag].comment) > 0}
+           <a href="{$SCRIPT_NAME}?p={$project}&a=tag&h={$taglist[tag].id}" class="list">{$taglist[tag].comment[0]}</a>
+         {/if}
+       </td>
+       <td class="link">
+         {if $taglist[tag].type == "tag"}
+	   {* i18n: tag = tag *}
+	   <a href="{$SCRIPT_NAME}?p={$project}&a=tag&h={$taglist[tag].id}">{$localize.tag}</a> | 
+	 {/if}
+	 <a href="{$SCRIPT_NAME}?p={$project}&a={$taglist[tag].reftype}&h={$taglist[tag].refid}">{$taglist[tag].reftype_localized}</a>
+	 {if $taglist[tag].reftype == "commit"}
+	   {* i18n: shortlog = shortlog *}
+	   {* i18n: log = log *}
+	   {* i18n: snapshot = snapshot *}
+	   | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/tags/{$taglist[tag].name}">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h=refs/tags/{$taglist[tag].name}">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$taglist[tag].refid}">{$localize.snapshot}</a>
+	 {/if}
+       </td>
+     </tr>
+   {/section}
+ </table>
+
+ {include file='footer.tpl'}
+
+

--- a/templates/tags_footer.tpl
+++ /dev/null
@@ -1,9 +1,1 @@
-{*
- *  tags_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tag view footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- </table>
 

--- a/templates/tags_header.tpl
+++ /dev/null
@@ -1,10 +1,1 @@
-{*
- *  tags_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tag view header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div><a href="{$SCRIPT_NAME}?p={$project}&a=summary" class="title">&nbsp;</a></div>
- <table cellspacing="0">
 

file:a/templates/tags_item.tpl (deleted)
--- a/templates/tags_item.tpl
+++ /dev/null
@@ -1,20 +1,1 @@
-{*
- *  tags_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tag view item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <tr class="{$class}">
- <td><i>{$age}</i></td>
- <td><a href="{$SCRIPT_NAME}?p={$project}&a={$reftype}&h={$refid}" class="list"><b>{$name}</b></a></td>
- <td>
- {if $comment}
- <a href="{$SCRIPT_NAME}?p={$project}&a=tag&h={$id}" class="list">{$comment}</a>
- {/if}
- </td>
- <td class="link">
- {if $type == "tag"}<a href="{$SCRIPT_NAME}?p={$project}&a=tag&h={$id}">tag</a> | {/if}<a href="{$SCRIPT_NAME}?p={$project}&a={$reftype}&h={$refid}">{$reftype}</a>{if $reftype == "commit"} | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h=refs/tags/{$name}">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h=refs/tags/{$name}">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=snapshot&h={$refid}">snapshot</a>{/if}
- </td>
- </tr>
 

file:a/templates/tags_nav.tpl (deleted)
--- a/templates/tags_nav.tpl
+++ /dev/null
@@ -1,12 +1,1 @@
-{*
- *  tags_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tag view nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav">
- <a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$head}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$head}">commitdiff</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$head}">tree</a>
- <br /><br />
- </div>
 

--- /dev/null
+++ b/templates/tree.tpl
@@ -1,1 +1,73 @@
+{*
+ *  tree.tpl
+ *  gitphp: A PHP git repository browser
+ *  Component: Tree view template
+ *
+ *  Copyright (C) 2009 Christopher Han <xiphux@gmail.com>
+ *}
 
+ {include file='header.tpl'}
+
+ {* Nav *}
+ {if $fullnav}
+   <div class="page_nav">
+     {* i18n: summary = summary *}
+     {* i18n: shortlog = shortlog *}
+     {* i18n: log = log *}
+     {* i18n: commit = commit *}
+     {* i18n: commitdiff = commitdiff *}
+     {* i18n: tree = tree *}
+     <a href="{$SCRIPT_NAME}?p={$project}&a=summary">{$localize.summary}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hashbase}">{$localize.shortlog}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hashbase}">{$localize.log}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hashbase}">{$localize.commit}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hashbase}">{$localize.commitdiff}</a> | {$localize.tree}<br /><br />
+   </div>
+   <div>
+     <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hashbase}" class="title">{$title}
+       {if $hashbaseref}
+         <span class="tag">{$hashbaseref}</span>
+       {/if}
+     </a>
+   </div>
+ {else}
+   <div class="page_nav"><br /><br /></div>
+   <div class="title">{$hash}</div>
+ {/if}
+ {* Path *}
+ <div class="page_path">
+   <b>
+     <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$hashbase}&h={$hashbase}">[{$project}]</a> / 
+     {foreach from=$paths item=path}
+       <a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$hashbase}&h={$path.tree}&f={$path.full}">{$path.short}</a> / 
+     {/foreach}
+   </b>
+ </div>
+ <div class="page_body">
+   {* List files *}
+   <table cellspacing="0">
+     {section name=tree loop=$treelines}
+       <tr class="{cycle values="light,dark"}">
+         <td class="monospace">{$treelines[tree].filemode}</td>
+         {if $treelines[tree].type == "blob"}
+           <td class="list">
+             <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$treelines[tree].hash}{if $hashbase}&hb={$hashbase}{/if}&f={if $base}{$base}{/if}{$treelines[tree].name}" class="list">{$treelines[tree].name}</a>
+	   </td>
+           <td class="link">
+	     {* i18n: blob = blob *}
+	     {* i18n: history = history *}
+	     <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$treelines[tree].hash}{if $hashbase}&hb={$hashbase}{/if}&f={if $base}{$base}{/if}{$treelines[tree].name}">{$localize.blob}</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=history&h={$hashbase}&f={if $base}{$base}{/if}{$treelines[tree].name}">{$localize.history}</a>
+	   </td>
+         {elseif $treelines[tree].type == "tree"}
+           <td class="list">
+             <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$treelines[tree].hash}{if $hashbase}&hb={$hashbase}{/if}&f={if $base}{$base}{/if}{$treelines[tree].name}">{$treelines[tree].name}</a>
+	   </td>
+           <td class="link">
+	     {* i18n: tree = tree *}
+	     <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$treelines[tree].hash}{if $hashbase}&hb={$hashbase}{/if}&f={if $base}{$base}{/if}{$treelines[tree].name}">{$localize.tree}</a>
+	   </td>
+         {/if}
+       </tr>
+     {/section}
+   </table>
+ </div>
+
+ {include file='footer.tpl'}
+
+

--- a/templates/tree_emptynav.tpl
+++ /dev/null
@@ -1,10 +1,1 @@
-{*
- *  tree_emptynav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tree view emptynav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav"><br /><br /></div>
- <div class="title">{$hash}</div>
 

--- a/templates/tree_filelist_footer.tpl
+++ /dev/null
@@ -1,10 +1,1 @@
-{*
- *  tree_filelist_footer.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tree view filelist footer template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- </table>
- </div>
 

--- a/templates/tree_filelist_header.tpl
+++ /dev/null
@@ -1,11 +1,1 @@
-{*
- *  tree_filelist_header.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tree view filelist header template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_path"><b><a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$hashbase}&h={$hashbase}">[{$project}]</a> / {foreach from=$paths item=path}<a href="{$SCRIPT_NAME}?p={$project}&a=tree&hb={$hashbase}&h={$path.tree}&f={$path.full}">{$path.short}</a> / {/foreach}</b></div>
- <div class="page_body">
- <table cellspacing="0">
 

--- a/templates/tree_filelist_item.tpl
+++ /dev/null
@@ -1,20 +1,1 @@
-{*
- *  tree_filelist_item.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tree view filelist item template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <tr class="{$class}">
- <td class="monospace">{$filemode}</td>
- <td class="list">
- {if $type == "blob"}
- <a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$hash}{if $hashbase}&hb={$hashbase}{/if}&f={if $base}{$base}{/if}{$name}" class="list">{$name}</a></td>
- <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=blob&h={$hash}{if $hashbase}&hb={$hashbase}{/if}&f={if $base}{$base}{/if}{$name}">blob</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=history&h={$hashbase}&f={if $base}{$base}{/if}{$name}">history</a>
- {elseif $type == "tree"}
-   <a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$hash}{if $hashbase}&hb={$hashbase}{/if}&f={if $base}{$base}{/if}{$name}">{$name}</a></td>
-   <td class="link"><a href="{$SCRIPT_NAME}?p={$project}&a=tree&h={$hash}{if $hashbase}&hb={$hashbase}{/if}&f={if $base}{$base}{/if}{$name}">tree</a>
- {/if}
- </td>
- </tr>
 

file:a/templates/tree_nav.tpl (deleted)
--- a/templates/tree_nav.tpl
+++ /dev/null
@@ -1,15 +1,1 @@
-{*
- *  tree_nav.tpl
- *  gitphp: A PHP git repository browser
- *  Component: Tree view nav template
- *
- *  Copyright (C) 2006 Christopher Han <xiphux@gmail.com>
- *}
- <div class="page_nav"><a href="{$SCRIPT_NAME}?p={$project}&a=summary">summary</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=shortlog&h={$hashbase}">shortlog</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=log&h={$hashbase}">log</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hashbase}">commit</a> | <a href="{$SCRIPT_NAME}?p={$project}&a=commitdiff&h={$hashbase}">commitdiff</a> | tree<br /><br />
- </div>
- <div><a href="{$SCRIPT_NAME}?p={$project}&a=commit&h={$hashbase}" class="title">{$title}
- {if $hashbaseref}
- <span class="tag">{$hashbaseref}</span>
- {/if}
- </a></div>
 

comments