Merge remote-tracking branch 'remotes/origin/develop' into linchun

app/controllers/student_work_controller.rb

@@ -99,16 +99,18 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
+      #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
-      if @homework.is_open == 1
+      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
-        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+        if @order == 'lastname'
-        @show_all = true
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
-      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
+        elsif @order == 'student_id'
-        if @is_teacher || @homework.homework_detail_manual.nil? ||
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
-            (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+        else
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+        end
         @show_all = true
-        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+      elsif User.current.member_of_course?(@course)
+        if @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
             pro = @homework.student_work_projects.where(:user_id => User.current.id).first
             if pro.nil?
@@ -144,8 +146,14 @@ class StudentWorkController < ApplicationController
           end
           if my_work.empty?
             @stundet_works = []
+          else
+            if @order == 'lastname'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+            elsif @order == 'student_id'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
               @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+            end
             @show_all = true
           end
         else
@@ -158,14 +166,17 @@ class StudentWorkController < ApplicationController
 
       @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
-      if @homework.is_open == 1
+      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
-        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+        if @order == 'lastname'
-        @show_all = true
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
-      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
+        elsif @order == 'student_id'
-        if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+        else
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+        end
         @show_all = true
-        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+      elsif User.current.member_of_course?(@course)
+        if @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
             pro = @homework.student_work_projects.where(:user_id => User.current.id).first
             if pro.nil?
@@ -201,8 +212,14 @@ class StudentWorkController < ApplicationController
           end
           if my_work.empty?
             @stundet_works = []
+          else
+            if @order == 'lastname'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+            elsif @order == 'student_id'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
               @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+            end
             @show_all = true
           end
         else

app/controllers/users_controller.rb

@@ -376,13 +376,15 @@ class UsersController < ApplicationController
 
   #用户作业列表
   def user_homeworks
+    @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc"
     @user = User.current
+    @r_sort = @b_sort == "desc" ? "asc" : "desc"
     if(params[:type].blank? || params[:type] == "1") #公共题库
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc")
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #我的题库
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("created_at desc")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     end
     @type = params[:type]
     @limit = 15
@@ -525,20 +527,22 @@ class UsersController < ApplicationController
   end
 
   def user_homework_type
+    @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc"
+    @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     if(params[:type].blank? || params[:type] == "1") #公共题库
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc")
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #我的题库
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("created_at desc")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     end
     if params[:property] && params[:property] == "1"
-      @homeworks = @homeworks.where("homework_type = 1").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
     elsif params[:property] && params[:property] == "2"
-      @homeworks = @homeworks.where("homework_type = 2").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
     elsif params[:property] && params[:property] == "3"
-      @homeworks = @homeworks.where("homework_type = 3").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
     end
     @type = params[:type]
     @property = params[:property]
@@ -564,6 +568,8 @@ class UsersController < ApplicationController
 
   #用户主页过滤作业
   def user_search_homeworks
+    @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc"
+    @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     search = params[:name].to_s.strip.downcase
     if(params[:type].blank? || params[:type] == "1") #全部
@@ -573,16 +579,16 @@ class UsersController < ApplicationController
       all_user_ids = all_homeworks.map{|hw| hw.user_id}
       user_str_ids = search_user_by_name all_user_ids, search
       user_ids = user_str_ids.empty? ? "(-1)" : "(" + user_str_ids.join(",") + ")"
-      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%' or user_id in #{user_ids})").order("created_at desc")
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%' or user_id in #{user_ids})").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #课程资源
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and (name like '%#{search}%')").order("created_at desc")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and (name like '%#{search}%')").order("#{@order} #{@b_sort}")
     end
     if params[:property] && params[:property] == "1"
-      @homeworks = @homeworks.where("homework_type = 1").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
     elsif params[:property] && params[:property] == "2"
-      @homeworks = @homeworks.where("homework_type = 2").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
     elsif params[:property] && params[:property] == "3"
-      @homeworks = @homeworks.where("homework_type = 3").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
     end
     @type = params[:type]
     @limit = 15
@@ -592,6 +598,8 @@ class UsersController < ApplicationController
     @offset ||= @hw_pages.offset
     @homeworks = paginateHelper @homeworks,15
     @is_import = params[:is_import]
+    @property = params[:property]
+    @search = search
     respond_to do |format|
       format.js
     end
@@ -1547,7 +1555,7 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
     #@user.save_attachments(params[:attachments],User.current)
     # Container_type为Principal
-    Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type])
+    attach = Attachment.attach_filesex_public(@user, params[:attachments], params[:attachment_type], is_public = true)
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       if params[:status] == 2
@@ -2332,9 +2340,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源
   def get_public_resources user_course_ids, user_project_ids
-    attachments = Attachment.where("(is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) "+
+    attachments = Attachment.where("(is_publish = 1 and is_public =1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("created_on desc")
-                                       "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
-                                       "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("created_on desc")
   end
 
   # 获取我的资源
@@ -2351,7 +2357,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源课程
   def get_course_resources_public user_course_ids
-    attchments = Attachment.where("(container_type = 'Course' and is_publish = 1) or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("created_on desc")
   end
 
   # 获取我的项目资源
@@ -2361,7 +2367,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids
-    attchments = Attachment.where("(container_type = 'Project') or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("created_on desc")
   end
 
   # 获取我上传的附件
@@ -2371,7 +2377,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源中我上传的附件
   def get_attch_resources_public
-    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
+    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal') and container_id is not null and is_public =1").order("created_on desc")
   end
 
   # 获取我的用户类型资源
@@ -2381,7 +2387,7 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources_public
-    attchments = Attachment.where("container_type = 'Principal'").order("created_on desc")
+    attchments = Attachment.where("container_type = 'Principal'and container_id is not null and is_public =1").order("created_on desc")
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -2613,9 +2619,7 @@ class UsersController < ApplicationController
       end
     elsif  params[:type] == "6" #全部资源
       # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = Attachment.where("((is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) "+
+      @attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("created_on desc")
-                                          "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
-                                          "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and  (filename like :p)" ,:p => search).order("created_on desc")
     end
     @type = params[:type]
     @limit = 25

app/helpers/courses_helper.rb

@@ -785,7 +785,7 @@ module CoursesHelper
     return[] unless course
     result = []
     course.attachments.each do |attachment|
-      if attachment.is_public? ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id))|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
+      if (attachment.is_public? && attachment.is_publish == 1) ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,course)|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
         result << attachment
       end
     end

app/helpers/files_helper.rb

@@ -121,7 +121,8 @@ module FilesHelper
   def visable_attachemnts attachments
     result = []
     attachments.each do |attachment|
-      if attachment.is_public? ||
+      if (attachment.is_public? && attachment.container_type != "Course") ||
+          (attachment.is_public? && attachment.container_type == "Course" && attachment.is_publish == 1)||
           (attachment.container_type == "Project" && User.current.member_of?(attachment.project)) ||
           (attachment.container_type == "Course" && User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id)))||
           (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)) && attachment.is_publish == 1)||

app/models/attachment.rb

@@ -499,6 +499,12 @@ class Attachment < ActiveRecord::Base
     result
   end
 
+  def self.attach_filesex_public(obj, attachments,attachment_type, is_public)
+    result = obj.save_attachmentsex_public(attachments, User.current,attachment_type, is_public)
+    obj.attach_saved_attachments
+    result
+  end
+
   def self.latest_attach(attachments, filename)
     attachments.sort_by(&:created_on).reverse.detect {
       |att| att.filename.downcase == filename.downcase

app/models/praise_tread.rb

@@ -2,8 +2,8 @@ class PraiseTread < ActiveRecord::Base
   attr_accessible :user_id,:praise_tread_object_id,:praise_tread_object_type,:praise_or_tread
   belongs_to :user
   belongs_to :praise_tread_object, polymorphic: true
-  after_create :be_user_score
+  #after_create :be_user_score
-  after_destroy :down_user_score
+  #after_destroy :down_user_score
   include UserScoreHelper
   def self.find_object_by_type_and_id(type,id)
     @obj = nil

app/views/blog_comments/_simple_ke_reply_form.html.erb

@@ -10,7 +10,7 @@
           <input type="hidden" name="blog_comment[title]" id="reply_subject">
           <div nhname='toolbar_container_<%= reply.id%>'></div>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
           <div class="cl"></div>
           <p nhname='contentmsg_<%= reply.id%>'></p>
       <% end%>

app/views/blogs/_article.html.erb

@@ -200,7 +200,7 @@
                   <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
                   <div nhname='toolbar_container_<%= user_activity_id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
                   <div class="cl"></div>
                   <p nhname='contentmsg_<%= user_activity_id%>'></p>
               <% end%>

app/views/courses/_new_member_list.html.erb

@@ -72,13 +72,6 @@
                         <%= select( :name,:group_id, course_group_option(@course),
                                     { :include_blank => false,:selected => member.course_group_id},
                                     {:onchange=>"join_group_function('#join_group_form_#{member.id}');", :id =>"course_group_id", :name => "course_group_id",:class=>"w125 undis class-edit fl", :style => "margin-left: 105px;"}) %>
-                        <!--<select class="w125 undis class-edit fl" style="margin-left: 105px;">
-                          <option value="1" selected="selected">向日葵班</option>
-                          <option value="2">学前班</option>
-                          <option value="3">幼儿园</option>
-                          <option value="4">小学</option>
-                          <option value="5">初中</option>
-                        </select>-->
                     <% end %>
                 <% end %>
             <% else %>

app/views/courses/syllabus.html.erb

@@ -192,7 +192,7 @@
                   <input type="hidden" name="blog_comment[locked]" value="0">
                   <div nhname='toolbar_container_<%= @article.id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @article.id%>' name="blog_comment[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+                  <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)"  onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
                   <div class="cl"></div>
                   <p nhname='contentmsg_<%= @article.id%>'></p>
               <% end%>

app/views/issues/_issue_replies.html.erb

@@ -74,7 +74,7 @@
             <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
           </div>
           <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" class="blue_n_btn fr mt5" style="display:none;">发送</a>
+          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
           <div class="cl"></div>
       <% end %>
     </div>

app/views/issues/_issue_reply_ke_form.html.erb

@@ -16,7 +16,7 @@
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
           <div class="cl"></div>
           <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
           <div class="cl"></div>
       <% end %>
     </div>

app/views/layouts/_user_courses.html.erb

@@ -2,7 +2,7 @@
     <li class="homepageLeftMenuCoursesLine pr">
       <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
       <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                  :id => "show_course_#{course.id}",:title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                  :id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
         <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
         <ul class="<%= count > 0 ? 'shild shildP':'subNavArrow'%>">
           <li>

app/views/layouts/_user_projects.html.erb

@@ -1,7 +1,7 @@
 <% projects.each do |project|%>
     <li class="homepageLeftMenuCoursesLine pr">
       <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count %>
-      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
+      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "coursesLineGrey hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
         <ul class="<%= count > 0 ? 'shild shildP':'subNavArrow'%>">
           <li>
             <ul class="subNavMenu boxShadow">

app/views/memos/show.html.erb

@@ -61,7 +61,7 @@
         <%= link_to @memo.author.name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
       <div class="cl"></div>
-      <div class="homepagePostIntro memo-content" id="message_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+      <div class="homepagePostIntro memo-content" id="activity_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>
@@ -113,7 +113,7 @@
               <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
               <div nhname='toolbar_container_<%= @memo.id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id%>' name="memo[content]"></textarea>
-              <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= @memo.id%>'></p>
           <% end%>
@@ -126,7 +126,7 @@
 </div>
 <script type="text/javascript">
     $(function(){
-            $("#message_description_<%= @memo.id %> p,#message_description_<%= @memo.id %> span,#message_description_<%= @memo.id %> em").each(function(){
+            $("#activity_description_<%= @memo.id %> p,#activity_description__<%= @memo.id %> span,#activity_description_<%= @memo.id %> em").each(function(){
                 var postContent = $(this).html();
                 postContent = postContent.replace(/&nbsp;/g," ");
                 postContent= postContent.replace(/ {2}/g,"&nbsp; ");
@@ -134,5 +134,6 @@
                 postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
                 $(this).html(postContent);
             });
+            description_show_hide(<%= @memo.id %>);
     });
 </script>

app/views/messages/_reply_message.html.erb

@@ -8,7 +8,7 @@
           <input type="hidden" name="reply[subject]" id="reply_subject">
           <div nhname='toolbar_container_<%= reply.id%>'></div>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
           <div class="cl"></div>
           <p nhname='contentmsg_<%= reply.id%>'></p>
       <% end%>

app/views/org_document_comments/_simple_ke_reply_form.html.erb

@@ -7,7 +7,7 @@
           <input type="hidden" name="org_document_comment[title]" id="reply_subject">
           <div nhname='toolbar_container_<%= reply.id%>'></div>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="org_document_comment[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
           <div class="cl"></div>
           <p nhname='contentmsg_<%= reply.id%>'></p>
       <% end%>

app/views/organizations/_org_course_homework.html.erb

@@ -47,7 +47,7 @@
       <% end%>
       <div class="cl"></div>
       <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
-          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
       <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%>
           <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
       <% end %>
@@ -356,7 +356,7 @@
               <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
               <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>

app/views/organizations/_org_course_message.html.erb

@@ -144,7 +144,7 @@
                   <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
                   <div nhname='toolbar_container_<%= user_activity_id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
                   <div class="cl"></div>
                   <p nhname='contentmsg_<%= user_activity_id%>'></p>
               <% end%>

app/views/organizations/_org_course_news.html.erb

@@ -110,7 +110,7 @@
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>

app/views/organizations/_org_project_issue.html.erb

@@ -127,7 +127,7 @@
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>

app/views/organizations/_org_subfield_message.html.erb

@@ -147,7 +147,7 @@
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>

app/views/organizations/_org_subfield_news.html.erb

@@ -130,7 +130,7 @@
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>

app/views/organizations/_project_message.html.erb

@@ -122,7 +122,7 @@
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>

app/views/organizations/_show_org_document.html.erb

@@ -119,7 +119,7 @@
               <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
               <div nhname='toolbar_container_<%= act.id %>'></div>
               <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="org_content"></textarea>
-              <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
+              <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
 
               <div class="cl"></div>
               <p nhname='contentmsg_<%= act.id %>'></p>