From 11bf848b09ffaa370b27985d05299851448becfd Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 13 Apr 2012 10:56:02 +0200
Subject: [PATCH] Move channel link to top menu of Project and Jobset.

---
 src/root/jobset.tt  | 19 -------------------
 src/root/project.tt | 15 ---------------
 src/root/topbar.tt  |  2 ++
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 0d4faa35..c38d789a 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -78,9 +78,6 @@
 			<li><a href="#tabs-jobs" data-toggle="tab">Jobs ([% activeJobs.size %])</a></li>
 		[% END %]
 		<li><a href="#tabs-setup" data-toggle="tab">Setup</a></li>
-		[% IF !edit -%]
-			<li><a href="#tabs-channels" data-toggle="tab">Channels</a></li>
-		[% END %]
 	</ul>
 <div id="generic-tabs" class="tab-content">
 	<div id="tabs-information" class="tab-pane active">
@@ -206,22 +203,6 @@
 			[% INCLUDE renderInputs %]
 		</div>
 	[% IF !edit -%]
-		<div id="tabs-channels" class="tab-pane">
-		
-			<h2>Channels</h2>
-			
-			<p>This jobset provides the following Nix channel:</p>
-			
-			<ul>
-			  <li>
-			    <a href="[% c.uri_for('/jobset' project.name jobset.name 'channel'
-			    'latest') %]"><tt>latest</tt></a> — contains the latest successful
-			    build of every job in this jobset.
-			  </li>
-			</ul>
-			
-		</div>
-	
 		<div id="tabs-jobs" class="tab-pane">
 		
 			<h2>Jobs</h2>
diff --git a/src/root/project.tt b/src/root/project.tt
index 79bdcc16..b1c997d9 100644
--- a/src/root/project.tt
+++ b/src/root/project.tt
@@ -7,7 +7,6 @@
 		<li><a href="#tabs-settings" data-toggle="tab">Settings</a></li>
 		[% IF !edit %]
 			<li><a href="#tabs-views" data-toggle="tab">Views</a></li>
-			<li><a href="#tabs-channels" data-toggle="tab">Channels</a></li>
 		[% END %]
 	</ul>
 
@@ -200,20 +199,6 @@
 			<p><a href="[% c.uri_for('/project' project.name 'create-view') %]">[Create a new view]</a></p>
 			
 		</div>
-		<div id="tabs-channels" class="tab-pane">	
-			
-			<h2>Channels</h2>
-			
-			<p>This project provides the following Nix channel:</p>
-			
-			<ul>
-			  <li>
-			    <a href="[% c.uri_for('/project' project.name 'channel' 'latest') %]"><tt>latest</tt></a> —
-			    contains the latest successful build of every job in this project.
-			  </li>
-			</ul>
-			
-		</div>
 	[% END %]
 </div>
 
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 97115fb7..7144d167 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -48,6 +48,7 @@
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('all'), [project.name]) title = "All builds" %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('jobstatus'), [project.name]) title = "Job status" %]
       [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('errors'), [project.name]) title = "Errors" %]
+      [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'channel' 'latest') title = "Channel (latest)" %]
       [% IF c.check_user_roles('admin') %]
           <li class="divider"></li>
           [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create_jobset'), [project.name]) title = "Create new jobset" %]
@@ -74,6 +75,7 @@
       [% INCLUDE makeLink
         uri = c.uri_for(c.controller('Jobset').action_for('errors'), [project.name, jobset.name])
         title = "Errors" %]
+      [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'channel' 'latest') title = "Channel (latest)" %]
       [% IF c.check_user_roles('admin') %]
           <li class="divider"></li>
           [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'edit') title="Edit jobset" %]