# HG changeset patch
# User Chris Cannam
# Date 1371204738 -3600
# Node ID 537026b96b8b31d07e5c18b73ebae27b54798ff2
# Parent  e9f9943f02f93fd36714e78863ecd055af715bf0# Parent  f9a81a1a4425f4411b45e87b7b7b26c1ba8e0608
Merge from branch cannam

diff -r e9f9943f02f9 -r 537026b96b8b app/views/projects/explore.html.erb
--- a/app/views/projects/explore.html.erb	Fri Jun 14 10:27:07 2013 +0100
+++ b/app/views/projects/explore.html.erb	Fri Jun 14 11:12:18 2013 +0100
@@ -3,7 +3,8 @@
 <% end %>
 
 <div class="contextual">
-    <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
+    <%= link_to l(:label_project_all), { :controller => 'projects', :action => 'index' }%>
+    <%= ('| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add')).html_safe if User.current.allowed_to?(:add_project, nil, :global => true) %>
 </div>
 
 <h2><%= l(:label_explore_projects) %></h2>