Mercurial > hg > soundsoftware-site
diff app/views/projects/.svn/text-base/show.rhtml.svn-base @ 22:40f7cfd4df19
* Update to SVN trunk rev 4173
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 24 Sep 2010 14:06:04 +0100 |
| parents | 1d32c0a0efbf |
| children | 94944d00e43c |
line wrap: on
line diff
--- a/app/views/projects/.svn/text-base/show.rhtml.svn-base Wed Aug 25 16:30:24 2010 +0100 +++ b/app/views/projects/.svn/text-base/show.rhtml.svn-base Fri Sep 24 14:06:04 2010 +0100 @@ -1,6 +1,6 @@ <div class="contextual"> <% if User.current.allowed_to?(:add_subprojects, @project) %> - <%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'add', :parent_id => @project}, :class => 'icon icon-add' %> + <%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %> <% end %> </div> @@ -74,7 +74,7 @@ <% end %> <% content_for :header_tags do %> -<%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %> +<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %> <% end %> <% html_title(l(:label_overview)) -%>