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

diff --git a/root/wrapper.tt2 b/root/wrapper.tt2
index 4927bb8..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() {
@@ -118,13 +118,16 @@
 			<a href="[% c.uri_for('/') %]" id="logo"><img src="[% c.uri_for('/static/i/logo.png') %]" alt="Gitalist" /></a>
 
 			<div class="search">
-				[% IF Repository; INCLUDE 'nav/search.tt2'; ELSE; %]
-				
-				<form method="get" action="[% c.uri_for_action('/search') %]" enctype="application/x-www-form-urlencoded">
-	   <p class="projsearch">Search:
-	    <input type="text" name="s" value="[% search_text %]" />
-	   </p>
-	  </form>
+			[% IF Repository; INCLUDE 'nav/search.tt2'; ELSE; %]
+			
+			<!--
+			[%# FIXME - Search submits to blank(ish) page %]
+			<form method="get" action="[% c.uri_for_action('/search') %]" enctype="application/x-www-form-urlencoded">
+			   <p class="projsearch">Search:
+			    <input type="text" name="s" value="[% search_text %]" />
+			   </p>
+			</form>
+			-->
 			[% END %]
 			</div>
 		</div>
@@ -143,10 +146,8 @@
 
 				
 				<li id="branch_selector">
-					[%# FIXME: convert to c.uri_for_action  #%]
-					
 					Branches 
-					<select onchange="document.location.href='/[% Repository.name %]/'+this.options[this.selectedIndex].text + '/shortlog';">
+					<select onchange="document.location.href='[% c.uri_for("/") %][% Repository.name %]/'+this.options[this.selectedIndex].text + '/shortlog';">
 						<option value="">HEAD</option>
 					
 					[% FOREACH branch_head IN Repository.heads %]
@@ -177,33 +178,41 @@
 			
 			
 			[%- 
+				
+				#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,
+						"blame" 	=> 1,
+						"history"  	=> 1,
+					};
+					
 				SET action_name = c.action.name
 									.replace("_"," ")
 									.replace("log", " log")
 									.replace("fancy","")
 									.replace("index","Repositories");
 				action_name_ucfirst = action_name FILTER ucfirst;
-				'<a href="#" id="actions_nav_link"><span>' _ action_name_ucfirst _ '</span></a>';
+				IF actions_list.$action_name && on_file_page;
+					'<a href="#" id="actions_nav_link"><span>' _ action_name_ucfirst _ '</span></a>';
+				ELSE;
+					action_name_ucfirst;
+				END;
 				
 			-%]
 
 			</h1>
 	
 			[%- 
-				SET actions_list = {
-						"blob" 		=> 1,
-						"raw" 	 	=> 1,
-						"blame" 	=> 1,
-						"history"  	=> 1,
-					};
-					
 				IF actions_list.$action_name;
 				'<ul id="actions_nav_list">';
 					FOREACH action IN actions_list;
 						action_output = action.key FILTER ucfirst;
 						NEXT IF action_output == action_name_ucfirst;	
 						action = action.key;
-						'<li><a href="/' _ c.req.path.replace(action_name, action) _ '">' _ action_output _ '</a></li>';
+						'<li><a href="' _ c.uri_for("/")  _ c.req.path.replace(action_name, action) _ '">' _ action_output _ '</a></li>';
 					END;			
 				'</ul>';
 				END;
@@ -250,7 +259,7 @@
 	[% USE Dumper %]
 	<pre>
 	[% Repository.path %]
-	[%# Dumper.dump(c.req.path) %]
+	[%# Dumper.dump(Commit) %]
 	</pre>
 	
 	</div>