diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb index 148f45d2c..b0475097d 100644 --- a/app/controllers/blog_comments_controller.rb +++ b/app/controllers/blog_comments_controller.rb @@ -40,9 +40,10 @@ class BlogCommentsController < ApplicationController end def show @article = BlogComment.find(params[:id]) - all_comments = [] - @replies = get_all_children(all_comments, @article) + @replies = BlogComment.where("root_id = #{@article.id}").reorder("created_on desc") @reply_count = @replies.count + @replies = get_no_children_comments_all @replies + @limit_count = @replies.count @page = params[:page] ? params[:page].to_i + 1 : 0 @limit = 10 @replies = @replies[@page * @limit..@page * @limit + 9] diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 0c7eb570f..51fcdcc2d 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -50,6 +50,8 @@ class MessagesController < ApplicationController all_comments = [] @replies = Message.where("root_id = #{@topic.id}").reorder("created_on desc") @reply_count = @replies.count + @replies = get_no_children_comments_all @replies + @limit_count = @replies.count @page = params[:page] ? params[:page].to_i + 1 : 0 @limit = 10 @replies = @replies[@page * @limit..@page * @limit + 9] @@ -171,9 +173,6 @@ class MessagesController < ApplicationController @reply.root_id = parent.root_id.nil? ? parent.id : parent.root_id # @reply.reply_id = params[:id] parent.children << @reply - @user_activity_id = params[:user_activity_id] if params[:user_activity_id] - @is_course = params[:is_course] if params[:is_course] - @is_board = params[:is_board] if params[:is_board] else @quote = params[:quote][:quote] @reply = Message.new @@ -207,8 +206,8 @@ class MessagesController < ApplicationController end if params[:user_activity_id] @user_activity_id = params[:user_activity_id] - @is_course = params[:is_course] - @is_board = params[:is_board] + @is_course = params[:is_course] if params[:is_course] + @is_board = params[:is_board] if params[:is_board] respond_to do |format| format.js end @@ -282,8 +281,8 @@ class MessagesController < ApplicationController @message.destroy @topic = Message.find(params[:activity_id].to_i) @user_activity_id = params[:user_activity_id] - @is_course = params[:is_course] - @is_board = params[:is_board] + @is_course = params[:is_course] if params[:is_course] + @is_board = params[:is_board] if params[:is_board] respond_to do |format| format.js end diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 53afa50aa..aa037b8d5 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -172,6 +172,8 @@ class NewsController < ApplicationController @news = result[:news] @comments = result[:comments] @comments_count = @comments.count + @comments = get_no_children_comments_all @comments + @limit_count = @comments.count @page = params[:page] ? params[:page].to_i + 1 : 0 @limit = 10 @comments = @comments[@page * @limit..@page * @limit + 9] diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 49e970af7..6b8d11479 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -41,8 +41,10 @@ class OrgDocumentCommentsController < ApplicationController @org_subfield = OrgSubfield.where(:id => @document.org_subfield_id).first @subfield_content = @organization.org_subfields.order("priority") all_comments = [] - @replies = get_all_children(all_comments, @document) + @replies = OrgDocumentComment.where("root_id = #{@document.id}").reorder("created_at desc") @reply_count = @replies.count + @replies = get_no_children_comments_all @replies + @limit_count = @replies.count @page = params[:page] ? params[:page].to_i + 1 : 0 @limit = 10 @replies = @replies[@page * @limit..@page * @limit + 9] diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 13a1a1e58..09cede45a 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -601,6 +601,13 @@ class ProjectsController < ApplicationController def member_forked @forked_projects = Project.where(:forked_from_project_id => @project.id) + @limit = 20 + @is_remote = true + @forked_count = @project.forked_count + @forked_pages = Paginator.new @forked_count, @limit, params['page'] || 1 + @offset ||= @forked_pages.offset + @forked_projects = paginateHelper @forked_projects, @limit + # @forked_members = User.find_by_sql("SELECT u.* FROM `projects` p,`users` u where p.user_id = u.id and p.forked_from_project_id = #{@project.id} ;") end @@ -664,7 +671,13 @@ class ProjectsController < ApplicationController end def statistics - + @watchers = @project.watcher_users + @limit = 20 + @is_remote = true + @watchers_count = @watchers.count + @watcher_pages = Paginator.new @watchers_count, @limit, params['page'] || 1 + @offset ||= @watcher_pages.offset + @watchers = paginateHelper @watchers, 20 end #end @@ -972,14 +985,6 @@ class ProjectsController < ApplicationController else @users -= watched.watcher_users if @watched end - @watchers = @project.watcher_users - @limit = 20 - @is_remote = true - @watchers_count = @watchers.count - @watcher_pages = Paginator.new @watchers_count, @limit, params['page'] || 1 - @offset ||= @watcher_pages.offset - #@curse_attachments_all = @all_attachments[@offset, @limit] - @watchers = paginateHelper @watchers,20 end end diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb index cad65f88d..13bacbd4b 100644 --- a/app/controllers/syllabuses_controller.rb +++ b/app/controllers/syllabuses_controller.rb @@ -92,7 +92,7 @@ class SyllabusesController < ApplicationController def destroy if @syllabus && @syllabus.courses.not_deleted.empty? @syllabus.destroy - redirect_to user_courselist_user_path(User.current.id) + redirect_to user_courselist_user_path(User.current) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 049789115..262c014d3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -171,7 +171,6 @@ class UsersController < ApplicationController else @user_activity_id = -1 end - @hw_status = params[:hw_status].to_i when 'JournalsForMessage' @reply = JournalsForMessage.find params[:reply_id] @user_activity_id = params[:user_activity_id] @@ -181,15 +180,11 @@ class UsersController < ApplicationController @reply = Message.find params[:reply_id] @user_activity_id = params[:user_activity_id] @activity_id = params[:activity_id] - @is_course = params[:is_course] - @is_board = params[:is_board] @type = 'Message' when 'BlogComment' @reply = BlogComment.find params[:reply_id] @user_activity_id = params[:user_activity_id] @activity_id = params[:activity_id] - @homepage = params[:homepage] - @user_id = params[:user_id] @type = 'BlogComment' when 'OrgDocumentComment' @reply = OrgDocumentComment.find params[:reply_id] @@ -215,6 +210,96 @@ class UsersController < ApplicationController end end + #叠层回复框中的回复 + def reply_to_comment + @type = params[:type] + @reply = get_reply_by_type @type, params[:reply_id] + @user_activity_id = params[:user_activity_id] + @is_project = params[:is_project] if params[:is_project] + respond_to do |format| + format.js + end + end + + #多级回复 + def reply_detail + @type = params[:type] + reply = get_reply_by_type @type, params[:reply_id] + @user_activity_id = params[:user_activity_id] + case params[:type] + when 'HomeworkCommon' + @root = HomeworkCommon.find reply.jour_id + options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => User.current.id,:m_parent_id => params[:reply_id].to_i,:m_reply_id => params[:reply_id].to_i, :root_id => reply.root_id} + comment = HomeworkCommon.add_homework_jour(User.current, params[:reply_message], reply.jour_id, reply.root_id, options) + @root.update_column('updated_at', Time.now) + @is_teacher = User.current.allowed_to?(:as_teacher, @root.course) || User.current.admin? + when 'JournalsForMessage' + options = {:user_id => User.current.id, + :status => true, + :m_parent_id => params[:reply_id], + :m_reply_id => params[:reply_id], + :reply_id => reply.user.id, + :notes => params[:reply_message], + :root_id => reply.root_id, + :is_readed => false} + @root = reply.root + comment = add_reply_adapter(@root, options) + @root.update_attribute(:updated_on,Time.now) + when 'Message' + @root = reply.root + comment = Message.new + comment.author = User.current + comment.board = reply.board + comment.content = params[:reply_message] + comment.subject = "RE: #{@root.subject}" + comment.reply_id = params[:reply_id] + comment.root_id = reply.root_id + reply.children << comment + @is_project = params[:is_project] if params[:is_project] + when 'BlogComment' + @root = reply.root + comment = BlogComment.new + comment.author = User.current + comment.blog = reply.blog + comment.title = "RE: #{@root.title}" + comment.content = params[:reply_message] + comment.reply_id = params[:reply_id] + comment.root_id = reply.root_id + reply.children << comment + when 'OrgDocumentComment' + @root = reply.root + comment = OrgDocumentComment.new(:creator_id => User.current.id, :reply_id => params[:reply_id]) + comment.title = "RE:#{@root.title}" + comment.content = params[:reply_message] + comment.root_id = reply.root_id + reply.children << comment + when 'News' + @root = News.find reply.commented_id + comment = @root.comments.build(:author_id => User.current.id, :reply_id => params[:reply_id], :comments => params[:reply_message], :parent_id => reply.id) + comment.save + when 'Issue' + @root = reply.issue + comment = @root.journals.build(:user_id => User.current.id, :reply_id => params[:reply_id], :notes => params[:reply_message], :parent_id => reply.id) + comment.save + @is_project = params[:is_project] if params[:is_project] + when 'Syllabus' + @root = Syllabus.find reply.jour_id + options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => User.current.id,:m_parent_id => params[:reply_id].to_i,:m_reply_id => params[:reply_id].to_i, :root_id => reply.root_id} + comment = Syllabus.add_syllabus_jour(User.current, params[:reply_message], reply.jour_id, reply.root_id, options) + @root.update_column('updated_at', Time.now) + @count = @root.journals_for_messages.count + @comments = @root.journals_for_messages.reorder("created_on desc").limit(3) + end + update_course_activity(@root.class.to_s,@root.id) + update_user_activity(@root.class.to_s,@root.id) + update_forge_activity(@root.class.to_s,@root.id) + update_org_activity(@root.class.to_s,@root.id) + update_principal_activity(@root.class.to_s,@root.id) + respond_to do |format| + format.js + end + end + def refresh_changests if !(@user.nil?) && !(@user.memberships.nil?) @user.memberships.each do |member| @@ -3398,7 +3483,11 @@ class UsersController < ApplicationController @my_syllabuses = @user.syllabuses - my_syllabus_ids = @my_syllabuses.empty? ? "(-1)" : "(" + @my_syllabuses.map{|syllabus| syllabus.id}.join(',') + ")" + if @user == User.current + archive_ids = Course.where("tea_id = #{@user.id} and is_delete = 1").blank? ? "(-1)" : "(" + Course.where("tea_id = #{@user.id} and is_delete = 1").map{|course| course.syllabus_id}.join(",") + ")" + @archive_syllabuses = Syllabus.where("id in #{archive_ids}") + end + sy_courses = @user.courses.visible.not_deleted syllabus_ids = sy_courses.empty? ? '(-1)' : "(" + sy_courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")" syllabus_members = SyllabusMember.where("user_id = #{@user.id}") @@ -3470,11 +3559,58 @@ class UsersController < ApplicationController end end + #归档班级列表 + def user_archive_courses + if User.current.logged? + @order, @c_sort, @type = params[:order] || 1, params[:sort] || 1, params[:type] || 1 + + #确定 sort_type + if @order.to_i == @type.to_i + @c_sort = @c_sort.to_i == 1 ? 2 : 1 #1升序 2降序 + else + @c_sort = 2 + end + + @user = User.current + sort_name = "updated_at" + archive_ids = Course.where("tea_id = #{@user.id} and is_delete = 1").blank? ? "(-1)" : "(" + Course.where("tea_id = #{@user.id} and is_delete = 1").map{|course| course.syllabus_id}.join(",") + ")" + @archive_syllabuses = Syllabus.where("id in #{archive_ids}") + + if @order.to_i == 1 #根据 班级更新时间排序 + @archive_syllabuses = syllabus_course_list_sort @archive_syllabuses + @c_sort == 1 ? (@archive_syllabuses = @archive_syllabuses.sort{|x,y| x[:last_update] <=> y[:last_update] }) : (@archive_syllabuses = @archive_syllabuses.sort{|x,y| y[:last_update] <=> x[:last_update]}) + @type = 1 + elsif @order.to_i == 2 #根据 作业+资源数排序 + @type = 2 + @archive_syllabuses.each do |syllabus| + count = 0 + courses = syllabus.courses.not_deleted + courses.each do |c| + count += (User.current.admin? || User.current.allowed_to?(:as_teacher,c)) ? (c.homework_commons.count + visable_attachemnts_incourse(c).count) : (c.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(c).count) + end + syllabus[:infocount] = count + end + @c_sort == 1 ? (@archive_syllabuses = @archive_syllabuses.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@archive_syllabuses = @archive_syllabuses.sort{|x,y| y[:infocount] <=> x[:infocount]}) + @archive_syllabuses = sortby_time_countcommon_nosticky @archive_syllabuses,sort_name + else + @type = 1 + end + respond_to do |format| + format.js + format.html {render :layout => 'new_base_user'} + end + end + end + #展开课程下的班级 def expand_courses @syllabus = Syllabus.where("id = #{params[:syllabus_id]}").first unless @syllabus.nil? - @courses = @syllabus.courses.not_deleted.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") + if params[:is_delete] && params[:is_delete] == '1' + @courses = @syllabus.courses.where("is_delete = 1").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") + else + @courses = @syllabus.courses.not_deleted.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") + end respond_to do |format| format.js end @@ -3567,18 +3703,12 @@ class UsersController < ApplicationController if params[:type].present? case params[:type] when 'OrgDocumentComment' - #obj = OrgDocumentComment.where('id = ?', params[:id].to_i).first @user_activity_id = params[:div_id].to_i if params[:div_id] @type = 'OrgDocumentComment' - #comments = [] @journals = OrgDocumentComment.where("root_id = #{params[:id].to_i}").reorder("created_at desc") when 'Message','is_project_message' - #obj = Message.where('id = ?', params[:id].to_i).first @type = 'Message' - @is_course = params[:is_course] - @is_board = params[:is_board] @user_activity_id = params[:div_id].to_i if params[:div_id] - #comments = [] @journals = Message.where("root_id = #{params[:id].to_i}").reorder("created_on desc") when 'News' obj = News.where('id = ?', params[:id].to_i).first @@ -3591,8 +3721,6 @@ class UsersController < ApplicationController @type = 'Syllabus' @user_activity_id = params[:div_id].to_i if params[:div_id] when 'JournalsForMessage' - #obj = JournalsForMessage.where('id = ?', params[:id].to_i).first - #journals = [] @journals = JournalsForMessage.where("root_id = #{params[:id].to_i}").reorder("created_on desc") @type = 'JournalsForMessage' @user_activity_id = params[:div_id].to_i if params[:div_id] @@ -3609,20 +3737,17 @@ class UsersController < ApplicationController when 'BlogComment' obj = BlogComment.where('id = ?', params[:id].to_i).first @user_activity_id = params[:div_id].to_i if params[:div_id] - @homepage = params[:homepage].to_i @type = 'BlogComment' - @user_id = obj.author_id - #comments = [] @journals = BlogComment.where("root_id = #{params[:id].to_i}").reorder("created_on desc") when 'HomeworkCommon' obj = HomeworkCommon.where('id = ?', params[:id].to_i).first @type = 'HomeworkCommon' @journals = obj.journals_for_messages.reorder("created_on desc") - @hw_status = params[:hw_status].to_i if params[:hw_status] @is_teacher = User.current.allowed_to?(:as_teacher,obj.course) @user_activity_id = params[:user_activity_id].to_i if params[:user_activity_id] end end + @journals = get_no_children_comments_all @journals end def homepage diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index e4b480e2f..2ce505e15 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -116,7 +116,7 @@ class WordsController < ApplicationController else @user_activity_id = -1 end - @hw_status = params[:hw_status].to_i + @hw_status = params[:hw_status].to_i if @is_teacher = User.current.allowed_to?(:as_teacher, @homework.course) || User.current.admin? elsif @journal_destroyed.jour_type == 'Syllabus' @syllabus = Syllabus.find @journal_destroyed.jour_id @@ -315,7 +315,7 @@ class WordsController < ApplicationController respond_to do |format| format.js{ @user_activity_id = params[:user_activity_id].to_i - @hw_status = params[:hw_status].to_i + @hw_status = params[:hw_status].to_i if params[:hw_status] @is_teacher = User.current.allowed_to?(:as_teacher, @homework_common.course) || User.current.admin? } end @@ -349,7 +349,7 @@ class WordsController < ApplicationController respond_to do |format| format.js{ @user_activity_id = params[:user_activity_id].to_i - @hw_status = params[:hw_status].to_i + @hw_status = params[:hw_status].to_i if params[:hw_status] @is_teacher = User.current.allowed_to?(:as_teacher, @homework_common.course) || User.current.admin? } end @@ -454,45 +454,5 @@ class WordsController < ApplicationController end obj end - - def add_reply_adapter obj, options - #modify by nwb - #添加对课程留言的支持 - #留言回复应该不关系其所属的Class，而关心的是其所属的父留言 - case obj.jour_type - when 'Principal' - obj.jour.add_jour(nil, nil, nil, options) - when 'Project' - Project.add_new_jour(nil, nil, obj.jour_id, options) - when 'Course' - Course.add_new_jour(nil, nil, obj.jour_id, options) - when 'Bid' - obj.jour.add_jour(nil, nil, nil, options) - when 'Contest' - obj.jour.add_jour(nil, nil, obj.jour_id, options) - when 'Softapplication' - obj.jour.add_jour(nil, nil, obj.jour_id, options) - when 'HomeworkAttach' - obj.jour.add_jour(nil, nil, obj.jour_id, options) - end - # obj = obj_distinguish_url_origin || User.find_by_id(2) - # if obj.kind_of? User - # obj.add_jour(nil, nil, nil, options) - # elsif obj.kind_of? Project - # Project.add_new_jour(nil, nil, obj.id, options) - # elsif obj.kind_of? Course - # Course.add_new_jour(nil, nil, obj.id, options) - # elsif obj.kind_of? Bid - # obj.add_jour(nil, nil, nil, options) - # elsif obj.kind_of? Contest - # obj.add_jour(nil, nil, obj.id, options) #new added - # elsif obj.kind_of? Softapplication - # obj.add_jour(nil, nil, obj.id, options) #new added - # elsif obj.kind_of? HomeworkAttach - # obj.add_jour(nil, nil, obj.id, options) #new added - # else - # raise "create reply obj unknow type.#{obj.class}" - # end - end #######end of message end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c52182b01..ad3d2c61d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3394,6 +3394,61 @@ def secdomain_with_protocol secdomain return Setting.protocol + "://" + secdomain + ".trustie.net" end +#根据回复类型获取回复 +def get_reply_by_type type, reply_id + reply = nil + case type + when 'HomeworkCommon' + reply = JournalsForMessage.find reply_id + when 'JournalsForMessage' + reply = JournalsForMessage.find reply_id + when 'Message' + reply = Message.find reply_id + when 'BlogComment' + reply = BlogComment.find reply_id + when 'OrgDocumentComment' + reply = OrgDocumentComment.find reply_id + when 'News' + reply = Comment.find reply_id + when 'Issue' + reply = Journal.find reply_id + when 'Syllabus' + reply = JournalsForMessage.find reply_id + end + reply +end + +#获取不包含子节点的回复(前三个) +def get_no_children_comments comments + result = {} + no_children_comments = [] + count = 0 + three_more = false + comments.each do |comment| + if comment.children.blank? + count = count + 1 + if count > 3 + three_more = true + end + break if count > 3 + no_children_comments << comment + end + end + result[:three_more] = three_more + result[:no_children_comments] = no_children_comments + result +end + +#获取不包含子节点的回复(所有) +def get_no_children_comments_all comments + no_children_comments = [] + comments.each do |comment| + if comment.children.blank? + no_children_comments << comment + end + end + no_children_comments +end #获取回复的所有父节点 def get_reply_parents parents_rely, comment @@ -3746,3 +3801,43 @@ def homework_type_option type end +def add_reply_adapter obj, options + #modify by nwb + #添加对课程留言的支持 + #留言回复应该不关系其所属的Class，而关心的是其所属的父留言 + case obj.jour_type + when 'Principal' + obj.jour.add_jour(nil, nil, nil, options) + when 'Project' + Project.add_new_jour(nil, nil, obj.jour_id, options) + when 'Course' + Course.add_new_jour(nil, nil, obj.jour_id, options) + #when 'Bid' + # obj.jour.add_jour(nil, nil, nil, options) + #when 'Contest' + # obj.jour.add_jour(nil, nil, obj.jour_id, options) + #when 'Softapplication' + # obj.jour.add_jour(nil, nil, obj.jour_id, options) + #when 'HomeworkAttach' + # obj.jour.add_jour(nil, nil, obj.jour_id, options) + end + # obj = obj_distinguish_url_origin || User.find_by_id(2) + # if obj.kind_of? User + # obj.add_jour(nil, nil, nil, options) + # elsif obj.kind_of? Project + # Project.add_new_jour(nil, nil, obj.id, options) + # elsif obj.kind_of? Course + # Course.add_new_jour(nil, nil, obj.id, options) + # elsif obj.kind_of? Bid + # obj.add_jour(nil, nil, nil, options) + # elsif obj.kind_of? Contest + # obj.add_jour(nil, nil, obj.id, options) #new added + # elsif obj.kind_of? Softapplication + # obj.add_jour(nil, nil, obj.id, options) #new added + # elsif obj.kind_of? HomeworkAttach + # obj.add_jour(nil, nil, obj.id, options) #new added + # else + # raise "create reply obj unknow type.#{obj.class}" + # end +end + diff --git a/app/views/blog_comments/_blog_comment_show_replies.html.erb b/app/views/blog_comments/_blog_comment_show_replies.html.erb index ba33aaf5a..3a3e8ef81 100644 --- a/app/views/blog_comments/_blog_comment_show_replies.html.erb +++ b/app/views/blog_comments/_blog_comment_show_replies.html.erb @@ -10,7 +10,7 @@ <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
- <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%> + <%= render :partial => 'users/message_contents', :locals => {:comment => comment, :type => 'BlogComment', :user_activity_id => @article.id}%> <% if !comment.content_detail.blank? %>
@@ -52,7 +52,7 @@
<% end %> -<% if @reply_count > @page * @limit + 10 %> +<% if @limit_count > @page * @limit + 10 %>
↓ diff --git a/app/views/blog_comments/destroy.js.erb b/app/views/blog_comments/destroy.js.erb index 52ecbb925..ffdc27c22 100644 --- a/app/views/blog_comments/destroy.js.erb +++ b/app/views/blog_comments/destroy.js.erb @@ -1,7 +1,8 @@ -<% if @in_user_homepage %> - <% homepage = BlogComment.find(@user.blog.homepage_id) %> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/homepage', :locals => {:activity => @blog_comment, :user_activity_id => homepage.id}) %>"); -<% else%> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @blog_comment,:user_activity_id =>@user_activity_id}) %>"); -<% end %> +<%# if @in_user_homepage %> + <%# homepage = BlogComment.find(@user.blog.homepage_id) %> + //$("#user_activity_<%#= @user_activity_id%>").replaceWith("<%#= escape_javascript(render :partial => 'blogs/homepage', :locals => {:activity => @blog_comment, :user_activity_id => homepage.id}) %>"); +<%# else%> + //$("#user_activity_<%#= @user_activity_id%>").replaceWith("<%#= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @blog_comment,:user_activity_id =>@user_activity_id}) %>"); +<%# end %> +$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/user_blog_post_reply', :locals => {:activity => @blog_comment,:user_activity_id =>@user_activity_id}) %>"); sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", 'UserActivity'); \ No newline at end of file diff --git a/app/views/blog_comments/reply.js.erb b/app/views/blog_comments/reply.js.erb index f612cfe98..3fb9f4c54 100644 --- a/app/views/blog_comments/reply.js.erb +++ b/app/views/blog_comments/reply.js.erb @@ -1,11 +1,12 @@ -<% if @in_user_homepage %> - <% homepage = BlogComment.find(@user.blog.homepage_id) %> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id}) %>"); -<% elsif @in_user_center%> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>"); +<%# if @in_user_homepage %> + <%# homepage = BlogComment.find(@user.blog.homepage_id) %> + //$("#user_activity_<%#= @user_activity_id%>").replaceWith("<%#= escape_javascript(render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id}) %>"); +<%# elsif @in_user_center%> + //$("#user_activity_<%#= @user_activity_id%>").replaceWith("<%#= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>"); // init_activity_KindEditor_data(<%#= @user_activity_id%>,"","87%", 'UserActivity'); -<% else%> -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>"); +<%# else%> +//$("#user_activity_<%#= @user_activity_id%>").replaceWith("<%#= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>"); //init_activity_KindEditor_data(<%#= @user_activity_id%>,"","87%", 'UserActivity'); -<% end %> +<%# end %> +$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/user_blog_post_reply', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>"); sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", 'UserActivity'); \ No newline at end of file diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 144560388..8195e5ee3 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -109,9 +109,7 @@
- <% all_comments = []%> - <% all_replies = BlogComment.where("root_id = #{@article.id}").reorder("created_on desc") %> - <% count= all_replies.count %> +
回复 @@ -124,7 +122,6 @@
- <%# comments = all_replies %> <% if @reply_count > 0 %>
<%= render :partial => 'blog_comment_show_replies' %> diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 8ddc3062d..9e13cbafc 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -1,7 +1,7 @@
-

博客列表

+

博客列表

排序： <%= link_to "时间", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> @@ -21,9 +21,9 @@
  • <% if activity.parent_id.nil? %> - <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=> activity.author, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl" %> + <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=> activity.author, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title-normal fl" %> <% else %> - <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl"%> + <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title-normal fl"%> <% end %> <%# if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> @@ -36,7 +36,8 @@ <% end %>
    • - <% count=BlogComment.where("root_id = #{activity.id}").count%>
  • + <% count=BlogComment.where("root_id = #{activity.id}").count%> +
  • 发布：<%= format_time(activity.created_on) %> 更新：<%= format_time(activity.updated_on) %>

    diff --git a/app/views/blogs/_homepage.html.erb b/app/views/blogs/_homepage.html.erb index 6b40a23da..2b921c7a4 100644 --- a/app/views/blogs/_homepage.html.erb +++ b/app/views/blogs/_homepage.html.erb @@ -45,16 +45,15 @@

- <% all_comments = []%> <% all_repies = BlogComment.where("root_id = #{activity.id}").reorder("created_on desc") %> <% count = all_repies.count %> + <% no_children_comments = get_no_children_comments all_repies %>
- <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 1} %> + <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 1, :expand_more =>no_children_comments[:three_more]} %> - <% comments = all_repies[0..2] %> <% if count > 0 %>
- <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 1, :user_id => activity.author_id}%> + <%= render :partial => 'users/message_replies', :locals => {:comments => no_children_comments[:no_children_comments], :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 1, :user_id => activity.author_id}%>
<% end %> diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb index e8f425a85..1df37cd43 100644 --- a/app/views/comments/destroy.js.erb +++ b/app/views/comments/destroy.js.erb @@ -2,7 +2,7 @@ <% if @news.project_id && @news.project_id != -1 %> $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); <% elsif @news.course_id %> - $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); + $("#activity_post_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/course_news_post_reply', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); <% elsif @news.org_subfield_id %> $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); <% end %> diff --git a/app/views/comments/reply.js.erb b/app/views/comments/reply.js.erb index e8f425a85..1df37cd43 100644 --- a/app/views/comments/reply.js.erb +++ b/app/views/comments/reply.js.erb @@ -2,7 +2,7 @@ <% if @news.project_id && @news.project_id != -1 %> $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); <% elsif @news.course_id %> - $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); + $("#activity_post_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/course_news_post_reply', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); <% elsif @news.org_subfield_id %> $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); <% end %> diff --git a/app/views/courses/archive_course.js.erb b/app/views/courses/archive_course.js.erb index 9d66c8441..a5ef39035 100644 --- a/app/views/courses/archive_course.js.erb +++ b/app/views/courses/archive_course.js.erb @@ -13,5 +13,11 @@ function click_OK(){ hideModal(); <% if params[:source] == "1" %> window.location.href = "<%=syllabus_courselist_syllabus_path(@syllabus, :list_type => params[:type].to_i) %>"; + <% elsif params[:source] == "0" %> + <% if params[:type] == "0" %> + window.location.href = "<%=user_courselist_user_path(User.current) %>"; + <% else %> + window.location.href = "<%=user_archive_courses_users_path() %>"; + <% end %> <% end %> } \ No newline at end of file diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index 2d2eecab1..606c0d67c 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -4,7 +4,7 @@

<%= @subPage_title%>

<% if User.current.allowed_to?(:as_teacher,@course) %> - <%=link_to "成员管理", :controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member', :class => 'hw_more_li' %> + <%=link_to "成员管理", {:controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member'}, :class => 'hw_more_li' %> <% end %>
@@ -13,21 +13,12 @@ <% else %>
-

<%= @subPage_title %>

-
-
    -
  • -
      -
    • <%= link_to l(:label_export_excel), export_course_member_excel_course_path(@course,:format => 'xls'), :class => 'hw_more_li'%>
      • - <% if User.current.allowed_to?(:as_teacher,@course) %> -
    • - <%=link_to "成员管理", {:controller => 'courses', :action => 'settings', :id => @course.id, :tab => 'member'}, :class => 'hw_more_li' %> -
      • - <% end %> -
    -
    • -
-
+

<%= @subPage_title %>

+ <% if User.current.allowed_to?(:as_teacher,@course) %> + <%=link_to "成员管理", {:controller => 'courses', :action => 'settings', :id => @course.id, :tab => 'member'}, :class => 'link-blue ml10 fr mt5' %> + <% end %> + <%= link_to l(:label_export_excel), export_course_member_excel_course_path(@course,:format => 'xls'), :class => 'link-blue fr mt5'%> +
<%= render :partial => 'course_student', :locals => {:members => @members} %>
diff --git a/app/views/courses/teacher_assign_group.js.erb b/app/views/courses/teacher_assign_group.js.erb index 4df0924ea..503c530cd 100644 --- a/app/views/courses/teacher_assign_group.js.erb +++ b/app/views/courses/teacher_assign_group.js.erb @@ -1,5 +1,9 @@ <% if params[:group_id] != "0" %> -$("#member_li_<%=@member.id %>").html(""); +var all_indexes = $("#member_li_<%=@member.id %>").nextAll().find("td:first-child"); +for(var i = 0; i < all_indexes.length; i++){ + $(all_indexes[i]).html(parseInt($(all_indexes[i]).html()) - 1); +} +$("#member_li_<%=@member.id %>").remove(); <% end %> <% if @group && @group != "-1" %> //$("#member_content").html("<%#= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @results})%>"); diff --git a/app/views/exercise/_show_head.html.erb b/app/views/exercise/_show_head.html.erb index 8a0c182ce..4cc5a6cf8 100644 --- a/app/views/exercise/_show_head.html.erb +++ b/app/views/exercise/_show_head.html.erb @@ -11,8 +11,6 @@ 测验时长：<%= exercise.time %>分钟 <% end %>
- 
-    <%= exercise.exercise_description.nil? ? "" :exercise.exercise_description.html_safe%>
-
+ 
<%= exercise.exercise_description.nil? ? "" :exercise.exercise_description.html_safe%>
\ No newline at end of file diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb index baf46762c..e67040138 100644 --- a/app/views/issues/_issue_replies.html.erb +++ b/app/views/issues/_issue_replies.html.erb @@ -11,7 +11,7 @@ <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
- <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%> + <%= render :partial => 'users/news_contents', :locals => {:comment => comment, :type => 'Issue', :user_activity_id => issue.id}%>
<% if comment.details.any? %> diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 2f3ef2928..316d10c4c 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -140,25 +140,25 @@
- + 动态
<% if @center_flag %>
- + 我的课程 (<%=@user.courses.count%>)
- + 我的项目 (<%=@user.projects.count%>)
- + 我的资源库 (<%=Attachment.where("(author_id = #{@user.id} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) or (container_type = 'Course' and container_id in (#{@user.courses.map{|c| c.id}.empty? ? '0' : @user.courses.map{|c| c.id}.join(',')}))").count%>) @@ -166,13 +166,13 @@ <% else%>
- + TA的课程 (<%=@user.courses.visible.count%>)
- + TA的项目 (<%=@user.projects.visible.count%>) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 7846efa18..d55da37b2 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -162,8 +162,8 @@ <% if hidden_unproject_infos %>
  • - <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %> - <%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user.id}, :style => "color:#aaa;" %> + <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %> + <%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user}, :style => "color:#aaa;" %> <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
    <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %> @@ -181,7 +181,7 @@
    • <% if @user == User.current %>
  • - <%=link_to '我的作业', my_homeworks_user_path(@user.id), :target => "_blank", :style => "font-size:14px;" %> + <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
    • <% end %> <% end %> @@ -190,8 +190,8 @@
    • - <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :id => 'user_project_list'%> - <%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :style => "color:#aaa;" %> + <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list'%> + <%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user}, :style => "color:#aaa;" %> <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
      <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %> diff --git a/app/views/messages/_course_show_replies.html.erb b/app/views/messages/_course_show_replies.html.erb index ad715df20..e56d19406 100644 --- a/app/views/messages/_course_show_replies.html.erb +++ b/app/views/messages/_course_show_replies.html.erb @@ -10,7 +10,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
      - <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%> + <%= render :partial => 'users/message_contents', :locals => {:comment => reply, :type => 'Message', :user_activity_id => @topic.id}%>
      <%= reply.content.html_safe%> @@ -49,7 +49,7 @@
      <% end %> -<% if @reply_count > @page * @limit + 10 %> +<% if @limit_count > @page * @limit + 10 %>
      ↓ diff --git a/app/views/messages/_org_show_replies.html.erb b/app/views/messages/_org_show_replies.html.erb index fbde35fcf..df1b2c301 100644 --- a/app/views/messages/_org_show_replies.html.erb +++ b/app/views/messages/_org_show_replies.html.erb @@ -10,7 +10,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33, :height => 33), user_path(reply.author) %>
      - <%= render :partial => 'users/message_contents', :locals => {:comment => reply} %> + <%= render :partial => 'users/message_contents', :locals => {:comment => reply, :type => 'Message', :user_activity_id => @topic.id} %>
      <%= reply.content.html_safe %> @@ -48,7 +48,7 @@
      <% end %> -<% if @reply_count > @page * @limit + 10 %> +<% if @limit_count > @page * @limit + 10 %>
      ↓ diff --git a/app/views/messages/_project_show_replies.html.erb b/app/views/messages/_project_show_replies.html.erb index 8a4b615da..b2f22aecb 100644 --- a/app/views/messages/_project_show_replies.html.erb +++ b/app/views/messages/_project_show_replies.html.erb @@ -10,7 +10,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
      - <%= render :partial => 'projects/project_message_contents', :locals => {:comment => reply}%> + <%= render :partial => 'projects/project_message_contents', :locals => {:comment => reply, :user_activity_id => @topic.id}%>
      <%= reply.content.html_safe%> @@ -49,7 +49,7 @@
      <% end %> -<% if @reply_count > @page * @limit + 10 %> +<% if @limit_count > @page * @limit + 10 %>
      ↓ diff --git a/app/views/messages/destroy.js.erb b/app/views/messages/destroy.js.erb index 6967e0b6f..8c269c1c3 100644 --- a/app/views/messages/destroy.js.erb +++ b/app/views/messages/destroy.js.erb @@ -2,12 +2,12 @@ <% if params[:is_project] %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/act_messages', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>"); <% else %> -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>"); +$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/course_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <% end %> <%elsif @course%> -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>"); +$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/course_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <% elsif @org_subfield %> -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); +$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'organizations/org_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <%end%> -sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "UserActivity"); \ No newline at end of file +sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "UserActivity"); diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb index 6967e0b6f..8c269c1c3 100644 --- a/app/views/messages/reply.js.erb +++ b/app/views/messages/reply.js.erb @@ -2,12 +2,12 @@ <% if params[:is_project] %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/act_messages', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>"); <% else %> -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>"); +$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/course_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <% end %> <%elsif @course%> -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>"); +$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/course_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <% elsif @org_subfield %> -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); +$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'organizations/org_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <%end%> -sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "UserActivity"); \ No newline at end of file +sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "UserActivity"); diff --git a/app/views/news/_news_replies_detail.html.erb b/app/views/news/_news_replies_detail.html.erb index f79bbdfc0..924a6a329 100644 --- a/app/views/news/_news_replies_detail.html.erb +++ b/app/views/news/_news_replies_detail.html.erb @@ -10,7 +10,7 @@ <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
      - <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%> + <%= render :partial => 'users/news_contents', :locals => {:comment => comment, :type => 'News', :user_activity_id => @news.id}%> <% if !comment.content_detail.blank? %>
      @@ -52,7 +52,7 @@
      • <% end %> -<% if @comments_count > @page * @limit + 10 %> +<% if @limit_count > @page * @limit + 10 %>
      ↓ diff --git a/app/views/org_document_comments/_document_show_replies.html.erb b/app/views/org_document_comments/_document_show_replies.html.erb index 9032edce6..c3faef645 100644 --- a/app/views/org_document_comments/_document_show_replies.html.erb +++ b/app/views/org_document_comments/_document_show_replies.html.erb @@ -11,7 +11,7 @@ <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
      - <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%> + <%= render :partial => 'users/message_contents', :locals => {:comment => comment, :type => 'OrgDocumentComment', :user_activity_id => @document.id}%> <% if !comment.content_detail.blank? %>
      @@ -53,7 +53,7 @@ <% end %>
      -<% if @reply_count > @page * @limit + 10 %> +<% if @limit_count > @page * @limit + 10 %>
      ↓ diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb index 86ef7e857..a544f6cc7 100644 --- a/app/views/org_document_comments/destroy.js.erb +++ b/app/views/org_document_comments/destroy.js.erb @@ -1,6 +1,6 @@ //location.reload(); <% if @act %> - $("#organization_document_<%= @document.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => 2, :act => @act}) %>"); + $("#activity_post_reply_<%= @act.id %>").html("<%= escape_javascript(render :partial => 'organizations/org_document_post_reply', :locals => {:activity => @document, :user_activity_id => @act.id}) %>"); sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>"); <% elsif params[:detail_page] %> window.location.href = '<%= organization_path(params[:organization_id],:org_subfield_id => @org_sub_id )%>'; diff --git a/app/views/org_document_comments/reply.js.erb b/app/views/org_document_comments/reply.js.erb index f12bf0e8d..b9f6622ae 100644 --- a/app/views/org_document_comments/reply.js.erb +++ b/app/views/org_document_comments/reply.js.erb @@ -1,4 +1,4 @@ <% if @user_activity_id %> -$("#organization_document_<%= @document.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => 2, :act => @act}) %>"); +$("#activity_post_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'organizations/org_document_post_reply', :locals => {:activity => @document, :user_activity_id => @user_activity_id}) %>"); <% end %> sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>"); diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index a8ce5b289..7111c1b21 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -74,9 +74,6 @@ <% end %>
      - <% all_comments = []%> - <% all_replies = OrgDocumentComment.where("root_id = #{@document.id}").reorder("created_at desc") %> - <% count = all_replies.count %>
      <%# if count > 0 %> @@ -89,7 +86,6 @@
      - <%# comments = all_replies %>
      <%= render :partial => "document_show_replies" %>
      diff --git a/app/views/organizations/_org_document_post_reply.html.erb b/app/views/organizations/_org_document_post_reply.html.erb new file mode 100644 index 000000000..84e6bb67e --- /dev/null +++ b/app/views/organizations/_org_document_post_reply.html.erb @@ -0,0 +1,33 @@ +<% all_replies = OrgDocumentComment.where("root_id = #{activity.id}").reorder("created_at desc") %> +<% count = all_replies.count %> +<% no_children_comments = get_no_children_comments all_replies %> +<%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :expand_more =>no_children_comments[:three_more]} %> + +<% if count > 0 %> +
      + <%= render :partial => 'users/message_replies', :locals => {:comments => no_children_comments[:no_children_comments], :user_activity_id => user_activity_id, :type => 'OrgDocumentComment', :activity_id =>activity.id}%> +
      +<% end %> + +
      +
      + <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current.id) %> +
      +
      + <% if User.current.logged? %> +
      + <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => activity.id, :act_id => user_activity_id, :flag => 2), :method => "post", :remote => true) do |f| %> +
      + + + +
      +

      + <% end %> +
      + <% else %> + <%= render :partial => "users/show_unlogged" %> + <% end %> +
      +
      +
      \ No newline at end of file diff --git a/app/views/organizations/_org_message_post_reply.html.erb b/app/views/organizations/_org_message_post_reply.html.erb new file mode 100644 index 000000000..0684a57da --- /dev/null +++ b/app/views/organizations/_org_message_post_reply.html.erb @@ -0,0 +1,35 @@ +<% all_replies = Message.where("root_id = #{activity.id}").reorder("created_on desc") %> +<% count = all_replies.count %> +<% no_children_comments = get_no_children_comments all_replies %> +<%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :expand_more =>no_children_comments[:three_more]} %> + +<% if count > 0 %> +
      + <%= render :partial => 'users/message_replies', :locals => {:comments => no_children_comments[:no_children_comments], :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id}%> +
      +<% end %> +<% if !activity.locked? && authorize_for_course('messages', 'reply') %> +
      +
      <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
      +
      + <% if User.current.logged? %> +
      + <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id},:method => "post", :remote => true) do |f|%> + + +
      + + +
      +

      + <% end%> +
      +
      + <% else %> + <%= render :partial => "users/show_unlogged" %> + <% end %> +
      +
      +
      +
      +<% end %> diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb index 353e9903e..f91acc268 100644 --- a/app/views/organizations/_org_subfield_message.html.erb +++ b/app/views/organizations/_org_subfield_message.html.erb @@ -69,42 +69,11 @@
- <% all_comments = []%> - <% all_replies = OrgDocumentComment.where("root_id = #{activity.id}").reorder("created_at desc") %> - <% count = all_replies.count %> +
- <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => 0,:is_board =>0} %> - - <% comments = all_replies[0..2] %> - <% if count > 0 %> -
- <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => 0, :is_board =>0}%> -
- <% end %> - -
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-
- <% if User.current.logged? %> -
- <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id,:is_course => 0, :is_board => 0},:method => "post", :remote => true) do |f|%> - - -
- - -
-

- <% end%> -
- <% else %> - <%= render :partial => "users/show_unlogged" %> - <% end %> -
-
-
+
+ <%=render :partial => 'organizations/org_message_post_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
-
\ No newline at end of file diff --git a/app/views/syllabuses/_syllabus_post_reply.html.erb b/app/views/syllabuses/_syllabus_post_reply.html.erb new file mode 100644 index 000000000..8f84edfb0 --- /dev/null +++ b/app/views/syllabuses/_syllabus_post_reply.html.erb @@ -0,0 +1,31 @@ +<% count=activity.journals_for_messages.count %> +<% comments = activity.journals_for_messages.reorder("created_on desc") %> +<% no_children_comments = get_no_children_comments comments %> + +<%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :expand_more =>no_children_comments[:three_more]} %> + +<% if count > 0 %> +
+ <%=render :partial => 'users/news_replies', :locals => {:comments => no_children_comments[:no_children_comments], :type => 'Syllabus', :activity_id => activity.id, :user_activity_id => user_activity_id} %> +
+<% end %> +
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
+
+ <% if User.current.logged? %> +
+ <%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_syllabus_message', :id => activity.id},:method => "post") do |f|%> +
+ + +
+

+ <% end%> +
+ <% else %> + <%= render :partial => "users/show_unlogged" %> + <% end %> +
+
+
+
\ No newline at end of file diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index 60b1598c0..3ad4350bb 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -62,35 +62,10 @@
<% end %> - <% count=@syllabus.journals_for_messages.count %> -
- <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => @syllabus, :user_activity_id => @syllabus.id} %> - <% comments = @syllabus.journals_for_messages.reorder("created_on desc").limit(3) %> - <% if count > 0 %> -
- <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'Syllabus', :activity_id => @syllabus.id} %> -
- <% end %> -
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
- <% if User.current.logged? %> -
- <%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_syllabus_message', :id => @syllabus.id},:method => "post") do |f|%> -
- - -
-

- <% end%> -
- <% else %> - <%= render :partial => "users/show_unlogged" %> - <% end %> -
-
-
+
+
+ <%=render :partial => 'syllabuses/syllabus_post_reply', :locals => {:activity => @syllabus, :user_activity_id => @syllabus.id} %>
diff --git a/app/views/users/_comment_reply.html.erb b/app/views/users/_comment_reply.html.erb index 77dcea1f2..bda163005 100644 --- a/app/views/users/_comment_reply.html.erb +++ b/app/views/users/_comment_reply.html.erb @@ -1,8 +1,8 @@
<% unless comment.parent.nil? %>
- <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %> + <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent, :type => type, :user_activity_id => user_activity_id} %>
<% end %> - <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => comment} %> + <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => comment, :type => type, :user_activity_id => user_activity_id} %>
\ No newline at end of file diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb index 7ff26adc9..59da7f051 100644 --- a/app/views/users/_comment_reply_detail.html.erb +++ b/app/views/users/_comment_reply_detail.html.erb @@ -4,7 +4,7 @@
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %> <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %> -
+
<% if comment.class == Journal %> <% if comment.details.any? %> <% details_to_strings(comment.details).each do |string| %> @@ -16,5 +16,40 @@ <%= comment.content_detail.html_safe %> <% end %>
+
+
+ + + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> + + <% if type == 'Message' %> + <% topic = comment.root %> + <% if !topic.locked? && authorize_for('messages', 'reply') %> + + <%= link_to( + l(:button_reply), + {:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) %> + + + <% end %> + <% else %> + + <%= link_to( + l(:button_reply), + {:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) %> + + + <% end %> + +
+
+
+

\ No newline at end of file diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index 2118dee64..d060bd8b9 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -1,7 +1,7 @@
-

讨论区列表

+

讨论区列表

排序： <%= link_to "时间", {:controller => 'boards', :action => 'index', :board_id =>@board.id, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> @@ -20,9 +20,9 @@
<% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title fl" %> + <%= link_to activity.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title-normal fl" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title f1" %> + <%= link_to activity.parent.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title-normal f1" %> <% end %> <% if activity.sticky == 1 %> 顶 @@ -30,20 +30,20 @@ <% if activity.locked %> 锁 <% end %> - <% u = User.where("id=?",activity.author_id).first%> + <%# u = User.where("id=?",activity.author_id).first%>
-
- <% if activity.parent_id.nil? %> - <% content = activity.content %> - <% else %> - <% content = activity.parent.content %> - <% end %> -

<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %>

-
+ + + + + + + +
- - 发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %> + + 发帖人：<%= link_to activity.author.show_name, user_path(activity.author), :class => "link-blue" %> 更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %> <% all_comments = []%> diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index b120c8afc..0a95b4bf1 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -33,10 +33,8 @@ <% end %>
<%= render :partial => 'users/homework_opr', :locals => {:activity => activity, :is_teacher => is_teacher, :hw_status => hw_status, :user_activity_id => user_activity_id} %> - <% if activity.homework_detail_manual && activity.homework_detail_manual.comment_status < 2 %> -
提交截止时间：<%= activity.end_time.to_s %> 23:59
- <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 && activity.anonymous_comment == 0%> -
匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %> 23:59
+ <% if !activity.end_time.nil? %> +
提交截止时间：<%= activity.end_time.to_s %> 23:59
<% end %> <% if activity.homework_detail_manual.comment_status == 0 && !activity.publish_time.nil? %>
@@ -59,5 +57,5 @@
- <%= render :partial => 'users/homework_post_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id, :hw_status => hw_status, :is_teacher => is_teacher} %> + <%= render :partial => 'users/homework_post_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id, :is_teacher => is_teacher} %>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index 3e31ef038..07cd8e558 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -38,43 +38,10 @@
- <% all_comments = []%> - <% all_replies = JournalsForMessage.where("root_id = #{activity.id}").reorder("created_on desc") %> - <% count = all_replies.count %> +
- <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %> - - <% comments = all_replies[0..2] %> - <% if count > 0 %> -
- <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :activity_id =>activity.id}%> -
- <% end %> - -
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
-
- <% if User.current.logged? %> -
- <%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => activity.id}, :method => "post", :remote => true) do |f|%> - <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %> - <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %> - <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %> - <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %> - <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %> -
- - -
-

- <% end%> -
- <% else %> - <%= render :partial => "users/show_unlogged" %> - <% end %> -
-
-
+
+ <%=render :partial => 'users/user_journal_post_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 4fc64386f..ce685f8ed 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -78,45 +78,10 @@
- <% all_comments = []%> - <%# all_replies = get_all_children(all_comments, activity) %> - <% all_replies = Message.where("root_id = #{activity.id}").reorder("created_on desc") %> - <% count = all_replies.count %>
- <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %> - - <% comments = all_replies[0..2] %> - <% if count > 0 %> -
- <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%> -
- <% end %> - - <% if !activity.locked? && authorize_for_course('messages', 'reply') %> -
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
- <% if User.current.logged? %> -
- <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,:is_course=>is_course},:method => "post", :remote => true) do |f|%> - - -
- - -
-

- <% end%> -
-
- <% else %> - <%= render :partial => "users/show_unlogged" %> - <% end %> -
-
-
-
- <% end %> +
+ <%=render :partial => 'users/course_message_post_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %> +
\ No newline at end of file diff --git a/app/views/users/user_archive_courses.js.erb b/app/views/users/user_archive_courses.js.erb new file mode 100644 index 000000000..833786fbf --- /dev/null +++ b/app/views/users/user_archive_courses.js.erb @@ -0,0 +1 @@ +$("#user_archive_course_list").html('<%= escape_javascript(render :partial => 'users/user_archive_course_list', :locals => {:syllabuses => @archive_syllabuses}) %>'); diff --git a/app/views/users/user_courselist.html.erb b/app/views/users/user_courselist.html.erb index 8f41b051e..7a7b68fa6 100644 --- a/app/views/users/user_courselist.html.erb +++ b/app/views/users/user_courselist.html.erb @@ -1,5 +1,11 @@
-

课程列表

+
+

课程列表

+ <% if @user == User.current && !@archive_syllabuses.blank? %> + <%= link_to "归档管理", user_archive_courses_users_path(), :class => "linkBlue2 mt15 fr mr15 f14"%> + <% end %> +
+
<%= render :partial => 'users/user_syllabus_list'%>
diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb index 9f3b0164e..0edea0588 100644 --- a/app/views/words/create_reply.js.erb +++ b/app/views/words/create_reply.js.erb @@ -1,9 +1,9 @@ <% if @save_succ %> <% if @user_activity_id %> <% if @activity.jour_type == 'Principal' %> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>"); + $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/user_journal_post_reply', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>"); <% elsif @activity.jour_type == 'Course' %> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>"); + $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/user_journal_post_reply', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>"); <% end %> //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity"); sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity"); diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb index ab41b1ae6..0e7653461 100644 --- a/app/views/words/destroy.js.erb +++ b/app/views/words/destroy.js.erb @@ -3,7 +3,7 @@ <% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication','HomeworkCommon','Syllabus'].include? @journal_destroyed.jour_type)%> <% if @is_user%> <% if @activity %> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>"); + $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/user_journal_post_reply', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>"); sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity"); <% else %> $("#user_activity_<%= @user_activity_id%>").hide(); @@ -19,11 +19,11 @@ <% if @bid && @jours_count %> $('#jours_count').html("<%= @jours_count %>"); <% elsif @syllabus %> - $("#reply_banner_<%=@syllabus.id %>").replaceWith("<%=escape_javascript(render :partial => 'users/reply_banner', :locals => {:count => @count, :activity => @syllabus, :user_activity_id => @syllabus.id}) %>"); - $("#reply_div_<%=@syllabus.id %>").html("<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @comments, :type => 'Syllabus', :user_activity_id => @syllabus.id, :activity_id => @syllabus.id}) %>"); + $("#activity_post_reply_<%= @syllabus.id %>").html("<%= escape_javascript(render :partial => 'syllabuses/syllabus_post_reply', :locals => {:activity => @syllabus, :user_activity_id => @syllabus.id}) %>"); + sd_create_editor_from_data(<%= @syllabus.id%>,"","100%", "<%=@syllabus.class.to_s%>"); <% elsif @course && @jours_count%> <% if @user_activity_id %> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>"); + $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/user_journal_post_reply', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>"); sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity"); <% else %> $('#course_jour_count').html("<%= @jours_count %>"); @@ -31,7 +31,7 @@ <% elsif @user && @jours_count%> $('#jour_count').html("<%= @jours_count %>"); <% elsif @homework%> - $("#homework_post_reply_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/homework_post_reply', :locals => {:activity => @homework, :user_activity_id => @user_activity_id, :hw_status => @hw_status, :is_teacher => @is_teacher}) %>"); + $("#homework_post_reply_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/homework_post_reply', :locals => {:activity => @homework, :user_activity_id => @user_activity_id, :is_teacher => @is_teacher}) %>"); <% if @user_activity_id != @homework.id %> sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); <% else %> diff --git a/app/views/words/leave_homework_message.js.erb b/app/views/words/leave_homework_message.js.erb index f6a89323f..d3d4b2154 100644 --- a/app/views/words/leave_homework_message.js.erb +++ b/app/views/words/leave_homework_message.js.erb @@ -1,4 +1,4 @@ -$("#homework_post_reply_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/homework_post_reply', :locals => {:activity => @homework_common, :user_activity_id => @user_activity_id, :hw_status => @hw_status, :is_teacher => @is_teacher}) %>"); +$("#homework_post_reply_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/homework_post_reply', :locals => {:activity => @homework_common, :user_activity_id => @user_activity_id, :is_teacher => @is_teacher}) %>"); <% if @user_activity_id != @homework_common.id %> sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); <% else %> diff --git a/app/views/words/reply_to_homework.js.erb b/app/views/words/reply_to_homework.js.erb index f6a89323f..d3d4b2154 100644 --- a/app/views/words/reply_to_homework.js.erb +++ b/app/views/words/reply_to_homework.js.erb @@ -1,4 +1,4 @@ -$("#homework_post_reply_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/homework_post_reply', :locals => {:activity => @homework_common, :user_activity_id => @user_activity_id, :hw_status => @hw_status, :is_teacher => @is_teacher}) %>"); +$("#homework_post_reply_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/homework_post_reply', :locals => {:activity => @homework_common, :user_activity_id => @user_activity_id, :is_teacher => @is_teacher}) %>"); <% if @user_activity_id != @homework_common.id %> sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); <% else %> diff --git a/app/views/words/reply_to_syllabus.js.erb b/app/views/words/reply_to_syllabus.js.erb index 4bc4848ad..5a2f7b38d 100644 --- a/app/views/words/reply_to_syllabus.js.erb +++ b/app/views/words/reply_to_syllabus.js.erb @@ -1,2 +1,2 @@ -$("#reply_banner_<%=@syllabus.id %>").replaceWith("<%=escape_javascript(render :partial => 'users/reply_banner', :locals => {:count => @count, :activity => @syllabus, :user_activity_id => @syllabus.id}) %>"); -$("#reply_div_<%=@syllabus.id %>").html("<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @comments, :type => 'Syllabus', :activity_id => @syllabus.id}) %>"); +$("#activity_post_reply_<%= @syllabus.id %>").html("<%= escape_javascript(render :partial => 'syllabuses/syllabus_post_reply', :locals => {:activity => @syllabus, :user_activity_id => @syllabus.id}) %>"); +sd_create_editor_from_data(<%= @syllabus.id%>,"","100%", "<%=@syllabus.class.to_s%>"); diff --git a/config/routes.rb b/config/routes.rb index db1ad27e3..2ff100196 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -573,12 +573,15 @@ RedmineApp::Application.routes.draw do post "user_new_homework" get 'new_user_commit_homework' get 'reply_to' + get 'reply_to_comment' get 'show_all_replies' get 'user_messages_unviewed' post "user_commit_homework" post 'user_select_homework' post 'check_homework' get 'all_journals' + get 'user_archive_courses' + post 'reply_detail' end member do diff --git a/db/migrate/20161125024643_migrate_student_works.rb b/db/migrate/20161125024643_migrate_student_works.rb new file mode 100644 index 000000000..16461ac22 --- /dev/null +++ b/db/migrate/20161125024643_migrate_student_works.rb @@ -0,0 +1,18 @@ +class MigrateStudentWorks < ActiveRecord::Migration + def up + count = Course.all.count / 30 + 2 + transaction do + for i in 1 ... count do i + Course.page(i).per(30).each do |course| + homework_ids = course.homework_commons.blank? ? "(-1)" : "(" + course.homework_commons.map{|hw| hw.id}.join(",") + ")" + student_ids = course.student.blank? ? "(-1)" : "(" + course.student.map{|st| st.student_id}.join(",") + ")" + student_works = StudentWork.where("homework_common_id in #{homework_ids} and user_id not in #{student_ids}") + student_works.update_all(:is_delete => 1) + end + end + end + end + + def down + end +end diff --git a/public/javascripts/application.js b/public/javascripts/application.js index ac8dfcc44..c3bd332a9 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1407,7 +1407,7 @@ function expand_all_reply(container, btnid, id, type, div_id) { } } -function expand_message_reply(container, btnid, id, type, div_id, is_course, is_board) { +function expand_reply_homework(container, btnid, id, type, div_id, user_activity_id) { var target = $(container); var btn = $(btnid); if (btn.data('init') == '0') { @@ -1418,76 +1418,6 @@ function expand_message_reply(container, btnid, id, type, div_id, is_course, is_ type: type, id: id, div_id: div_id, - is_course: is_course, - is_board: is_board - }, - function(data) { - - } - ); - btn.html('收起回复'); - //target.show(); - } else if(btn.data('init') == '1') { - btn.data('init', 3); - btn.html('展开更多'); - target.hide(); - target.eq(0).show(); - target.eq(1).show(); - target.eq(2).show(); - } - else { - btn.data('init', 1); - btn.html('收起回复'); - target.show(); - } -} - -function expand_blog_comment_reply(container, btnid, id, type, div_id, homepage) { - var target = $(container); - var btn = $(btnid); - if (btn.data('init') == '0') { - btn.data('init', 1); - $.get( - '/users/all_journals', - { - type: type, - id: id, - div_id: div_id, - homepage: homepage - }, - function(data) { - - } - ); - btn.html('收起回复'); - //target.show(); - } else if(btn.data('init') == '1') { - btn.data('init', 3); - btn.html('展开更多'); - target.hide(); - target.eq(0).show(); - target.eq(1).show(); - target.eq(2).show(); - } - else { - btn.data('init', 1); - btn.html('收起回复'); - target.show(); - } -} - -function expand_reply_homework(container, btnid, id, type, div_id, hw_status, user_activity_id) { - var target = $(container); - var btn = $(btnid); - if (btn.data('init') == '0') { - btn.data('init', 1); - $.get( - '/users/all_journals', - { - type: type, - id: id, - div_id: div_id, - hw_status: hw_status, user_activity_id: user_activity_id }, function(data) { @@ -2253,3 +2183,19 @@ function getIssueStatistics(url){ } +function archive_course(id, type, source){ + if(type == 0){ + var htmlvalue = '

提示

'+ + '

您是否确定归档此班级

' + + '取  消' + + '确  定
'; + pop_box_new(htmlvalue, 400, 132); + } else{ + var htmlvalue = '

提示

'+ + '

您和您的学生将可以重新在此班级中互动
此班级的动态会在首页中显示

' + + '您是否确定恢复此班级

取  消' + + '确  定
'; + pop_box_new(htmlvalue, 400, 200); + } +} + diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 1f7301772..91a22a177 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -597,4 +597,10 @@ a:hover.blueCir{ background:#3598db; color:#fff;} a.ex_icon_de{ background:url(/images/course/icons.png) 0px -342px no-repeat; width:16px; height:27px; display:block;float:right;} a:hover.ex_icon_de{ background:url(/images/course/icons.png) -20px -342px no-repeat;} .ex_icon_edit{ background:url(/images/course/icons.png) 0px -276px no-repeat; width:16px; height:27px; display:block;float:right; margin-right:10px;} -a:hover.ex_icon_edit{ background:url(/images/course/icons.png) -21px -276px no-repeat;} \ No newline at end of file +a:hover.ex_icon_edit{ background:url(/images/course/icons.png) -21px -276px no-repeat;} + +/*首页课程列表归档按钮提示*/ +/*分组作业评分提示框*/ +.archive_course_notice {width:220px; position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-265px; top:-15px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} +.archive_course_notice em {display:block; border-width:10px; position:absolute;top:26px; left:-20px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;} +.archive_course_notice span {display:block; border-width:10px; position:absolute;top:26px; left:-18px; border-style:dashed solid dashed dashed; border-color:transparent #fff transparent transparent; font-size:0; line-height:0;} diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 96abaf93d..1b86aab92 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -493,7 +493,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;} /*博客列表界面样式*/ .listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; } /*.bloglistbox{ min-height:690px;}*/ -.list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;} +.list-h2{ font-size:16px; color:#000; padding-bottom:5px;} .category{ padding:10px 0; border-bottom:1px solid #ddd;} .category a,.category span{ float:left; margin-right:5px;} .grayTxt{ color:#9093a6;} @@ -504,6 +504,8 @@ a.sortdownbtn{ background: url(/images/liststyle.png) 0 -12px no-repeat; width:1 .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} .list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;} a:hover.list-title{ color:#269ac9;} +.list-file a.list-title-normal{ font-size:14px; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;} +a:hover.list-title-normal{ color:#269ac9;} .font_normal{ font-weight:normal; font-size:12px;} .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} .list-file li{ line-height:1.9;} @@ -1375,6 +1377,7 @@ a.content-username:hover{ color:#297fb8;} .orig_user img{width:32px; height:32px;} .reply-right{ float:right; position:relative;} .reply_iconup02{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;} +.reply_iconup03{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#FFFEF4; line-height:13px;} .comment_orig_content{margin:10px 0; color:#999;} .comment_orig_content .comment_orig_content{margin-top:0;} .orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px;} @@ -1384,7 +1387,7 @@ a.content-username:hover{ color:#297fb8;} .orig_user span{ color:#999; padding-right:5px;} .orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; word-wrap:break-word; } .orig_content img {max-width:100%;} -.orig_right{ width:80%; margin-top:5px;} +.orig_right{ width:90%; margin-top:5px;} a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; } a:hover.comment_ding_link{ color:#269ac9;} .comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;} @@ -1393,7 +1396,7 @@ a:hover.comment_ding_link{ color:#269ac9;} .comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;} .comment_content{ color:#333;} .t_txt{ margin-top:10px;} -.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;} +.orig_reply_box{border-top:1px solid #e3e3e3; width:100%; padding:15px 0px 15px 0;} .orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;} .orig_textarea{width:90%; margin-bottom:10px;} .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;} diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index 64640f96f..499e4a336 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -65,7 +65,7 @@ input.syllabus_input_min{ .syllabus_class_list_more{padding:8px; text-align:center;border-left:1px solid #e7e7e7;border-bottom:1px solid #e7e7e7;} .syllabus_class_list_more:hover{ background:#ececec;} .syllabus_class_list_more a{ color:#ff7e00;} -a.syllabus_class_title{ font-size:14px; color:#333; max-width:480px; margin-bottom:3px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; } +a.syllabus_class_title{ font-size:14px; color:#333; max-width:520px; margin-bottom:3px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; } .syllabus_class_w{ width:650px;} .syllabus_class_property {font-size:12px; padding:0 5px; border-radius:3px; line-height:14px;} .syllabus_class_private {color:#ff4a1b; border:1px solid #ff4a1b;}