修改课程通知show方法，并添加独立视图
This commit is contained in:
parent
2a9d6eb012
commit
e17090d506
|
|
@ -151,7 +151,13 @@ class NewsController < ApplicationController
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@news.destroy
|
@news.destroy
|
||||||
redirect_to project_news_index_path(@project)
|
# modify by nwb
|
||||||
|
if @project
|
||||||
|
redirect_to project_news_index_path(@project)
|
||||||
|
elsif @course
|
||||||
|
redirect_to course_news_index_path(@course)
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,85 @@
|
||||||
|
<div class="contextual">
|
||||||
|
<%= watcher_link(@news, User.current) %>
|
||||||
|
<%= link_to(l(:button_edit),
|
||||||
|
edit_news_path(@news),
|
||||||
|
:class => 'icon icon-edit',
|
||||||
|
:accesskey => accesskey(:edit),
|
||||||
|
:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @course) %>
|
||||||
|
<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @course) %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h3><strong><%=h @news.title %></strong></h3>
|
||||||
|
|
||||||
|
<% if authorize_for('news', 'edit') %>
|
||||||
|
<div id="edit-news" style="display:none;">
|
||||||
|
<%= labelled_form_for :news, @news, :url => news_path(@news),
|
||||||
|
:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
|
||||||
|
<%= render :partial => 'course_form', :locals => { :f => f } %>
|
||||||
|
<%= submit_tag l(:button_save) %>
|
||||||
|
<%= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => ''} %> |
|
||||||
|
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
|
||||||
|
<% end %>
|
||||||
|
<div id="preview" class="wiki"></div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<div id="comments" style="margin-bottom:16px;">
|
||||||
|
|
||||||
|
<div style="margin:15px">
|
||||||
|
<span class="font_description"> <%= textilizable(@news, :description) %> </span>
|
||||||
|
<br/>
|
||||||
|
<%= link_to_attachments @news %>
|
||||||
|
<br/>
|
||||||
|
<!--add comment-->
|
||||||
|
<% if @news.commentable? %>
|
||||||
|
<p>
|
||||||
|
<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
|
||||||
|
</p>
|
||||||
|
<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
|
||||||
|
<div class="box">
|
||||||
|
<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
|
||||||
|
<%= wikitoolbar_for 'comment_comments' %>
|
||||||
|
</div>
|
||||||
|
<p>
|
||||||
|
<%= submit_tag l(:button_add) %>
|
||||||
|
</p>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<% html_title @news.title -%>
|
||||||
|
|
||||||
|
<% content_for :header_tags do %>
|
||||||
|
<%= stylesheet_link_tag 'scm' %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<!--dispaly comments-->
|
||||||
|
<div class="line_heng"></div>
|
||||||
|
</div>
|
||||||
|
<h3 class="comments"><%= l(:label_comment_plural) %></h3>
|
||||||
|
<% comments = @comments.reverse %>
|
||||||
|
<% comments.each do |comment| %>
|
||||||
|
<% next if comment.new_record? %>
|
||||||
|
<table width="660px" border="0" align="center">
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(comment.author), :class => "avatar")%></td>
|
||||||
|
<td>
|
||||||
|
<table width="580px" border="0">
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" valign="top"><strong><%= link_to_user(comment.author) if comment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" width="580px" >
|
||||||
|
<p class="font_description">
|
||||||
|
<%= textilizable(comment.comments) %>
|
||||||
|
</p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>
|
||||||
|
<td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
|
||||||
|
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
|
||||||
|
</tr>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<% end if @comments.any? %>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,85 @@
|
||||||
|
<div class="contextual">
|
||||||
|
<%= watcher_link(@news, User.current) %>
|
||||||
|
<%= link_to(l(:button_edit),
|
||||||
|
edit_news_path(@news),
|
||||||
|
:class => 'icon icon-edit',
|
||||||
|
:accesskey => accesskey(:edit),
|
||||||
|
:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
|
||||||
|
<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h3><strong><%=h @news.title %></strong></h3>
|
||||||
|
|
||||||
|
<% if authorize_for('news', 'edit') %>
|
||||||
|
<div id="edit-news" style="display:none;">
|
||||||
|
<%= labelled_form_for :news, @news, :url => news_path(@news),
|
||||||
|
:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
|
||||||
|
<%= render :partial => 'form', :locals => { :f => f } %>
|
||||||
|
<%= submit_tag l(:button_save) %>
|
||||||
|
<%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => ''} %> |
|
||||||
|
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
|
||||||
|
<% end %>
|
||||||
|
<div id="preview" class="wiki"></div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<div id="comments" style="margin-bottom:16px;">
|
||||||
|
|
||||||
|
<div style="margin:15px">
|
||||||
|
<span class="font_description"> <%= textilizable(@news, :description) %> </span>
|
||||||
|
<br/>
|
||||||
|
<%= link_to_attachments @news %>
|
||||||
|
<br/>
|
||||||
|
<!--add comment-->
|
||||||
|
<% if @news.commentable? %>
|
||||||
|
<p>
|
||||||
|
<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
|
||||||
|
</p>
|
||||||
|
<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
|
||||||
|
<div class="box">
|
||||||
|
<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
|
||||||
|
<%= wikitoolbar_for 'comment_comments' %>
|
||||||
|
</div>
|
||||||
|
<p>
|
||||||
|
<%= submit_tag l(:button_add) %>
|
||||||
|
</p>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<% html_title @news.title -%>
|
||||||
|
|
||||||
|
<% content_for :header_tags do %>
|
||||||
|
<%= stylesheet_link_tag 'scm' %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<!--dispaly comments-->
|
||||||
|
<div class="line_heng"></div>
|
||||||
|
</div>
|
||||||
|
<h3 class="comments"><%= l(:label_comment_plural) %></h3>
|
||||||
|
<% comments = @comments.reverse %>
|
||||||
|
<% comments.each do |comment| %>
|
||||||
|
<% next if comment.new_record? %>
|
||||||
|
<table width="660px" border="0" align="center">
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(comment.author), :class => "avatar")%></td>
|
||||||
|
<td>
|
||||||
|
<table width="580px" border="0">
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" valign="top"><strong><%= link_to_user(comment.author) if comment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" width="580px" >
|
||||||
|
<p class="font_description">
|
||||||
|
<%= textilizable(comment.comments) %>
|
||||||
|
</p></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>
|
||||||
|
<td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
|
||||||
|
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
|
||||||
|
</tr>
|
||||||
|
</table></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<% end if @comments.any? %>
|
||||||
|
</div>
|
||||||
|
|
@ -1,85 +1,5 @@
|
||||||
<div class="contextual">
|
<% if @project %>
|
||||||
<%= watcher_link(@news, User.current) %>
|
<%= render :partial => 'project_show', locals: {project: @project} %>
|
||||||
<%= link_to(l(:button_edit),
|
<% elsif @course %>
|
||||||
edit_news_path(@news),
|
<%= render :partial => 'course_show', locals: {course: @course} %>
|
||||||
:class => 'icon icon-edit',
|
|
||||||
:accesskey => accesskey(:edit),
|
|
||||||
:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
|
|
||||||
<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h3><strong><%=h @news.title %></strong></h3>
|
|
||||||
|
|
||||||
<% if authorize_for('news', 'edit') %>
|
|
||||||
<div id="edit-news" style="display:none;">
|
|
||||||
<%= labelled_form_for :news, @news, :url => news_path(@news),
|
|
||||||
:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
|
|
||||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
|
||||||
<%= submit_tag l(:button_save) %>
|
|
||||||
<%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => ''} %> |
|
|
||||||
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
|
|
||||||
<% end %>
|
|
||||||
<div id="preview" class="wiki"></div>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<div id="comments" style="margin-bottom:16px;">
|
|
||||||
|
|
||||||
<div style="margin:15px">
|
|
||||||
<span class="font_description"> <%= textilizable(@news, :description) %> </span>
|
|
||||||
<br/>
|
|
||||||
<%= link_to_attachments @news %>
|
|
||||||
<br/>
|
|
||||||
<!--add comment-->
|
|
||||||
<% if @news.commentable? %>
|
|
||||||
<p>
|
|
||||||
<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
|
|
||||||
</p>
|
|
||||||
<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
|
|
||||||
<div class="box">
|
|
||||||
<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
|
|
||||||
<%= wikitoolbar_for 'comment_comments' %>
|
|
||||||
</div>
|
|
||||||
<p>
|
|
||||||
<%= submit_tag l(:button_add) %>
|
|
||||||
</p>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<% html_title @news.title -%>
|
|
||||||
|
|
||||||
<% content_for :header_tags do %>
|
|
||||||
<%= stylesheet_link_tag 'scm' %>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<!--dispaly comments-->
|
|
||||||
<div class="line_heng"></div>
|
|
||||||
</div>
|
|
||||||
<h3 class="comments"><%= l(:label_comment_plural) %></h3>
|
|
||||||
<% comments = @comments.reverse %>
|
|
||||||
<% comments.each do |comment| %>
|
|
||||||
<% next if comment.new_record? %>
|
|
||||||
<table width="660px" border="0" align="center">
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(comment.author), :class => "avatar")%></td>
|
|
||||||
<td>
|
|
||||||
<table width="580px" border="0">
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" valign="top"><strong><%= link_to_user(comment.author) if comment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" width="580px" >
|
|
||||||
<p class="font_description">
|
|
||||||
<%= textilizable(comment.comments) %>
|
|
||||||
</p></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>
|
|
||||||
<td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
|
|
||||||
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
|
|
||||||
</tr>
|
|
||||||
</table></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
<% end if @comments.any? %>
|
|
||||||
</div>
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue