Mercurial > hg > soundsoftware-site
diff app/views/projects/index.rhtml @ 100:1412841d48a3 cannam
* Projects page: If I'm logged in but have no projects, use single All Projects heading
* Projects page: Rename "Other Projects" to "Everyone Else's Projects"
* Projects page: Remove stars from my project links; remove key explaining star
* Projects page: Reorder top-right nav links to isolate the "+ New Project" icon
author | Chris Cannam |
---|---|
date | Thu, 16 Dec 2010 16:29:06 +0000 |
parents | dc22c3eb3c81 |
children | 605adf7e1735 |
line wrap: on
line diff
--- a/app/views/projects/index.rhtml Thu Dec 16 16:04:12 2010 +0000 +++ b/app/views/projects/index.rhtml Thu Dec 16 16:29:06 2010 +0000 @@ -3,17 +3,15 @@ <% 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_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %> - <%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %> <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%> + <%= '| ' + link_to(l(:label_issue_view_all), { :controller => 'issues' }) if User.current.allowed_to?(:view_issues, nil, :global => true) %> + <%= '| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> </div> <% if User.current.logged? %> <%= render_my_project_hierarchy(@projects)%> - <h2><%=l(:label_other_project_plural)%></h2> <%= render_other_project_hierarchy(@projects)%> <% else %> @@ -24,13 +22,6 @@ -<% if User.current.logged? %> -<p style="text-align:right;"> -<span class="my-project"><%= l(:label_my_projects) %></span> -</p> -<% end %> - - <% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> <% end %>