X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fwrapper.tt2;h=46114419b7e60032de3b9429c0537c5008436054;hb=97bdf7bcffdc868740db6a499839faee686b5a31;hp=2bbec84133682b3edfc41c8cbe92c6b481f37a7e;hpb=29e66d317e5bf0e81fe8e8c52fcf56bc9f41e7f8;p=catagits%2FGitalist.git

diff --git a/root/wrapper.tt2 b/root/wrapper.tt2
index 2bbec84..4611441 100755
--- a/root/wrapper.tt2
+++ b/root/wrapper.tt2
@@ -20,7 +20,7 @@
   [% INCLUDE '_header_feeds.tt2' %]
    
 	<link rel="stylesheet" type="text/css" href="[% c.uri_for('/core.css') %]" />
-	<link rel="shortcut icon" href="[% c.uri_for('/static/git-favicon.png') %]" type="image/png" />
+	<link rel="shortcut icon" href="[% c.uri_for('/static/favicon.ico') %]" type="image/png" />
 	<script type="text/javascript">
 	// FIXME: this should be in an external js file once c.uri_for works in js files
 	function compareDiffs(repo, path){
@@ -44,7 +44,7 @@
 				}
 			}
 		}
-		document.location.href = "[% c.uri_for("/") %]" + repo + "/"+ sha1 + "/diff/" + sha2 + "/" + path;
+		document.location.href = "[% c.uri_for("/") %]" + repo + "/"+ sha2 + "/diff/" + sha1 + "/" + path;
 	}
 	// handles hover sub menus in IE
 	startList = function() {
@@ -178,6 +178,10 @@
 			
 			
 			[%- 
+				
+				#FIXME on a history view of a folder, don't show extra actions in dropdown
+				SET on_file_page = 1;
+				
 				SET actions_list = {
 						"blob" 		=> 1,
 						"raw" 	 	=> 1,
@@ -191,7 +195,7 @@
 									.replace("fancy","")
 									.replace("index","Repositories");
 				action_name_ucfirst = action_name FILTER ucfirst;
-				IF actions_list.$action_name;
+				IF actions_list.$action_name && on_file_page;
 					'<a href="#" id="actions_nav_link"><span>' _ action_name_ucfirst _ '</span></a>';
 				ELSE;
 					action_name_ucfirst;
@@ -255,7 +259,7 @@
 	[% USE Dumper %]
 	<pre>
 	[% Repository.path %]
-	[%# Dumper.dump(c.req.path) %]
+	[%# Dumper.dump(Commit) %]
 	</pre>
 	
 	</div>