diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index bab5dfb4c..fd1266095 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -165,7 +165,15 @@ class MessagesController < ApplicationController render_attachment_warning_if_needed(@message) flash[:notice] = l(:notice_successful_update) @message.reload - redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)) + if params[:is_board] + if @project + redirect_to project_boards_path(@project) + elsif @course + redirect_to course_boards_path(@course) + end + else + redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)) + end elsif request.get? respond_to do |format| format.html { diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index 045ff90f3..c55bb8336 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -16,7 +16,7 @@
-
+
    <%= render :partial => 'course_new' %>
@@ -29,18 +29,31 @@
<% end %> - +

讨论区共有<%= @topic_count %>个帖子

<% if @topics.any? %> <% @topics.each do |topic| %> -
+
<%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
<% author = topic.author.to_s + "：" %> <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %> +

  <%= h(topic.subject) %>

+ <% if topic.editable_by?(User.current) %> + <%= l(:button_edit) %> + <% end %> <% if topic.sticky? %> - <%= l(:label_board_sticky)%> + <%= l(:label_board_sticky)%> <% end %> + <%= link_to( + l(:button_delete), + {:controller =>'messages',:action => 'destroy', :id => topic.id, :board_id => topic.board_id, :is_board=>'true'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :class => 'talk_edit fr', + :style => ' margin-right: 10px;' + ) if topic.destroyable_by?(User.current) %>
@@ -59,6 +72,11 @@
+
+
    + <%= render :partial => 'edit',locals: {:topic => topic} %> +
+
<% reply = Message.new(:subject => "RE: #{@message.subject}")%> <% if !topic.locked? && authorize_for('messages', 'reply') %> @@ -141,8 +159,9 @@ <% end %>
-
展开回复(<%= topic.replies_count.to_s%>)
- + <%if replies_all.first %> +
展开回复(<%= topic.replies_count.to_s%>)
+ <% end %> <% end %>
<% end %> diff --git a/app/views/boards/_edit.html.erb b/app/views/boards/_edit.html.erb new file mode 100644 index 000000000..c41f723de --- /dev/null +++ b/app/views/boards/_edit.html.erb @@ -0,0 +1,42 @@ + + <% if topic.project %> + <%#= board_breadcrumb(@message) %> + +
+
    + <%= form_for topic, { :as => :message, + :url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id}, + :html => {:multipart => true, + :id => 'message-form' + topic.id.to_s, + :method => :post} + } do |f| %> + <%= render :partial => 'form_project', + :locals => {:f => f, :replying => !topic.parent.nil?} %> + <%= l(:button_submit)%> + <%= link_to l(:button_cancel), board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "blue_btn grey_btn fl c_white" %> +
+
+ <% end %> +<% elsif topic.course %> + <%#= course_board_breadcrumb(@message) %> +
+
    + <%= form_for topic, { + :as => :message, + :url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id}, + :html => {:multipart => true, + :id => 'message-form' + topic.id.to_s, + :method => :post} + } do |f| %> + <%= render :partial => 'form_course', + :locals => {:f => f, :replying => !topic.parent.nil?} %> + <%= l(:button_submit)%> + <%= link_to l(:button_cancel), board_message_url(topic.board,topic.root, :r => (topic.parent_id &&topic.id)), :class => "blue_btn grey_btn fl c_white" %> + + <% end %> +
+
+<% end %> + + +
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index b4fb47976..d0fd6215a 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -22,31 +22,46 @@
-
+
    <%= render :partial => 'project_new_topic' %>
- +

讨论区共有<%= @topic_count %>个帖子

<% if @topics.any? %> <% @topics.each do |topic| %> -
+
<%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
<% author = topic.author.to_s + "：" %> <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %> -

  <%= h(topic.subject) %>

- <% if topic.sticky? %> - <%= l(:label_board_sticky)%> - <% end %> + +

  <%= h(topic.subject) %>

+ <% if topic.editable_by?(User.current) %> + <%= l(:button_edit) %> + <% end %> + <% if topic.sticky? %> + <%= l(:label_board_sticky)%> + <% end %> + <%= link_to( + l(:button_delete), + {:controller =>'messages',:action => 'destroy', :id => topic.id, :board_id => topic.board_id, :is_board=>'true'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :class => 'talk_edit fr', + :style => ' margin-right: 10px;' + ) if topic.destroyable_by?(User.current) %> +
-

+

<%= topic.content %> -

+

+

@@ -62,6 +77,12 @@

+ +
+
    + <%= render :partial => 'edit',locals: {:topic => topic} %> +
+
<% reply = Message.new(:subject => "RE: #{@message.subject}")%> <% if !topic.locked? && authorize_for('messages', 'reply') %> @@ -95,7 +116,7 @@
<%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
-

<%= textAreailizable message,:content,:attachments => message.attachments %>

+

<%= textAreailizable message,:content,:attachments => message.attachments %>


<%= format_time(message.created_on) %> @@ -124,7 +145,7 @@
<%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
-

<%= textAreailizable message,:content,:attachments => message.attachments %>

+

<%= textAreailizable message,:content,:attachments => message.attachments %>


<%= format_time(message.created_on) %> @@ -144,8 +165,9 @@ <% end %>
-
展开回复(<%= topic.replies_count.to_s%>)
- + <%if replies_all.first %> +
展开回复(<%= topic.replies_count.to_s%>)
+ <% end %> <% end %>
<% end %> diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index fefe54b78..9faf07b9a 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -31,7 +31,10 @@ function show_newtalk() $("#about_newtalk").toggle(); } - +function show_newtalk1(id) +{ + $(id).toggle(); +} <% if @project %> <%= render :partial => 'project_show', locals: {project: @project} %> diff --git a/app/views/layouts/_base_development_group.html.erb b/app/views/layouts/_base_development_group.html.erb index 570bbd063..891fa9d94 100644 --- a/app/views/layouts/_base_development_group.html.erb +++ b/app/views/layouts/_base_development_group.html.erb @@ -23,7 +23,7 @@ (<%= @project.boards.first.topics.count %>) <% end %> <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %> + <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> <% end %>
<% end%> diff --git a/app/views/layouts/_base_friend_group.html.erb b/app/views/layouts/_base_friend_group.html.erb index 16ccc09e5..71d375501 100644 --- a/app/views/layouts/_base_friend_group.html.erb +++ b/app/views/layouts/_base_friend_group.html.erb @@ -12,7 +12,7 @@ (<%= @project.boards.first.topics.count %>) <% end %> <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %> + <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> <% end %>
<% end%> diff --git a/app/views/layouts/_base_research_team.html.erb b/app/views/layouts/_base_research_team.html.erb index 17bf65b15..3f942bc40 100644 --- a/app/views/layouts/_base_research_team.html.erb +++ b/app/views/layouts/_base_research_team.html.erb @@ -23,7 +23,7 @@ (<%= @project.boards.first.topics.count %>) <% end %> <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %> + <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> <% end %>
<% end%> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 2a26ff59f..8361c3874 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -133,7 +133,7 @@
<%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %> - <%= link_to( "+#{l(:label_message_new)}", new_board_message_path(@course.boards.first), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %> + <%= link_to( "+#{l(:label_message_new)}", course_boards_path(@course, :flag => true), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
<%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> diff --git a/public/javascripts/course.js b/public/javascripts/course.js index c0c761bfa..cc57279f0 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -527,3 +527,44 @@ function search_tag_attachment(url,tag_name,q,course_id,sort) } ); } + +// 课程讨论区 +function showhelpAndScrollToMessage(id, id1, count) { + $('#' + id).toggle(); + if(cookieget("repositories_visiable") == "true") + { + cookiesave("repositories_visiable", false,'','',''); + } + else + { + cookiesave("repositories_visiable", true,'','',''); + } + var information = $(id1); + var val = information.attr("value"); + if(val=="show_help") + { + $(id1).text("收起回复(" + count + ")" ); + information.attr("value", "hide_help"); + } + else + { + $(id1).text("展开回复(" + count + ")"); + information.attr("value", "show_help"); + } +} +function show_more_reply(contentid, id2, id3) { + $(contentid).toggleClass("course_description_none"); + var information = $(id2); + var arrow = $(id3); + var val = information.attr("value"); + if (val == "show_more") { + $(id2).text("[收起]"); + information.attr("value", "hide_more"); + arrow.attr("src", "/images/jiantouup.jpg") + } + else { + $(id2).text("[展开]"); + information.attr("value", "show_more"); + arrow.attr("src", "/images/jiantou.jpg") + } +} \ No newline at end of file