From e0ff27fd3b179212100e65cb6ce5630e7a89756b Mon Sep 17 00:00:00 2001
From: lrbalt <lrbalt@a4c988fc-2ded-0310-b66e-134b36920a42>
Date: Wed, 13 Feb 2008 13:24:22 +0000
Subject: [PATCH] Changed the ordering of items in sidebar as suggested by Luis
 in #620.

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@707 a4c988fc-2ded-0310-b66e-134b36920a42
---
 tracks/app/views/sidebar/sidebar.rhtml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tracks/app/views/sidebar/sidebar.rhtml b/tracks/app/views/sidebar/sidebar.rhtml
index 95cf3101..bb5d8847 100644
--- a/tracks/app/views/sidebar/sidebar.rhtml
+++ b/tracks/app/views/sidebar/sidebar.rhtml
@@ -1,25 +1,26 @@
 <div id="sidebar">
+        <% # show active items before hidden / completed items -%>
 
 	<%= render :partial => "sidebar/project_list",
 	           :locals => { :list_name => 'Active Projects',
 	           				:projects => @projects.select{|p| p.active? } } -%>
 	
+	<%= render :partial => "sidebar/context_list",
+	           :locals => { :list_name => 'Active Contexts',
+	           				:contexts => @contexts.reject{|c| c.hide? } } -%>
+
 	<% if prefs.show_hidden_projects_in_sidebar -%>
-  <%= render :partial => "sidebar/project_list",
-			 :locals => { :list_name => 'Hidden Projects',
+        <%= render :partial => "sidebar/project_list",
+                   :locals => { :list_name => 'Hidden Projects',
 			 			  :projects => @projects.select{|p| p.hidden? } } -%>
 	<% end -%>
 
 	<% if prefs.show_completed_projects_in_sidebar -%>
-  <%= render :partial => "sidebar/project_list",
-             :locals => { :list_name => 'Completed Projects',
+        <%= render :partial => "sidebar/project_list",
+                   :locals => { :list_name => 'Completed Projects',
              			  :projects => @projects.select{|p| p.completed? } } -%>
 	<% end -%>
 
-	<%= render :partial => "sidebar/context_list",
-	           :locals => { :list_name => 'Active Contexts',
-	           				:contexts => @contexts.reject{|c| c.hide? } } -%>
-
 	<% if prefs.show_hidden_contexts_in_sidebar -%>
 	<%= render :partial => "sidebar/context_list",
 	           :locals => { :list_name => 'Hidden Contexts',