diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-11-05 22:22:51 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-11-05 22:22:51 +0000 |
| commit | ad68a82be19f44c8e9ab895075a4e932133ad6ee (patch) | |
| tree | a8cc406846b7883cda0b4c54a07843395280b694 /app/views/projects | |
| parent | 8509cf80f009436e900294acc821295f21e3b142 (diff) | |
| download | redmine-ad68a82be19f44c8e9ab895075a4e932133ad6ee.tar.gz redmine-ad68a82be19f44c8e9ab895075a4e932133ad6ee.zip | |
Moved ProjectsController#list_news to NewsController#index.
Removed FeedsController, issues and news feeds are now handled by issues and news controllers.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@888 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/list_news.rhtml | 33 | ||||
| -rw-r--r-- | app/views/projects/show.rhtml | 4 |
2 files changed, 2 insertions, 35 deletions
diff --git a/app/views/projects/list_news.rhtml b/app/views/projects/list_news.rhtml deleted file mode 100644 index 8a3537848..000000000 --- a/app/views/projects/list_news.rhtml +++ /dev/null @@ -1,33 +0,0 @@ -<div class="contextual"> -<%= link_to_if_authorized l(:label_news_new), - {:controller => 'projects', :action => 'add_news', :id => @project}, - :class => 'icon icon-add', - :onclick => 'Element.show("add-news"); return false;' %> -</div> - -<div id="add-news" style="display:none;"> -<h2><%=l(:label_news_new)%></h2> -<% labelled_tabular_form_for :news, @news, :url => { :action => "add_news", :id => @project } do |f| %> -<%= render :partial => 'news/form', :locals => { :f => f } %> -<%= submit_tag l(:button_create) %> -<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %> -<% end %> -</div> - -<h2><%=l(:label_news_plural)%></h2> - -<% if @newss.empty? %> -<p class="nodata"><%= l(:label_no_data) %></p> -<% else %> -<% @newss.each do |news| %> - <h3><%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %> - <%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %></h3> - <p class="author"><%= authoring news.created_on, news.author %></p> - <%= textilizable(news.description) %> -<% end %> -<% end %> -<%= pagination_links_full @news_pages %> - -<% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> -<% end %> diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml index 88178cb5d..94df0bf3d 100644 --- a/app/views/projects/show.rhtml +++ b/app/views/projects/show.rhtml @@ -46,11 +46,11 @@ </div> <% end %> - <% if @news.any? && authorize_for('projects', 'list_news') %> + <% if @news.any? && authorize_for('news', 'index') %> <div class="box"> <h3><%=l(:label_news_latest)%></h3> <%= render :partial => 'news/news', :collection => @news %> - <p><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></p> + <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p> </div> <% end %> </div> |