Merge branch 'szzh' into develop

app/assets/javascripts/system_messages.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/system_messages.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the SystemMessages controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/admin_controller.rb

@@ -79,6 +79,11 @@ class AdminController < ApplicationController
     end
   end
 
+  # 系统消息
+  def messages
+    @admin_messages = SystemMessage.new
+  end
+
   def plugins
     @plugins = Redmine::Plugin.all
   end

app/controllers/boards_controller.rb

@@ -101,8 +101,9 @@ class BoardsController < ApplicationController
         @topic_count = @board ? @board.topics.count : 0
         if @project
           @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+          #现在发布帖子的时候置顶功能已经没有了。所以取消这个置顶排序 #{Message.table_name}.sticky DESC,
           @topics =  @board.topics.
-              reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
+              reorder("#{Message.table_name}.created_on desc").
               includes(:last_reply).
               limit(@topic_pages.per_page).
               offset(@topic_pages.offset).

app/controllers/comments_controller.rb

@@ -49,6 +49,9 @@ class CommentsController < ApplicationController
       # end
       # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
       flash[:notice] = l(:label_comment_added)
+      user_activity = UserActivity.where("act_type='News' and act_id =#{@news.id}").first
+      user_activity.updated_at = @comment.created_on
+      user_activity.save
     end
 
     if params[:user_activity_id]

app/controllers/courses_controller.rb

@@ -468,13 +468,17 @@ class CoursesController < ApplicationController
   end
 
   def new
-    @course_type = params[:course_type] ||= params[:course]
+    if User.current.login?
-    @issue_custom_fields = IssueCustomField.sorted.all
+      @course_type = params[:course_type] ||= params[:course]
-    @trackers = Tracker.sorted.all
+      @issue_custom_fields = IssueCustomField.sorted.all
-    @course = Course.new
+      @trackers = Tracker.sorted.all
-    @course.safe_attributes = params[:course]
+      @course = Course.new
-    # month = Time.now.month
+      @course.safe_attributes = params[:course]
-    render :layout => 'new_base'
+      # month = Time.now.month
+      render :layout => 'new_base'
+    else
+      redirect_to signin_url
+    end
   end
 
   def desc_sort_course_by_avtivity(activity_count, courses)
@@ -627,6 +631,11 @@ class CoursesController < ApplicationController
   end
 
   def feedback
+   @course.journals_for_messages.each do |messages|
+     query = messages.course_messages.where("user_id = ?", User.current.id)
+     query.update_all(:viewed => true);
+   end
+
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       page = params[:page]
       # Find the page of the requested reply

app/controllers/forums_controller.rb

@@ -7,7 +7,7 @@ class ForumsController < ApplicationController
   before_filter :find_forum_if_available
   before_filter :authenticate_user_edit, :only => [:edit, :update]
   before_filter :authenticate_user_destroy, :only => [:destroy]
-  before_filter :require_login, :only => [:new, :create]
+  before_filter :require_login, :only => [:new, :create,:destroy,:update,:edit]
 
   helper :sort
   include SortHelper
@@ -97,7 +97,24 @@ class ForumsController < ApplicationController
 
   def index
     @offset, @limit = api_offset_and_limit({:limit => 10})
-    @forums_all = Forum.reorder("sticky DESC")
+    if(params[:reorder_complex])
+      @type="reorder_complex"
+      @str=params[:reorder_complex]
+       @forums_all = Forum.reorder("topic_count #{params[:reorder_complex]},updated_at #{params[:reorder_complex]}")
+    elsif(params[:reorder_popu])
+      @type="reorder_popu"
+      @str=params[:reorder_popu]
+      @forums_all = Forum.reorder("topic_count #{params[:reorder_popu]}")
+    elsif(params[:reorder_time])
+      @type="reorder_time"
+      @str=params[:reorder_time]
+      @forums_all = Forum.reorder("updated_at #{params[:reorder_time]}")
+    else
+      params[:reorder_complex] = "desc"
+      @type="reorder_complex"
+      @str=params[:reorder_complex]
+        @forums_all = Forum.reorder("topic_count desc,updated_at desc")
+    end
     @forums_count = @forums_all.count
     @forums_pages = Paginator.new @forums_count, @limit, params['page']
 
@@ -106,6 +123,7 @@ class ForumsController < ApplicationController
     #@forums = Forum.all
     respond_to do |format|
       format.html # index.html.erb
+      format.js
       format.json { render json: @forums }
     end
   end
@@ -113,11 +131,25 @@ class ForumsController < ApplicationController
   # GET /forums/1
   # GET /forums/1.json
   def show
-    sort_init 'updated_at', 'desc'
+    # sort_init 'updated_at', 'desc'
-    sort_update 'created_at' => "#{Memo.table_name}.created_at",
+    # sort_update 'created_at' => "#{Memo.table_name}.created_at",
-                'replies' => "#{Memo.table_name}.replies_count",
+    #             'replies' => "#{Memo.table_name}.replies_count",
-                'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+    #             'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
-
+    order = ""
+    @order_str = ""
+    if(params[:reorder_complex])
+      order = " last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}"
+      @order_str = "reorder_complex="+params[:reorder_complex]
+    elsif(params[:reorder_popu])
+      order = "replies_count #{params[:reorder_popu]}"
+      @order_str = "reorder_popu="+params[:reorder_popu]
+    elsif(params[:reorder_time])
+     order = "#{Memo.table_name}.updated_at #{params[:reorder_time]}"
+     @order_str = "reorder_time="+params[:reorder_time]
+    else
+      order = "last_replies_memos.created_at desc, #{Memo.table_name}.created_at desc"
+      @order_str = "reorder_complex=desc"
+    end
     @memo = Memo.new(:forum => @forum)
     @topic_count = @forum.topics.count
     @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
@@ -126,19 +158,15 @@ class ForumsController < ApplicationController
                     includes(:last_reply).
                     limit(@topic_pages.per_page).
                     offset(@topic_pages.offset).
-                    order(sort_clause).
+                    reorder(order).
                     preload(:author, {:last_reply => :author}).
                     all
     @memos
-    # @offset, @limit = api_offset_and_limit({:limit => 10})
+    @my_topic_count =   Memo.where("forum_id = #{@forum.id} and author_id = #{User.current.id} and parent_id is null").count
-    # @forum = Forum.find(params[:id])
+    @my_replies_count =  Memo.where("forum_id = #{@forum.id} and author_id = #{User.current.id} and parent_id is not null").count
-    # @memos_all = @forum.topics
+    @errors = params[:errors]
-    # @topic_count = @memos_all.count
-    # @topic_pages = Paginator.new @topic_count, @limit, params['page']
-
-    # @offset ||= @topic_pages.offset
-    # @memos = @memos_all.offset(@offset).limit(@limit).all
     respond_to do |format|
+      format.js
       format.html {
         render :layout => 'base_forums'
       }# show.html.erb
@@ -172,20 +200,23 @@ class ForumsController < ApplicationController
       # Author lizanle
       # Description after save后需要进行资源记录的更新
       # owner_type = 2 对应的是 forum
+      @save_flag=true
       if params[:asset_id]
         ids = params[:asset_id].split(',')
         update_kindeditor_assets_owner ids ,@forum.id,OwnerTypeHelper::FORUM
       end
       #end
       respond_to do |format|
-
+          format.js
           format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
           format.json { render json: @forum, status: :created, location: @forum }
       end
 
     else
+      @save_flag=false
       respond_to do |format|
         flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}"
+        format.js
         format.html { render action: "new" }
         format.json { render json: @forum.errors, status: :unprocessable_entity }
       end
@@ -199,10 +230,12 @@ class ForumsController < ApplicationController
 
     respond_to do |format|
       if @forum.update_attributes(params[:forum])
+        format.js  {render :text=> true}
         format.html { redirect_to @forum, notice: l(:label_forum_update_succ) }
         format.json { head :no_content }
       else
         flash.now[:error] = "#{l :label_forum_update_fail}: #{@forum.errors.full_messages[0]}"
+        format.js { render :text=> false}
         format.html { render action: "edit" }
         format.json { render json: @forum.errors, status: :unprocessable_entity }
       end
@@ -261,6 +294,52 @@ class ForumsController < ApplicationController
     end
   end
 
+  #检查forum的名字
+  def check_forum_name
+    forum_name_exist = true
+    if params[:forum_id]
+      forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
+    else
+      forum_name_exist = Forum.where("name = '#{params[:forum_name]}' ").count >= 1 ? true : false
+    end
+    render :text => forum_name_exist
+  end
+
+  #添加论坛tag
+  def add_forum_tag
+    @forum = Forum.find(params[:id])
+    unless @forum.nil?
+      @forum.tag_list.add(params[:tag_str].split(','))
+      @forum.save
+    end
+    respond_to do |format|
+      format.js {render :delete_forum_tag}
+    end
+  end
+
+  #删除forum的tag
+  def delete_forum_tag
+    @tag_id = (ActsAsTaggableOn::Tag.find_by_name(params[:tag_name])).id
+    #forum的taggable_type = 5
+    @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,params[:id],'Forum')
+
+    unless @taggings.nil?
+      @taggings.delete
+    end
+
+    # 是否还有其他记录 引用了 tag_id
+    @tagging = ActsAsTaggableOn::Tagging.find_by_tag_id(@tag_id)
+    # 如果taggings表中记录已经不存在 ，那么检查tags表 作删除动作
+    if @tagging.nil?
+      @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id)
+      @tag.delete unless @tag.nil?
+    end
+    @forum = Forum.find(params[:id])
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def find_forum_if_available

app/controllers/homework_common_controller.rb

@@ -3,9 +3,11 @@ class HomeworkCommonController < ApplicationController
   require 'json'
   require "base64"
   layout "base_courses"
-  before_filter :find_course, :only => [:index,:new,:create,:next_step]
+
-  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
+  include StudentWorkHelper
-  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
+  before_filter :find_course, :only => [:index,:new,:create]
+  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr]
   before_filter :member_of_course, :only => [:index]
 
   def index
@@ -18,265 +20,64 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  #新建作业，在个人作业列表创建作业
   def new
-    @homework_type = "1"
+    render_404
-
-    @homework = HomeworkCommon.new
-    @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 2
-    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-
-    if @homework_type == "1"
-      #匿评作业相关属性
-      @homework_detail_manual = HomeworkDetailManual.new
-      @homework_detail_manual.ta_proportion = 0.6
-      @homework_detail_manual.absence_penalty = 2
-      @homework_detail_manual.evaluation_num = 3
-      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-      @homework.homework_detail_manual = @homework_detail_manual
-    elsif @homework_type == "2"
-      #编程作业相关属性
-      @homework_detail_programing = HomeworkDetailPrograming.new
-      @homework.homework_detail_programing = @homework_detail_programing
-    end
-    respond_to do |format|
-      format.html
-    end
-  end
-
-  #新建作业下一步
-  def next_step
-    @homework_type = params[:homework_common_type]
-
-    @homework = HomeworkCommon.new
-    @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 2
-    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-
-    if @homework_type == "1"
-      #匿评作业相关属性
-      @homework_detail_manual = HomeworkDetailManual.new
-      @homework_detail_manual.ta_proportion = 0.6
-      @homework_detail_manual.absence_penalty = 2
-      @homework_detail_manual.evaluation_num = 3
-      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-      @homework.homework_detail_manual = @homework_detail_manual
-    elsif @homework_type == "2"
-      #编程作业相关属性
-      @homework_detail_programing = HomeworkDetailPrograming.new
-      @homework.homework_detail_programing = @homework_detail_programing
-    end
-
-
-    respond_to do |format|
-      format.html
-    end
   end
 
+  #新建作业，在个人作业列表创建作业
   def create
-    if params[:homework_common]
+    redirect_to user_homeworks_user_path(User.current.id)
-      homework = HomeworkCommon.new
-      homework.name = params[:homework_common][:name]
-      homework.description = params[:homework_common][:description]
-      homework.end_time = params[:homework_common][:end_time]
-      homework.publish_time = params[:homework_common][:publish_time]
-      homework.homework_type = params[:homework_common][:homework_type]
-      homework.late_penalty = params[:late_penalty]
-      homework.user_id = User.current.id
-      homework.course_id = @course.id
-
-      homework.save_attachments(params[:attachments])
-      render_attachment_warning_if_needed(homework)
-
-      if homework.homework_type == 2
-        homework_detail_programing = HomeworkDetailPrograming.new
-        homework_detail_programing.language = params[:language]
-        homework_detail_programing.standard_code = params[:standard_code]
-        homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-        question = {title:homework.name,content:homework.description}
-        question[:input] = []
-        question[:output] = []
-        if params[:input] && params[:output] && params[:result]
-          params[:input].each do |k,v|
-            if params[:output].include? k
-              homework_test = HomeworkTest.new
-              homework_test.input = v
-              homework_test.output = params[:output][k]
-              homework_test.result = params[:result][k]
-              homework_test.error_msg = params[:error_msg]
-              homework.homework_tests << homework_test
-              question[:input] << homework_test.input
-              question[:output] << homework_test.output
-            end
-          end
-        end
-
-        # uri = URI('http://192.168.80.21:8080/api/questions.json')
-        # body = question.to_json
-        # res = Net::HTTP.new(uri.host, uri.port).start do |client|
-        #   request                 = Net::HTTP::Post.new(uri.path)
-        #   request.body            = body
-        #   request["Content-Type"] = "application/json"
-        #   client.request(request)
-        # end
-        # result = JSON.parse(res.body)
-        # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
-
-        homework.homework_detail_programing = homework_detail_programing
-      else
-        #匿评作业相关属性
-        homework_detail_manual = HomeworkDetailManual.new
-        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-        homework_detail_manual.comment_status = 1
-        homework_detail_manual.evaluation_start = params[:evaluation_start]
-        homework_detail_manual.evaluation_end = params[:evaluation_end]
-        homework_detail_manual.evaluation_num = params[:evaluation_num]
-        homework_detail_manual.absence_penalty = params[:absence_penalty]
-        homework.homework_detail_manual = homework_detail_manual
-      end
-
-      if homework.save
-        homework_detail_programing.save if homework_detail_programing
-        homework_detail_manual.save if homework_detail_manual
-        respond_to do |format|
-          format.html {
-            flash[:notice] = l(:notice_successful_create)
-            redirect_to homework_common_index_path(:course => @course.id)
-          }
-        end
-        return
-      end
-    end
-
-    respond_to do |format|
-      format.html {
-        flash[:notice] = l(:notice_failed_create)
-        redirect_to new_homework_common_path(:course => @course.id)
-      }
-    end
   end
 
   def edit
+    @user = User.current
+    @is_in_course = params[:is_in_course]
     respond_to do |format|
-      format.html
+      format.html{render :layout => 'new_base_user'}
     end
   end
 
   def update
-    @homework.name = params[:homework_common][:name]
+    if params[:homework_common]
-    @homework.description = params[:homework_common][:description]
+      @homework.name = params[:homework_common][:name]
-    @homework.end_time = params[:homework_common][:end_time]
+      @homework.description = params[:homework_common][:description]
-    @homework.publish_time = params[:homework_common][:publish_time]
+      @homework.end_time = params[:homework_common][:end_time] || Time.now
-    @homework.homework_type = params[:homework_common][:homework_type] if params[:homework_common][:homework_type]
+      @homework.course_id = params[:course_id]
-    unless @homework.late_penalty == params[:late_penalty]
-      @homework.student_works.where("created_at > '#{@homework.end_time} 23:59:59'").each do |student_work|
-        student_work.late_penalty = params[:late_penalty]
-        student_work.save
-      end
-      @homework.late_penalty = params[:late_penalty]
-    end
-    # @homework.course_id = @course.id
 
-    #匿评作业相关属性
+      homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
-    if @homework.homework_type == 1 && @homework_detail_manual
+      homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? @homework.end_time + 7 : params[:evaluation_start]
-      @homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+      homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
-      @homework_detail_manual.evaluation_start = params[:evaluation_start]
-      @homework_detail_manual.evaluation_end = params[:evaluation_end]
-      @homework_detail_manual.evaluation_num = params[:evaluation_num]
-      unless @homework_detail_manual.absence_penalty == params[:absence_penalty]
-        if @homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值
-          work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
-          @homework.student_works.each do |student_work|
-            absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
-            student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
-            student_work.save
-          end
-        end
-        @homework_detail_manual.absence_penalty = params[:absence_penalty]
-      end
-    elsif @homework.homework_type == 0 #普通作业，缺评扣分为0分，每个作品的缺评扣分改为0分，防止某些作业在结束匿评之后改为普通作业
-      @homework.student_works.where("absence_penalty != 0").each do |student_work|
-        student_work.late_penalty = 0
-        student_work.save
-      end
-      @homework_detail_manual.absence_penalty = 0 if @homework_detail_manual
-    end
 
-    if @homework.homework_type == 2 && @homework_detail_programing #编程作业
+      @homework.save_attachments(params[:attachments])
-      @homework_detail_programing.language = params[:language]
+      render_attachment_warning_if_needed(@homework)
-      @homework_detail_programing.standard_code = params[:standard_code]
+
-      @homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+      #编程作业相关属性
-      homework_tests = @homework.homework_tests
+      if @homework.homework_type == 2
-      #需要删除的测试
+          @homework.homework_detail_programing ||= HomeworkDetailPrograming.new
-      ids = homework_tests.map(&:id) - params[:input].keys.map(&:to_i)
+          @homework_detail_programing = @homework.homework_detail_programing
-      ids.each do |id|
+          @homework_detail_programing.language = params[:language_type].to_i
-        homework_test = HomeworkTest.find id
+
-        homework_test.destroy if homework_test
+          @homework.homework_tests.delete_all
-      end
+          inputs = params[:program][:input]
-      if params[:input] && params[:output] && params[:result]
+          if Array === inputs
-        params[:input].each do |k,v|
+            inputs.each_with_index do |val, i|
-          if params[:output].include? k
+              @homework.homework_tests << HomeworkTest.new(
-            homework_test = HomeworkTest.find_by_id k
+                  input: val,
-            if homework_test #已存在的测试，修改
+                  output: params[:program][:output][i]
-              homework_test.input = v
+              )
-              homework_test.output = params[:output][k]
-              homework_test.result = params[:result][k]
-              homework_test.error_msg = params[:error_msg]
-            else #不存在的测试，增加
-              homework_test = HomeworkTest.new
-              homework_test.input = v
-              homework_test.output = params[:output][k]
-              homework_test.result = params[:result][k]
-              homework_test.error_msg = params[:error_msg]
-              homework_test.homework_common = @homework
             end
-            homework_test.save
           end
-        end
       end
 
-      #发送修改作业的请求
+      if @homework.save
-      question = {title:@homework.name,content:@homework.description}
+        @homework_detail_manual.save if @homework_detail_manual
-      question[:input] = []
+        @homework_detail_programing.save if @homework_detail_programing
-      question[:output] = []
+        if params[:is_in_course] == "1"
-      @homework.homework_tests.each do |test|
-        question[:input] << test.input
-        question[:output] << test.output
-      end
-      # uri = URI("http://192.168.80.21:8080/api/questions/#{@homework_detail_programing.question_id}.json")
-      # body = question.to_json
-      # res = Net::HTTP.new(uri.host, uri.port).start do |client|
-      #   request                 = Net::HTTP::Put.new(uri.path)
-      #   request.body            = body
-      #   request["Content-Type"] = "application/json"
-      #   client.request(request)
-      # end
-      # result = JSON.parse(res.body)
-    end
-
-    @homework.save_attachments(params[:attachments])
-    render_attachment_warning_if_needed(@homework)
-
-    if @homework.save
-      @homework_detail_manual.save if @homework_detail_manual
-      @homework_detail_programing.save if @homework_detail_programing
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_successful_edit)
           redirect_to homework_common_index_path(:course => @course.id)
-        }
+        else
-      end
+          redirect_to user_homeworks_user_path(User.current.id)
-      return
+        end
-    else
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_failed_edit)
-          redirect_to edit_homework_common_path(@homework)
-        }
       end
     end
   end
@@ -284,7 +85,13 @@ class HomeworkCommonController < ApplicationController
   def destroy
     if @homework.destroy
       respond_to do |format|
-        format.html {redirect_to homework_common_index_path(:course => @course.id)}
+        format.html {
+          if params[:is_in_course] == "1"
+            redirect_to homework_common_index_path(:course => @course.id)
+          else
+            redirect_to user_homeworks_user_path(User.current.id)
+          end
+        }
       end
     end
   end
@@ -292,11 +99,11 @@ class HomeworkCommonController < ApplicationController
   #开启匿评
   #statue 1:启动成功，2：启动失败，作业总数大于等于2份时才能启动匿评，3:已开启匿评，请务重复开启,4:没有开启匿评的权限
   def start_anonymous_comment
-    @statue =4 and return unless User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
+    @statue = 4 and return unless User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
     @statue = 5 and return if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
     if @homework_detail_manual.comment_status == 1
       student_works = @homework.student_works
-      if student_works && student_works.size >=2
+      if student_works && student_works.size >= 2
         student_works.each_with_index do |work, index|
           user = work.user
           n = @homework_detail_manual.evaluation_num
@@ -309,6 +116,9 @@ class HomeworkCommonController < ApplicationController
         end
         @homework_detail_manual.update_column('comment_status', 2)
         @statue = 1
+        # 匿评开启消息邮件通知
+        send_message_anonymous_comment(@homework, m_status = 2)
+        Mailer.send_mail_anonymous_comment_open(@homework).deliver
       else
         @statue = 2
       end
@@ -320,19 +130,29 @@ class HomeworkCommonController < ApplicationController
   #关闭匿评
   def stop_anonymous_comment
     @homework_detail_manual.update_column('comment_status', 3)
-
+    #计算缺评扣分
     work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
     @homework.student_works.each do |student_work|
       absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
       student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
       student_work.save
     end
-
+    # 匿评关闭消息邮件通知
+    send_message_anonymous_comment(@homework, m_status = 3)
+    Mailer.send_mail_anonymous_comment_close(@homework).deliver
     respond_to do |format|
       format.js
     end
   end
 
+  # 开启/关闭匿评消息通知
+  def send_message_anonymous_comment(homework, m_status )
+     # status 标记匿评状态 1为关闭 0为开启
+     course = @homework.course
+     course.student.each do |st|
+       @homework.course_messages << CourseMessage.new(:user_id => st.student_id, :course_id => course.id, :viewed => false, :status => m_status)
+     end
+  end
   #提示
   def alert_anonymous_comment
     @cur_size = 0
@@ -369,6 +189,27 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  #启动匿评参数设置
+  def start_evaluation_set
+
+  end
+
+  #设置匿评参数
+  def set_evaluation_attr
+    if @homework_detail_manual
+      unless params[:evaluation_start].to_s == @homework_detail_manual.evaluation_start.to_s
+        @homework_detail_manual.evaluation_start = params[:evaluation_start]
+      end
+
+      unless @homework_detail_manual.evaluation_end.to_s == params[:evaluation_end].to_s
+        @homework_detail_manual.evaluation_end = params[:evaluation_end]
+      end
+
+      @homework_detail_manual.evaluation_num = params[:evaluation_num]
+      @homework_detail_manual.save
+    end
+  end
+
   private
   #获取课程
   def find_course

app/controllers/issues_controller.rb

@@ -114,8 +114,10 @@ class IssuesController < ApplicationController
   def show
     # 当前用户查看指派给他的缺陷消息，则设置消息为已读
     query = @issue.forge_messages
-    if User.current.id == @issue.assigned_to_id
+    query.each do |m|
-      query.update_all(:viewed => true)
+      if m.user_id == User.current.id
+        m.update_attribute(:viewed, true)
+      end
     end
     # 缺陷状态更新
     query_journals = @issue.journals
@@ -221,7 +223,6 @@ class IssuesController < ApplicationController
     end
 
     if saved
-
       #修改界面增加跟踪者
       watcherlist = @issue.watcher_users
       select_users = []
@@ -251,9 +252,7 @@ class IssuesController < ApplicationController
         JournalReply.add_reply(@issue.current_journal.id, reply_id, User.current.id)
       end
       flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
-
       respond_to do |format|
-
         format.html { redirect_to issue_url(@issue.id) }
         format.api  { render_api_ok }
       end
@@ -392,6 +391,9 @@ class IssuesController < ApplicationController
       jour.notes = params[:notes]
       jour.journalized = @issue
       jour.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@issue.id}").first
+      user_activity.updated_at = jour.created_on
+      user_activity.save
       @user_activity_id = params[:user_activity_id]
       respond_to do |format|
         format.js

app/controllers/journals_controller.rb

@@ -36,8 +36,7 @@ class JournalsController < ApplicationController
     sort_update(@query.sortable_columns)
 
     if @query.valid?
-      @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
+      @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC", :limit => 25)
-                                  :limit => 25)
     end
     @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
     render :layout => false, :content_type => 'application/atom+xml'
@@ -72,9 +71,9 @@ class JournalsController < ApplicationController
     end
     # Replaces pre blocks with [...]
     text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
-    @content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> "
+    @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n"
-    @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
+    @content << text.gsub(/(\r?\n|\r\n?)/, "\n ") + "\n"
-    # @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content
+    @content = "<blockquote style='padding-left:0px;margin-left:0px;'>" << @content << "</blockquote>\n\n<br/>"
     @id = user.id
   rescue ActiveRecord::RecordNotFound
     render_404

app/controllers/memos_controller.rb

@@ -11,7 +11,7 @@ class MemosController < ApplicationController
   include AttachmentsHelper
   include ApplicationHelper
 
-  layout 'base_memos'
+  # layout 'base_memos'
 
   def quote
     @subject = @memo.subject
@@ -73,41 +73,14 @@ class MemosController < ApplicationController
           end
         end
         #end
-        format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
+          format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
-        format.json { render json: @memo, status: :created, location: @memo }
+          format.json { render json: @memo, status: :created, location: @memo }
       else
         flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
-        # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
+          format.js
-        pre_count = REPLIES_PER_PAGE
+          format.html { redirect_to( forum_path(Forum.find(params[:forum_id]),:errors=>@memo.errors.full_messages[0])) }
-
-        @memo_new = @memo.dup
-        @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示
-        unless @memo.new_record?
-          @memo.update_column(:viewed_count, (@memo.viewed_count.to_i + 1))
-        end
-
-
-        page = params[:page]
-        if params[:r] && page.nil?
-          offset = @memo.children.where("#{Memo.table_name}.id < ?", params[:r].to_i).count
-          page = 1 + offset / pre_count
-        else
-          
-        end
-        @reply_count = @memo.children.count
-        @reply_pages = Paginator.new @reply_count, pre_count, page
-        @replies = @memo.children.
-                    includes(:author, :attachments).
-                    reorder("#{Memo.table_name}.created_at DESC").
-                    limit(@reply_pages.per_page).
-                    offset(@reply_pages.offset).
-                    all
-        if @memo.new_record?
-          format.html { render :new,:layout=>'base'}
-        else
-          format.html { render action: :show }
           format.json { render json: @memo.errors, status: :unprocessable_entity }
-        end
+        #end
 
       end
     end
@@ -115,6 +88,7 @@ class MemosController < ApplicationController
   
   REPLIES_PER_PAGE = 20 unless const_defined?(:REPLIES_PER_PAGE)
   def show
+
     # 更新贴吧帖子留言对应的memo_messages的viewed字段
     unless @memo.children.blank?
       @memo.children.each do |child|
@@ -154,21 +128,27 @@ class MemosController < ApplicationController
 
     @memo_new = Memo.new
 
-
+    @my_topic_count =   Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is null").count
+    @my_replies_count =  Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is not null").count
     # @memo = Memo.find_by_id(params[:id])
     # @forum = Forum.find(params[:forum_id])
     # @replies = @memo.replies
     # @mome_new = Memo.new
     
     respond_to do |format|
-      format.html # show.html.erb
+      format.html {render :layout=> 'base_forums'}#:layout=> 'base_forums',
       format.json { render json: @memo }
       format.xml { render xml: @memo }
     end
   end
 
   def edit
+    @my_topic_count =   Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is null").count
+    @my_replies_count =  Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is not null").count
     @replying = false
+    respond_to do |format|
+      format.html {render :layout=>'base_forums'}
+    end
   end
 
   def update
@@ -176,7 +156,8 @@ class MemosController < ApplicationController
       if( #@memo.update_column(:subject, params[:memo][:subject]) &&
            @memo.update_column(:content, params[:memo][:content]) &&
            @memo.update_column(:sticky, params[:memo][:sticky]) &&
-           @memo.update_column(:lock, params[:memo][:lock])) 
+           @memo.update_column(:lock, params[:memo][:lock]) &&
+           @memo.update_column(:subject,params[:memo][:subject]))
         @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
         @memo.save
         # @memo.root.update_attribute(:updated_at, @memo.updated_at)
@@ -227,7 +208,7 @@ class MemosController < ApplicationController
   end
 
   def back_memo_url
-    forum_memo_path(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id))
+    forum_memo_path(@forum, (@memo.root.nil? ? @memo : @memo.root))
   end
 
   def back_memo_or_forum_url

app/controllers/messages_controller.rb

@@ -160,7 +160,11 @@ class MessagesController < ApplicationController
     @reply.safe_attributes = params[:reply]
     @reply.content = @quote + @reply.content
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
+    # @reply.reply_id = params[:id]
     @topic.children << @reply
+    user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
+    user_activity.updated_at = Time.now
+    user_activity.save
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]

app/controllers/projects_controller.rb

@@ -33,7 +33,7 @@ class ProjectsController < ApplicationController
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics #:watcherlist
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
-  before_filter :memberAccess, only: :member
+  # before_filter :memberAccess, only: :member
 
   # accept_rss_auth :index
   accept_api_auth :index, :show, :create, :update, :destroy
@@ -162,7 +162,7 @@ class ProjectsController < ApplicationController
       @trackers = Tracker.sorted.all
       @project = Project.new
       @project.safe_attributes = params[:project]
-      render :layout => 'base'
+      render :layout => 'new_base'
     else
       redirect_to signin_url
     end
@@ -188,7 +188,8 @@ class ProjectsController < ApplicationController
     @project.safe_attributes = params[:project]
     @project.organization_id = params[:organization_id]
     @project.user_id = User.current.id
-    @project.project_new_type = 1
+    @project.project_new_type = params[:project_new_type]
+    params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0
     if validate_parent_id && @project.save
       @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
       # Add current user as a project member if he is not admin
@@ -216,10 +217,11 @@ class ProjectsController < ApplicationController
           end
         }
         format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
+        format.js
       end
     else
       respond_to do |format|
-        format.html { render :action => 'new', :layout => 'base'}#Added by young
+        format.html { render :action => 'new', :layout => 'new_base'}#Added by young
         format.api  { render_validation_errors(@project) }
       end
     end
@@ -258,7 +260,8 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-
+    # 更新消息为已读
+    update_message_status(User.current, @project)
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
@@ -322,6 +325,12 @@ class ProjectsController < ApplicationController
   end
 
   def settings
+    # 修改查看消息状态
+    applied_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =? and viewed =?", User.current.id, @project, "AppliedProject", 0)
+    applied_messages.each do |applied_message|
+      applied_message.update_attributes(:viewed => true)
+    end
+    # end
     @issue_custom_fields = IssueCustomField.sorted.all
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
@@ -342,7 +351,7 @@ class ProjectsController < ApplicationController
       if params[:repository] == "pswd_is_null"
         html  << l(:label_password_not_null)
       end
-      flash[:error] = html if !html.to_s.blank?
+      flash.now[:error] = html if !html.to_s.blank?
     end
       scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
       @repository = Repository.factory(scm)
@@ -351,24 +360,57 @@ class ProjectsController < ApplicationController
 
   end
 
+  # 项目邀请用户加入实现过程
   # 两种情况：1、系统外用户；2、系统内用户 (通过邮件判定)
   def send_mail_to_member
+    # 该邮箱未注册过
     if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
-      email = params[:mail]
+      if !User.where("login =?", params[:mail]).first.nil?
-      Mailer.run.send_invite_in_project(email, @project, User.current)
+        # 用户名唯一，用户修改邮箱，未修改用户名，用户名等同邮箱的情况，默认改用户已经注册
-      @is_zhuce = false
+        user = User.find_by_login(params[:mail].to_s)
-      flash[:notice] = l(:notice_email_sent, :value => email)
+        if !user.member_of?(@project)
+          # 如果已经邀请过该用户，则不重复发送
+          if InviteList.where("project_id =? and mail =?", @project.id, params[:mail].to_s).first.nil?
+            email = params[:mail]
+            Mailer.request_member_to_project(email, @project, User.current).deliver
+            flash[:notice] = l(:notice_email_sent, :value => email)
+          else
+            flash[:error] = l(:notice_email_invited)
+          end
+        else
+          flash[:error] = l(:label_member_of_project, :value => email)
+        end
+      else
+        email = params[:mail]
+        Mailer.send_invite_in_project(email, @project, User.current).deliver
+        @is_zhuce = false
+        flash[:notice] = l(:notice_email_sent, :value => email)
+      end
+
+    # 邮箱地址已被注册
     elsif !User.find_by_mail(params[:mail].to_s).nil?
       user = User.find_by_mail(params[:mail].to_s)
       if !user.member_of?(@project)
-        email = params[:mail]
+        # 如果已经邀请过该用户，则不重复发送
-        Mailer.run.request_member_to_project(email, @project, User.current)
+        invite_list = InviteList.where("project_id =? and mail =?", @project.id, params[:mail].to_s).first
-        flash[:notice] = l(:notice_email_sent, :value => email)
+        if invite_list.nil?
+          email = params[:mail]
+          Mailer.request_member_to_project(email, @project, User.current).deliver
+          flash[:notice] = l(:notice_email_sent, :value => email)
+        else
+          # 已经发送过了，则隔3小时才能再次发送
+          if Time.now - invite_list.created_at > 10800
+            email = params[:mail]
+            Mailer.request_member_to_project(email, @project, User.current).deliver
+            flash[:notice] = l(:notice_email_sent, :value => email)
+          else
+            flash[:error] = l(:notice_email_invited)
+          end
+        end
       else
         flash[:error] = l(:label_member_of_project, :value => email)
       end
     else
-      flash[:error] = l(:notice_registed_error, :value => email)
       @is_zhuce = true
     end
     respond_to do |format|
@@ -376,25 +418,26 @@ class ProjectsController < ApplicationController
     end
   end
 
-  #发送邮件邀请新用户
+  # 发送邮件邀请新用户页面对应方法
   def invite_members_by_mail
     if User.current.member_of?(@project) || User.current.admin?
-      @inviter_lists = InviteList.where(project_id:@project.id).all
+      @inviter_lists = InviteList.where(project_id:@project.id).order("created_at desc")
-      @inviters = []
+
-      @waiters = []
+      # @inviters = []
-      unless @inviter_lists.blank?
+      # @waiters = []
-        @inviter_lists.each do|inviter_list|
+      # unless @inviter_lists.blank?
-          unless inviter_list.user.nil?
+      #   @inviter_lists.each do|inviter_list|
-            if inviter_list.user.member_of?(@project)
+      #     unless inviter_list.user.nil?
-              @inviters << inviter_list.user
+      #       if inviter_list.user.member_of?(@project)
-              @inviters_count = @inviters.size
+      #         @inviters << inviter_list.user
-            else
+      #         @inviters_count = @inviters.size
-              @waiters << inviter_list.user
+      #       else
-              @waiters_count = @waiters.size
+      #         @waiters << inviter_list.user
-            end
+      #         @waiters_count = @waiters.size
-          end
+      #       end
-        end
+      #     end
-      end
+      #   end
+      # end
       @is_zhuce = false
       respond_to do |format|
         format.html
@@ -406,16 +449,16 @@ class ProjectsController < ApplicationController
   end
 
   # 邀请Trustie注册用户
-  def invite_members
+  # def invite_members
-    if User.current.member_of?(@project) || User.current.admin? 
+  #   if User.current.member_of?(@project) || User.current.admin?
-      @member ||= @project.members.new
+  #     @member ||= @project.members.new
-        respond_to do |format|
+  #       respond_to do |format|
-        format.html
+  #       format.html
-      end
+  #     end
-    else
+  #   else
-      render_403
+  #     render_403
-    end
+  #   end
-  end
+  # end
 
   def edit
   end
@@ -423,6 +466,11 @@ class ProjectsController < ApplicationController
   # by young
   # include CoursesHelper
   def member
+    # 消息"同意加入项目"
+    if params[:message_id]
+      message_invite(params[:message_id], params[:key])
+    end
+    update_message_status(User.current, @project)
     # params[:login]为邮箱邀请用户加入，主要功能：
     # 1、自动注册
     # 2、加入项目、创建角色
@@ -444,6 +492,10 @@ class ProjectsController < ApplicationController
         flash[:notice] = l(:label_mail_invite_success)
       end
     end
+    # 私有项目非项目成员无法访问成员列表
+    unless @project.is_public?
+      return render_403 unless User.current.member_of?(@project)
+    end
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'project_member_list'
     # 判断是否课程
@@ -474,6 +526,24 @@ class ProjectsController < ApplicationController
     @members = paginateHelper @members
   end
 
+  def update_message_status(user, project)
+    project_invite_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =?", user, project, "ProjectInvite")
+    project_invite_messages.each do |project_invite_message|
+      project_invite_message.update_attribute(:viewed, true)
+    end
+  end
+
+  def message_invite(message_id, key)
+    forge_message = ForgeMessage.find(message_id)
+    if key == forge_message.secret_key
+      # 情况：用户收到邀请邮件还没看，但是管理员已经把该用户添加进项目
+      if Member.where("user_id =? and project_id =?",forge_message.user_id, forge_message.project_id).first.nil?
+        Member.create(:role_ids => [4], :user_id => forge_message.user_id, :project_id => forge_message.project_id)
+        UserGrade.create(:user_id => forge_message.user_id, :project_id => forge_message.project_id)
+      end
+    end
+  end
+
   #判断指定用户是否为课程教师
   def isCourseTeacher(id)
      result = false

app/controllers/student_work_controller.rb

@@ -3,12 +3,11 @@ class StudentWorkController < ApplicationController
   include StudentWorkHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule]
   before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
-  before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list]
+  before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule]
-  protect_from_forgery :except => :set_program_score
 
   ### 
   def program_test
@@ -47,13 +46,23 @@ class StudentWorkController < ApplicationController
   end
 
   def index
-    # 消息状态更新
+    # 作业消息状态更新
     @homework.course_messages.each do |homework_message|
-      if User.current.id == homework_message.user_id
+      if User.current.id == homework_message.user_id && homework_message.viewed == 0
-        homework_message.update_attributes(:viewed => true)
+        homework_message.update_attributes(:viewed => true) if homework_message.viewed == 0
       end
     end
-
+    # 作品打分消息状态更新
+    studentworks_scores = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "StudentWorksScore", 0)
+    studentworks_scores.each do |studentworks_score|
+      studentworks_score.update_attributes(:viewed => true) if studentworks_score.viewed == 0
+    end
+    # 作品评论消息状态更新
+    journals_for_teacher = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "JournalsForMessage", 0)
+    journals_for_teacher.each do |journal_for_teacher|
+      journal_for_teacher.update_attributes(:viewed => true)
+    end
+    # 作品留言
     # 消息end
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages
@@ -62,8 +71,13 @@ class StudentWorkController < ApplicationController
         query.update_attributes(:viewed => true)
       end
     end
+    ##################################################################################################################
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
-    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @homework_commons = @course.homework_commons.order("created_at desc")
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+    @is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
+    @show_all = false
+
     course_group = CourseGroup.find_by_id(@group) if @group
     if course_group
       group_students = course_group.users
@@ -72,71 +86,51 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      #老师 || 非匿评作业 || 匿评结束 显示所有的作品
+      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
-      @show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3 || User.current.admin?
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
-      if @show_all
+        @show_all = true
-        if @homework.homework_type == 1 || @is_teacher || User.current.admin? #超级管理员 || 老师 || 匿评结束 显示所有的作品
+      elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
-          if @order == "name"
+        @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
+      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-          else
+        my_work = @homework.student_works.where(:user_id => User.current.id)
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
-          end
+      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        else #剩余情况： 学生 && 非匿评作业 如果未提交作品，只能看到自己的，提交了作品，能看到所有作品
+        my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
-          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if my_work.empty?
-          if my_work.empty?
+          @stundet_works = []
-            @stundet_works = []
+        else
-          else
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
-            if @order == "name"
+          @show_all = true
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
-            else
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
-            end
-          end
-        end
-      else #学生
-        if @homework.homework_detail_manual.comment_status == 1 #未开启匿评，只显示我的作品
-          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
-        elsif @homework.homework_detail_manual.comment_status == 2 #匿评列表，显示匿评作品和我的作品
-          @is_evaluation = true
-          my_work = @homework.student_works.where(:user_id => User.current.id)
-          @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
         end
+      else
+        @stundet_works = []
       end
     else
-      #老师 || 非匿评作业 || 匿评结束 显示所有的作品
+      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
-      @show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3 || User.current.admin?
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
-      if @show_all
+        @show_all = true
-        if @homework.homework_type == 1 || @is_teacher || User.current.admin? #超级管理员 || 老师 || 匿评结束 显示所有的作品
+      elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
-          if @order == "name"
+        @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
+      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-          else
+        my_work = @homework.student_works.where(:user_id => User.current.id)
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
-          end
+      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        else #剩余情况： 学生 && 非匿评作业 如果未提交作品，只能看到自己的，提交了作品，能看到所有作品
+        my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
-          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if my_work.empty?
-          if my_work.empty?
+          @stundet_works = []
-            @stundet_works = []
+        else
-          else
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
-            if @order == "name"
+          @show_all = true
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
-            else
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
-            end
-          end
-        end
-      else #学生
-        if @homework.homework_detail_manual.comment_status == 1 #未开启匿评，只显示我的作品
-          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
-        elsif @homework.homework_detail_manual.comment_status == 2 #匿评列表，显示匿评作品和我的作品
-          @is_evaluation = true
-          my_work = @homework.student_works.where(:user_id => User.current.id)
-          @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
         end
+      else
+        @stundet_works = []
       end
     end
-    @homework_commons = @course.homework_commons.order("created_at desc")
+
     @score = @b_sort == "desc" ? "asc" : "desc"
+
     respond_to do |format|
+      format.js
       format.html
       format.xls {
         send_data(homework_to_xls(@stundet_works), :type => "text/excel;charset=utf-8; header=present",
@@ -170,15 +164,15 @@ class StudentWorkController < ApplicationController
       student_work.homework_common_id = @homework.id
       student_work.user_id = User.current.id
       student_work.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(student_work)
+      #提交作品时，计算是否迟交
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
         student_work.late_penalty = @homework.late_penalty
-        else
+      else
         student_work.late_penalty = 0
       end
-      render_attachment_warning_if_needed(student_work)
 
       if student_work.save
-
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)
@@ -231,16 +225,15 @@ class StudentWorkController < ApplicationController
 
   def show
     @score = student_work_score @work,User.current
-    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+    @student_work_scores = @work.student_works_scores.order("updated_at desc")
     respond_to do |format|
       format.js
     end
   end
 
   def destroy
-    if @homework.homework_type == 2  #编程作业，作品提交后不可以删除
+    if @work.destroy
-      render_403
-    elsif @work.destroy
       respond_to do |format|
         format.html {
           redirect_to student_work_index_url(:homework => @homework.id)
@@ -251,10 +244,11 @@ class StudentWorkController < ApplicationController
 
   #添加评分，已评分则为修改评分
   def add_score
+    @is_last = params[:is_last] == "true"
     render_403 and return if User.current == @work.user #不可以匿评自己的作品
-    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     #老师、教辅可以随时评分，学生只能在匿评作业的匿评阶段进行评分
-    render_403 and return unless @is_teacher || (@homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2)
+    render_403 and return unless @is_teacher || @homework.homework_detail_manual.comment_status == 2
     @score = student_work_score @work,User.current
     if @score
       @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
@@ -288,35 +282,11 @@ class StudentWorkController < ApplicationController
       case @score.reviewer_role
         when 1 #教师评分：最后一个教师评分为最终评分
           @work.teacher_score = @score.score
-          @work.final_score = @score.score
         when 2 #教辅评分 教辅评分显示平均分
           @work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
-          if @work.teacher_score.nil?
-            if @work.student_score.nil?
-              @work.final_score = @work.teaching_asistant_score
-            else
-              ta_proportion = @homework.homework_detail_manual.ta_proportion if @homework.homework_detail_manual
-              ta_proportion = @homework.homework_detail_programing.ta_proportion if @homework.homework_detail_programing
-              final_ta_score = BigDecimal.new("#{@work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
-              final_s_score = BigDecimal.new("#{@work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-              final_score = final_ta_score + final_s_score
-              @work.final_score = format("%.2f",final_score.to_f)
-            end
-          end
         when 3 #学生评分 学生评分显示平均分
           @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
-          if @work.teacher_score.nil?
-            if @work.teaching_asistant_score.nil?
-              @work.final_score = @work.student_score
-            else
-              final_ta_score = BigDecimal.new("#{@work.teaching_asistant_score}") * BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}")
-              final_s_score = BigDecimal.new("#{@work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}"))
-              final_score = final_ta_score + final_s_score
-              @work.final_score = format("%.2f",final_score.to_f)
-            end
-          end
       end
-
       if @work.save
         respond_to do |format|
           format.js
@@ -328,6 +298,7 @@ class StudentWorkController < ApplicationController
   #添加评分的回复
   def add_score_reply
     @score = StudentWorksScore.find params[:score_id]
+    @is_last = params[:is_last] == "true"
     @jour = @score.journals_for_messages.new(:user_id => User.current.id,:notes =>params[:message], :reply_id => 0)
     if @jour.save
       @status = 1
@@ -420,44 +391,53 @@ class StudentWorkController < ApplicationController
     end
   end
 
-  #设置编程作业得分
+  #设置评分规则
-  def set_program_score
+  def set_score_rule
-    stundet_work = StudentWork.find_by_id params[:student_work_id]
+    homework_detail_manual = @homework.homework_detail_manual
-    @course = stundet_work.homework_common.course
+    homework_detail_programing = @homework.homework_detail_programing
-    student_score_count = 0
+
-    if stundet_work && params[:results] && params[:results].class.to_s == "Array"
+    unless @homework.late_penalty.to_s == params[:late_penalty].to_s
-      homework_common = stundet_work.homework_common
+      @homework.late_penalty = params[:late_penalty]
-      params[:results].each do |result|
+      @homework.student_works.where("created_at > '#{@homework.end_time} 23:59:59'").each do |student_work|
-        homework_tests = homework_common.homework_tests.where("input = '#{result[:input]}' AND output = '#{result[:output]}'")
+        student_work.late_penalty = @homework.late_penalty
-        homework_tests.each do |homework_test|
+        student_work.save
-          student_work_test = StudentWorkTest.new
+      end
-          student_work_test.student_work = stundet_work
+
-          student_work_test.homework_test = homework_test
+      @homework.save
-          student_work_test.result = result[:status]
+    end
-          if student_work_test.result == 0
+
-            student_score_count += 1
+    unless homework_detail_manual.absence_penalty.to_s == params[:absence_penalty].to_s
-          end
+      homework_detail_manual.absence_penalty = params[:absence_penalty]
-          student_work_test.error_msg = params[:compile_error_msg]
+      if homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值
-          student_work_test.save!
+        work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
+        @homework.student_works.each do |student_work|
+          absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+          student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
+          student_work.save
         end
       end
-      unless homework_common.homework_tests.empty?
-        stundet_work.student_score = student_score_count * 100.0 / homework_common.homework_tests.count
 
-        if stundet_work.teacher_score.nil?
+      homework_detail_manual.save if homework_detail_manual
-          if stundet_work.teaching_asistant_score.nil?
+    end
-            stundet_work.final_score = stundet_work.student_score
-          else
-            final_ta_score = BigDecimal.new("#{stundet_work.teaching_asistant_score}") * BigDecimal.new("#{homework_common.homework_detail_programing.ta_proportion}")
-            final_s_score = BigDecimal.new("#{stundet_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework_common.homework_detail_programing.ta_proportion}"))
-            final_score = final_ta_score + final_s_score
-            stundet_work.final_score = format("%.1f",final_score.to_f)
-          end
-        end
 
-        stundet_work.save!
+    teacher_priority = params[:teacher_priority] ? 1 : 0
+    if homework_detail_manual.ta_proportion.to_s != params[:ta_proportion].to_s || @homework.teacher_priority.to_s != teacher_priority.to_s || (homework_detail_programing && homework_detail_programing.ta_proportion.to_s != params[:sy_proportion].to_s)
+      homework_detail_manual.ta_proportion = params[:ta_proportion]
+      homework_detail_programing.ta_proportion = params[:sy_proportion] if homework_detail_programing
+      @homework.teacher_priority = teacher_priority
+
+      @homework.save
+      homework_detail_manual.save if homework_detail_manual
+      homework_detail_programing.save if homework_detail_programing
+
+      @homework.student_works.each do |student_work|
+        set_final_score @homework,student_work
+        student_work.save
       end
     end
+    respond_to do |format|
+      format.html{redirect_to student_work_index_url(:homework => @homework.id)}
+    end
   end
 
   private
@@ -490,15 +470,19 @@ class StudentWorkController < ApplicationController
   end
 
   def teacher_of_course
-    render_403 unless User.current.allowed_to?(:as_teacher,@course)
+    render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
   end
 
   #根据条件过滤作业结果
   def search_homework_member homeworks,name
-    name = name.downcase
+    if name == ""
-    select_homework = homeworks.select{ |homework|
+      select_homework = homeworks
-      homework.user[:login].to_s.downcase.include?(name) ||  homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name)
+    else
-    }
+      name = name.downcase
+      select_homework = homeworks.select{ |homework|
+        homework.user[:login].to_s.downcase.include?(name) ||  homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name)
+      }
+    end
     select_homework
   end
 
@@ -509,25 +493,7 @@ class StudentWorkController < ApplicationController
     sheet1 = book.create_worksheet :name => "homework"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
-    if @homework.homework_type == 0 #普通作业
+    if @homework.homework_type == 1 #匿评作业
-      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),
-                            l(:excel_t_score),l(:excel_ta_score),l(:excel_f_score),l(:excel_commit_time)])
-      count_row = 1
-      items.each do |homework|
-        sheet1[count_row,0]=homework.user.id
-        sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
-        sheet1[count_row,2] = homework.user.login
-        sheet1[count_row,3] = homework.user.user_extensions.student_id
-        sheet1[count_row,4] = homework.user.mail
-        sheet1[count_row,5] = homework.name
-        sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
-        sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
-        # sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
-        sheet1[count_row,8] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
-        sheet1[count_row,9] = format_time(homework.created_at)
-        count_row += 1
-      end
-    elsif @homework.homework_type == 1 #匿评作业
       sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),
                             l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
       count_row = 1
@@ -547,7 +513,7 @@ class StudentWorkController < ApplicationController
       end
     elsif @homework.homework_type == 2 #编程作业
       sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),
-                            l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_f_score),l(:excel_commit_time)])
+                            l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
       count_row = 1
       items.each do |homework|
         sheet1[count_row,0]=homework.user.id
@@ -558,9 +524,10 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,5] = homework.name
         sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
         sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
-        sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
+        sheet1[count_row,8] = homework.system_score.nil? ? l(:label_without_score) : format("%.2f",homework.system_score)
-        sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
+        sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
-        sheet1[count_row,10] = format_time(homework.created_at)
+        sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
+        sheet1[count_row,11] = format_time(homework.created_at)
         count_row += 1
       end
     end
@@ -660,4 +627,103 @@ class StudentWorkController < ApplicationController
     end
     JSON.parse(res.body)
   end
+
+  #成绩计算
+  def set_final_score homework,student_work
+    if homework && homework.homework_detail_manual
+      if homework.homework_type == 1 #匿评作业
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.student_score
+            elsif student_work.student_score.nil?
+              student_work.final_score = student_work.teaching_asistant_score
+            else
+              ta_proportion = homework.homework_detail_manual.ta_proportion
+              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_ta_score + final_s_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil?
+            student_work.final_score = student_work.student_score
+          elsif student_work.student_score.nil?
+            student_work.final_score = student_work.teaching_asistant_score
+          else
+            ta_proportion = homework.homework_detail_manual.ta_proportion
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+            final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+            final_score = final_ta_score + final_s_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil? #教辅未评分
+              if student_work.student_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_st_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            elsif student_work.student_score.nil? #学生未评分
+              if student_work.teaching_asistant_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_ts_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            else
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+              final_score = final_sy_score + final_ts_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil? #教辅未评分
+            if student_work.student_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          elsif student_work.student_score.nil? #学生未评分
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_ts_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          else
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+            final_score = final_sy_score + final_ts_score + final_st_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      end
+    end
+  end
 end

app/controllers/system_messages_controller.rb

@@ -0,0 +1,95 @@
+class SystemMessagesController < ApplicationController
+  # before_filter :message_author, :only => [:show]
+  #
+  # def message_author
+  #   if(!User.current.logged? && !token.nil?)
+  #
+  #     User.current =try_to_autologin1
+  #   end
+  #   if @system_messages
+  #     render_403 :message => :notice_not_authorized_message
+  #   else
+  #     deny_access
+  #   end
+  # end
+
+  def index
+    @system_messages = SystemMessage.all
+  end
+
+  # def show
+  #   @system_messages = SystemMessage.find(params[:id])
+  # end
+
+  # GET /products/new
+  # def new
+  #   @product = Product.new
+  # end
+
+  # GET /products/1/edit
+  # def edit
+  # end
+
+  # POST /products
+  # POST /products.json
+  def create
+    unless User.current.admin?
+      render_403
+      return
+    end
+    @system_messages = SystemMessage.new
+    @system_messages.description = params[:system_message][:description]
+    @system_messages.subject = params[:system_message][:subject]
+    @system_messages.user_id = User.current.id
+    respond_to do |format|
+      if @system_messages.save
+        format.html {redirect_to user_system_messages_path(User.current)}
+        flash[:notice] = l(:notice_successful_message)
+      else
+        if params[:system_messages][:description].empty?
+          flash[:error] = l(:label_content_blank_fail)
+        else
+          flash[:error] = l(:label_admin_message_fail)
+        end
+        format.html {redirect_to admin_messages_path}
+      end
+    end
+  end
+
+  # PATCH/PUT /products/1
+  # PATCH/PUT /products/1.json
+  # def update
+  #   respond_to do |format|
+  #     if @product.update(product_params)
+  #       format.html { redirect_to @product, notice: 'Product was successfully updated.' }
+  #       format.json { render :show, status: :ok, location: @product }
+  #     else
+  #       format.html { render :edit }
+  #       format.json { render json: @product.errors, status: :unprocessable_entity }
+  #     end
+  #   end
+  # end
+
+  # DELETE /products/1
+  # DELETE /products/1.json
+  # def destroy
+  #   @system_messages.destroy
+  #   respond_to do |format|
+  #     format.html { redirect_to products_url, notice: 'Product was successfully destroyed.' }
+  #     format.json { head :no_content }
+  #   end
+  # end
+
+  # private
+  # # Use callbacks to share common setup or constraints between actions.
+  # def set_product
+  #   @product = Product.find(params[:id])
+  # end
+  #
+  # # Never trust parameters from the scary internet, only allow the white list through.
+  # def message_params
+  #   params.require(:admin_system_messages).permit(:content)
+  # end
+
+
+end

app/controllers/tags_controller.rb

@@ -15,6 +15,7 @@ class TagsController < ApplicationController
   include ContestsHelper
   include ActsAsTaggableOn::TagsHelper
   include TagsHelper
+  include FilesHelper
   helper :projects
   helper :courses
   helper :tags
@@ -230,6 +231,97 @@ class TagsController < ApplicationController
     end
   end
 
+  #更新某个tag名称
+  def update_tag_name
+    @tag_name = params[:tagName]
+    @rename_tag_name = params[:renameName]
+    @taggable_id = params[:taggableId]
+    @taggable_type = numbers_to_object_type(params[:taggableType])
+    @course_id = params[:courseId]
+
+    @rename_tag = (ActsAsTaggableOn::Tag.find_by_name(@rename_tag_name))  #查找重命名后的tag
+    @tag_id = (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).id  #重命名前的tag_id
+    @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type) unless @taggable_id.blank?
+    @obj = get_object(@taggable_id,params[:taggableType]) unless @taggable_id.blank?
+    if  @taggable_id.blank? #如果没有传tag_id，那么直接更新tag_name就好了。但是要防止 重命名后的tag存在。
+      #看重命名后的tag是否存在。如果存在的话，只需要更改taggings里边的id即可
+      if @rename_tag
+        @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type)
+        @taggings.update_attributes({:tag_id=>@rename_tag.id})
+      else #如果不存在，那么就直接更新该tag名称为新的名称
+        (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).update_attributes(:name=>@rename_tag_name)
+      end
+    else
+      if(@rename_tag.nil?) #这次命名的是新的tag
+
+        # 是否还有其他记录 引用了 tag_id
+        @tagging = ActsAsTaggableOn::Tagging.where("tag_id = #{@tag_id}")
+        # 如果taggings表中记录为 1 ，那么改变@tag_id对应的tag的名字
+        if @tagging.count == 1
+          @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id)
+          @tag.update_attributes({:name=>@rename_tag_name})
+        else #如果tagging表中的记录大于1，那么就要新增tag记录
+
+          unless @obj.nil?
+            @obj.tag_list.add(@rename_tag_name.split(","))
+            @obj.save
+          end
+          #删除原来的对应的taggings的记录
+          unless @taggings.nil?
+            @taggings.delete
+          end
+        end
+      else #这是已有的tag
+        # 更改taggings记录里的tag_id
+        unless @taggings.nil?
+          @taggings.update_attributes({:tag_id=>@rename_tag.id})
+        end
+      end
+    end
+
+    @obj_flag =  params[:taggableType]
+    if @obj && @obj_flag == '6' && @obj.container.kind_of?(Course)
+      @course = @obj.container
+      @tag_list = @tag_list = get_course_tag_list @course
+    elsif @course_id
+      @course = Course.find(@course_id)
+      @tag_list = get_course_tag_list @course
+
+      #这里要引用FilesController里的逻辑了。将资源库当前的文件列表刷新一遍。
+      @flag = params[:flag] || false
+      sort = ""
+      @sort = ""
+      @order = ""
+      @is_remote = false
+      @isproject = false
+
+      sort = "#{Attachment.table_name}.created_on desc"
+
+      @containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
+
+      show_attachments @containers
+    elsif @obj &&  @obj_flag == '5'
+      @forum = @obj
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def show_attachments obj
+    @attachments = []
+    obj.each do |container|
+      @attachments += container.attachments
+    end
+    @all_attachments = User.current.admin? ? @attachments : visable_attachemnts(@attachments)
+    @limit = 10
+    @feedback_count = @all_attachments.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    @offset ||= @feedback_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @obj_attachments = paginateHelper @all_attachments,10
+  end
+
   def tag_save
     @select_tag_name = params[:tag_for_save][:tag_name]
     @tags = params[:tag_for_save][:name]

app/controllers/users_controller.rb

@@ -40,7 +40,7 @@ class UsersController < ApplicationController
                                       :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                       :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
                                       :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
-                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource]
+                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -95,33 +95,42 @@ class UsersController < ApplicationController
   # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复
   # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
   def user_messages
-    unless User.current.logged?
+    if !User.current.logged?
       redirect_to signin_url
       return
+    elsif @user != User.current && !User.current.admin?
+     return render_403
     end
-    # 当前用户查看消息，则设置消息为已读
+    # 初始化/更新 点击按钮时间
+    # 24小时内显示系统消息
+    update_onclick_time
+    # 全部设为已读
     if params[:viewed] == "all"
-      course_querys = @user.course_messages
+      update_message_viewed(@user)
-      forge_querys = @user.forge_messages
-      user_querys = @user.user_feedback_messages
-      forum_querys = @user.memo_messages
-      if User.current.id == @user.id
-        course_querys.update_all(:viewed => true)
-        forge_querys.update_all(:viewed => true)
-        user_querys.update_all(:viewed => true)
-        forum_querys.update_all(:viewed => true)
-      end
     end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
       when nil
         @message_alls = []
-        messages = MessageAll.where("user_id =?",@user).order("created_at desc")
+        messages = MessageAll.where("user_id =?" ,@user).order("created_at desc")
         messages.each do |message_all|
           @message_alls << message_all.message
         end
+      when 'unviewed'
+        @message_alls = []
+        messages = MessageAll.where("user_id =?", @user).order("created_at desc")
+        messages.each do |message_all|
+          # 在点击或者刷新消息列表后未读的消息存放在数组
+          if message_all.message.viewed == 0
+            @message_alls << message_all.message
+          end
+        end
+      # when 'system_messages'
+      #   @message_alls = SystemMessage.order("created_at desc").all
+      when 'apply'
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =?",  @user).order("created_at desc")
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
       # when 'forge_message'
@@ -167,6 +176,48 @@ class UsersController < ApplicationController
     end
   end
 
+  # 初始化/更新 点击按钮时间
+  def update_onclick_time
+    # 记录当前点击按钮的时间
+    # 考虑到用户未退出刷新消息页面
+    message_time = OnclickTime.where("user_id =?", User.current).first
+    if message_time.nil?
+      message_new_time = OnclickTime.new
+      message_new_time.user_id = User.current.id
+      message_new_time.onclick_time = Time.now
+      message_new_time.save
+    else
+      # 24小时内显示
+      contrast_time = Time.now - 86400
+      message_time.update_attributes(:onclick_time => Time.now)
+    end
+    # 24小时内显示系统消息
+    @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc")
+  end
+
+  # 消息设置为已读
+  def update_message_viewed(user)
+    course_querys = CourseMessage.where("user_id =? and viewed =?", user, 0)
+    forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0)
+    user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0)
+    forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0)
+    if User.current.id == @user.id
+      course_querys.update_all(:viewed => true)
+      forge_querys.update_all(:viewed => true)
+      user_querys.update_all(:viewed => true)
+      forum_querys.update_all(:viewed => true)
+    end
+  end
+
+  # 系统消息
+  def user_system_messages
+    @sytem_messages = SystemMessage.order("created_at desc").all
+    @sytem_messages = paginateHelper @sytem_messages, 10
+    respond_to do |format|
+      format.html{render :layout=>'new_base_user'}
+    end
+  end
+
   def user_projects_index
     if User.current.admin?
       memberships = @user.memberships.all(conditions: "projects.project_type = #{Project::ProjectType_project}").first
@@ -323,11 +374,13 @@ class UsersController < ApplicationController
   #导入作业，确定按钮
   def user_select_homework
     homework = HomeworkCommon.find_by_id params[:checkMenu]
+    homework_detail_programing = homework.homework_detail_programing
     @homework = HomeworkCommon.new
     if homework
       @homework.name = homework.name
       @homework.description = homework.description
       @homework.end_time = homework.end_time
+      @homework.homework_type = homework.homework_type
       @homework.course_id = homework.course_id
       homework.attachments.each do |attachment|
         att = attachment.copy
@@ -337,6 +390,19 @@ class UsersController < ApplicationController
         att.save
         @homework.attachments << att
       end
+
+      if homework_detail_programing
+        @homework.homework_detail_programing = HomeworkDetailPrograming.new
+        @homework_detail_programing = @homework.homework_detail_programing
+        @homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+        @homework_detail_programing.language = homework_detail_programing.language
+        homework.homework_tests.each_with_index do |homework_test|
+          @homework.homework_tests << HomeworkTest.new(
+              input: homework_test.input,
+              output: homework_test.output
+          )
+        end
+      end
     end
     respond_to do |format|
       format.js
@@ -361,10 +427,31 @@ class UsersController < ApplicationController
     end
   end
 
+  #修改编程作业
+  def edit_user_commit_homework
+    if User.current.logged?
+
+      respond_to do |format|
+        format.js
+        format.html {render :layout => 'new_base_user'}
+      end
+    else
+      render_403
+    end
+  end
+
   def user_commit_homework
     homework = HomeworkCommon.find(params[:homework])
     student_work = StudentWork.where(homework_common_id: homework.id, user_id: User.current.id).first
     if student_work
+
+      #提交作品时，计算是否迟交
+      if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
+        student_work.late_penalty = 1
+      else
+        student_work.late_penalty = 0
+      end
+
       student_work.save
       flash[:notice] = l(:notice_successful_create)
       redirect_to student_work_index_url(:homework => params[:homework])
@@ -382,27 +469,28 @@ class UsersController < ApplicationController
         homework.end_time = params[:homework_common][:end_time] || Time.now
         homework.publish_time = Time.now
         homework.homework_type = params[:homework_type].to_i || 1
-        homework.late_penalty = 2
+        homework.late_penalty = 10
+        homework.teacher_priority = 1
         homework.user_id = User.current.id
         homework.course_id = params[:course_id]
 
         homework.save_attachments(params[:attachments])
         render_attachment_warning_if_needed(homework)
 
-        #匿评作业相关属性
+        homework_detail_manual = HomeworkDetailManual.new
-        if homework.homework_type == 1
+        homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
-          homework_detail_manual = HomeworkDetailManual.new
+        homework_detail_manual.comment_status = 1
-          homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+        homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? homework.end_time + 7 : params[:evaluation_start]
-          homework_detail_manual.comment_status = 1
+        homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
-          homework_detail_manual.evaluation_start = Time.now
+        homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-          homework_detail_manual.evaluation_end = Time.now
+        homework_detail_manual.absence_penalty = 5
-          homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+        homework.homework_detail_manual = homework_detail_manual
-          homework_detail_manual.absence_penalty = 2
+
-          homework.homework_detail_manual = homework_detail_manual
+        #编程作业相关属性
-        else
+        if homework.homework_type == 2
           homework_detail_programing = HomeworkDetailPrograming.new
           homework.homework_detail_programing = homework_detail_programing
-          homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+          homework_detail_programing.ta_proportion = 0.5
           homework_detail_programing.language = params[:language_type].to_i
 
           inputs = params[:program][:input]
@@ -559,12 +647,11 @@ class UsersController < ApplicationController
       redirect_to signin_url
       return
     end
-    # 更新用户留言消息状态
+    # 自己访问自己的页面才更新消息状态
-    @user.journals_for_messages.each do |jour_message|
+    if User.current == @user
-      jour_message.user_feedback_messages.each do |userfeedback_message|
+      journals_messages =  UserFeedbackMessage.where("user_id =? and journals_for_message_type =? and viewed =?", User.current.id, "JournalsForMessage", 0)
-        if User.current.id == userfeedback_message.user_id
+      journals_messages.each do |journals_message|
-          userfeedback_message.update_attributes(:viewed => true)
+        journals_message.update_attributes(:viewed => true)
-        end
       end
     end
     # end
@@ -791,24 +878,24 @@ class UsersController < ApplicationController
     if params[:type].present?
       case params[:type]
         when "course_homework"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_news"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_message"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_poll"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_issue"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_message"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
         when "current_user"
-          @user_activities = UserActivity.where("user_id = #{User.current.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
         else
-          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
       end
     else
-      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
+      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
     end
     # @user_activities = paginateHelper @user_activities,500
     @type = params[:type]

app/controllers/wiki_controller.rb

@@ -264,7 +264,7 @@ class WikiController < ApplicationController
     end
     @page.destroy
     respond_to do |format|
-      format.html { redirect_to project_wiki_index_url(@project) }
+      format.html {redirect_to edit_project_wiki_page_url @project, @page.title}
       format.api { render_api_ok }
     end
   end

app/controllers/zipdown_controller.rb

@@ -1,4 +1,4 @@
-require 'zip'
+require 'zip'
 class ZipdownController < ApplicationController
   #查找项目（课程）
   before_filter :find_project_by_bid_id, :only => [:assort]
@@ -7,7 +7,7 @@ class ZipdownController < ApplicationController
   SAVE_FOLDER = "#{Rails.root}/files"
   OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
 
-  #统一下载功能
+  #统一下载功能 
   def download
     if User.current.logged?
       begin

app/helpers/api_helper.rb

@@ -75,7 +75,7 @@ module ApiHelper
   # 学生获取课程作业的状态
   def get_homework_status homework
     homework_status = ""
-       if !homework.nil?
+       if homework
          if  homework.homework_type == 1 && homework.homework_detail_manual
            case homework.homework_detail_manual.comment_status
              when 1

app/helpers/application_helper.rb

@@ -2297,25 +2297,19 @@ module ApplicationHelper
 
   #获取匿评相关连接代码
   def homework_anonymous_comment homework
-    if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
+    if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
-      if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
-        link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
+    elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
-      elsif homework.student_works.count >= 2 #作业份数大于2
+      case homework.homework_detail_manual.comment_status
-        case homework.homework_detail_manual.comment_status
+      when 1
-          when 1
+        link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
-            link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
+      when 2
-          when 2
+        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
-            link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
+      when 3
-          when 3
+        # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
-            link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
-        end
-      else
-        link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
       end
-    elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
-      link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
     else
-      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "学生提交作业数大于等于2时才可以启动匿评"
     end
     link
   end
@@ -2323,14 +2317,18 @@ module ApplicationHelper
   def student_new_homework homework
     work = cur_user_works_for_homework homework
     if work.nil?
-      link_to l(:label_commit_homework),  new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
+      link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
     else
       if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-        "<span class='fr mr10 pr_join_span '>#{l(:label_edit_homework)}</span>".html_safe
+        link_to "作品已交",  "javascript:void(0);", :class => 'fr mr10 pr_join_span c_white', :title => "开启匿评后不可修改作品"
-      elsif homework.homework_type == 2 #编程作业不能修改作品
+      elsif homework.homework_type == 2 #编程作业修改作品
-        "<span class='fr mr10 pr_join_span ' title='编程作业不可修改作品'>作品已交</span>".html_safe
+        if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1
+          link_to "作品已交",  "javascript:void(0);", :class => 'fr mr10 pr_join_span c_white', :title => "开启匿评后不可修改作品"
+        else
+          link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
+        end
       else
-        link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit c_blue'
+        link_to "修改作品",  edit_student_work_path(work.id),:class => 'fr mr10 work_edit'
       end
     end
   end
@@ -2343,9 +2341,9 @@ module ApplicationHelper
     homework = default_opt[:homework]
     work = cur_user_works_for_homework homework
     if work.nil? && !is_teacher
-      link_to "提交("+homework.student_works.count.to_s+")", new_student_work_path(:homework => homework.id), :class=> default_opt[:class]
+      link_to "提交("+homework.student_works.count.to_s+")", new_student_work_path(:homework => homework.id,:host=> Setting.host_course), :class=> default_opt[:class]
     else
-      link_to "提交("+homework.student_works.count.to_s+")", student_work_index_path(:homework => homework.id), :class=> default_opt[:class]
+      link_to "提交("+homework.student_works.count.to_s+")", student_work_index_path(:homework => homework.id,:host=> Setting.host_course), :class=> default_opt[:class]
     end
   end
 
@@ -2358,10 +2356,10 @@ module ApplicationHelper
       if work.nil?
         link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
       else
-        if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
+        if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "作品已交",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
+          link_to "作品已交",  "javascript:void(0)", :class => 'c_blue', :title => "开启匿评后不可修改作品"
         elsif homework.homework_type == 2 #编程作业不能修改作品
-          link_to "作品已交",  student_work_index_path(:homework => homework.id),:class => 'c_blue',:title => "编程作业不可修改作品"
+          link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else
           link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
         end
@@ -2370,7 +2368,7 @@ module ApplicationHelper
   end
 
   def student_anonymous_comment homework
-    if homework.homework_type == 1 && homework.homework_detail_manual
+    if  homework.homework_detail_manual
       case homework.homework_detail_manual.comment_status
         when 1
           "<span class='fr mr10 pr_join_span '>未开启匿评</span>".html_safe
@@ -2379,10 +2377,6 @@ module ApplicationHelper
         when 3
           "<span class='fr mr10 pr_join_span '>匿评已结束</span>".html_safe
       end
-    elsif homework.homework_type == 0
-      "<span class='fr mr10 pr_join_span '>未启用匿评</span>".html_safe
-    elsif homework.homework_type == 2
-      "<span class='fr mr10 pr_join_span '>&nbsp;编程作业&nbsp;&nbsp;</span>".html_safe
     end
   end
 

app/helpers/homework_common_helper.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+include UsersHelper
 module HomeworkCommonHelper
   #迟交扣分下拉框
   def late_penalty_option

app/helpers/projects_helper.rb

@@ -18,6 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 include AvatarHelper
+include StudentWorkHelper
 module ProjectsHelper
   def link_to_version(version, options = {})
     return '' unless version && version.is_a?(Version)
@@ -75,6 +76,47 @@ module ProjectsHelper
     return result
   end
 
+  # 项目类型
+  def project_type_select
+    type = []
+    option1 = []
+    option1 << l(:label_development_team)
+    option1 << l(:label_development_team)
+    option2 = []
+    option2 << l(:label_research_group)
+    option2 << l(:label_research_group)
+    option3 = []
+    option3 << l(:label_friend_organization)
+    option3 << l(:label_friend_organization)
+    type << option1
+    type << option2
+    type << option3
+    type
+  end
+
+  # 项目类型描述
+  def project_newtype_descrption
+    case params
+      when 1
+        value = l(:label_type_des_development)
+      when 2
+        value = l(:label_type_des_research)
+      when 3
+        value = l(:label_type_des_friend)
+    end
+  end
+
+# 被邀请成员的状态
+  def status_for_ivitied(ivite_list, project)
+    if ivite_list.user.member_of?(project)
+      value = "已经加入了项目！"
+    elsif ivite_list.user.active?
+      value = "邀请已发送，等待用户加入！"
+    else
+      value = "邀请已发送，等待用户激活账号！"
+    end
+  end
+
   # Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},

app/helpers/student_work_helper.rb

@@ -2,17 +2,16 @@
 include UserScoreHelper
 
 module StudentWorkHelper
+  #获取当前用户的项目列表
   def user_projects_option
-    cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1"
+    projects = User.current.projects.visible
-    memberships = User.current.memberships.all(:conditions => cond)
-    projects = memberships.map(&:project)
     not_have_project = []
-    not_have_project << Setting.please_chose
+    not_have_project << "请选择关联项目"
     not_have_project << 0
     type = []
     type << not_have_project
     projects.each do |project|
-      if project != nil
+      if project
         option = []
         option <<  project.name
         option <<  project.id
@@ -100,4 +99,31 @@ module StudentWorkHelper
     end
     result
   end
+
+  #教辅评分比例下拉框
+  def ta_proportion_option
+    type = []
+    i = 0
+    while  i <= 100
+      option = []
+      option << i.to_s + "%"
+      option << i.to_f / 100
+      type << option
+      i += 10
+    end
+    type
+  end
+
+  def ta_proportion_option_to num
+    type = []
+    i = 0
+    while  i <= num
+      option = []
+      option << i.to_s + "%"
+      option << i.to_f / 100
+      type << option
+      i += 10
+    end
+    type
+  end
 end

app/helpers/system_messages_helper.rb

@@ -0,0 +1,2 @@
+module SystemMessagesHelper
+end

app/helpers/tags_helper.rb

@@ -1,5 +1,6 @@
 module TagsHelper
   include StoresHelper
+  include CoursesHelper
   # 通过 id和type获取对象
   def get_object(obj_id,obj_type)
     @obj = nil
@@ -62,6 +63,27 @@ module TagsHelper
 
 end
 
+#判断课程course中是否包含课件attachment，course中引用了attachment也算作包含
+def course_contains_attachment? course,attachment
+  course.attachments.each do |att|
+    if att.id == attachment.id || (!att.copy_from.nil? && !attachment.copy_from.nil? && att.copy_from == attachment.copy_from) || att.copy_from == attachment.id || att.id == attachment.copy_from
+      return true
+    end
+  end
+  false
+end
+
+#判断用户是否拥有不包含当前资源的课程，需用户在该课程中角色为教师且该课程属于当前学期或下一学期
+def has_course? user,file
+  result = false
+  user.courses.each do |course|
+    if !course_contains_attachment?(course,file) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course)
+      return true
+    end
+  end
+  result
+end
+
 # 判断用户是否是贴吧的管理员
 # add by chenmin
 def is_forum_manager?(user_id,forum_id)

app/helpers/users_helper.rb

@@ -52,6 +52,40 @@ module UsersHelper
     end
   end
 
+  def title_for_message type
+    case type
+      when nil
+        '消息'
+      when 'unviewed'
+        '未读消息'
+      when 'apply'
+        '用户申请'
+      when 'system_messages'
+        '系统消息'
+      when 'homework'
+        '作业消息'
+      when 'course_message'
+        '课程讨论'
+      when 'course_news'
+        '课程通知'
+      when 'issue'
+        '项目任务'
+      when 'forum'
+        '贴吧帖子'
+      when 'user_feedback'
+        '用户留言'
+    end
+  end
+
+  # 统计未读消息数
+  def unviewed_message(user)
+    course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+  end
+
   def user_mail_notification_options(user)
     user.valid_notification_options.collect {|o| [l(o.last), o.first]}
   end
@@ -429,8 +463,8 @@ module UsersHelper
   def get_issue_des_update(journal)
     no_html = "message"
     arr = details_to_strings(journal.details, no_html)
-    unless journal.notes.empty?
+    unless journal.notes.blank?
-      arr << "留言内容：" + journal.notes
+      arr << journal.notes
     end
     str = ''
     arr.each { |item| str = str+item }
@@ -548,7 +582,7 @@ module UsersHelper
     option << "请选择发布作业的课程"
     option << -1
     type << option
-    user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
+    user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
       option = []
       option << course.name+"（"+course.time.to_s+course.term+"）"
       option << course.id

app/models/applied_project.rb

@@ -1,8 +1,21 @@
 class AppliedProject < ActiveRecord::Base
   attr_accessible :project_id, :user_id
 
-   belongs_to :user
+  belongs_to :user
-   belongs_to :project
+  belongs_to :project
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
+
+  after_create :send_appliled_message
+
+  def send_appliled_message
+    # if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+    self.project.members.each do |m|
+      if m.roles.first.to_s.include?("Manager")
+        self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+      end
+    end
+    # end
+  end
 
   #删除用户申请
   def self.deleteappiled(userid, projectid)
@@ -11,5 +24,4 @@ class AppliedProject < ActiveRecord::Base
       applied.destroy
     end
   end
-
 end

app/models/attachment.rb

@@ -73,7 +73,7 @@ class Attachment < ActiveRecord::Base
   cattr_accessor :thumbnails_storage_path
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
-  before_save :files_to_final_location,:act_as_course_activity,:act_as_forge_activity
+  before_save :files_to_final_location,:act_as_course_activity
   after_create :office_conver, :be_user_score,:act_as_forge_activity
   after_update :office_conver, :be_user_score
   after_destroy :delete_from_disk,:down_user_score

app/models/course_activity.rb

@@ -14,13 +14,19 @@ class CourseActivity < ActiveRecord::Base
     if user_activity
       user_activity.save
     else
-      user_activity = UserActivity.new
+      if self.course_act_type == 'Message' && !self.course_act.parent_id.nil?
-      user_activity.act_id = self.course_act_id
+        user_activity = UserActivity.where("act_type = 'Message' and act_id = #{self.course_act.parent.id}").first
-      user_activity.act_type = self.course_act_type
+        user_activity.created_at = self.created_at
-      user_activity.container_type = "Course"
+        user_activity.save
-      user_activity.container_id = self.course_id
+      else
-      user_activity.user_id = self.user_id
+        user_activity = UserActivity.new
-      user_activity.save
+        user_activity.act_id = self.course_act_id
+        user_activity.act_type = self.course_act_type
+        user_activity.container_type = "Course"
+        user_activity.container_id = self.course_id
+        user_activity.user_id = self.user_id
+        user_activity.save
+      end
     end
   end
 

app/models/forge_activity.rb

@@ -29,12 +29,19 @@ class ForgeActivity < ActiveRecord::Base
     if user_activity
       user_activity.save
     else
-      user_activity = UserActivity.new
+      if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
-      user_activity.act_id = self.forge_act_id
+        user_activity = UserActivity.where("act_type = 'Message' and act_id = #{self.forge_act.parent.id}").first
-      user_activity.act_type = self.forge_act_type
+        user_activity.created_at = self.created_at
-      user_activity.container_type = "Project"
+        user_activity.save
-      user_activity.container_id = self.project_id
+      else
-      user_activity.save
+        user_activity = UserActivity.new
+        user_activity.act_id = self.forge_act_id
+        user_activity.act_type = self.forge_act_type
+        user_activity.container_type = "Project"
+        user_activity.container_id = self.project_id
+        user_activity.user_id = self.user_id
+        user_activity.save
+      end
     end
   end
 

app/models/forge_message.rb

@@ -8,7 +8,7 @@ class ForgeMessage < ActiveRecord::Base
   TYPE_OF_WIKI_ACT = "Wiki"
   TYPE_OF_NEWS_ACT = "News"
 
-  attr_accessible :forge_message_id, :forge_message_type, :project_id, :user_id, :viewed
+  attr_accessible :forge_message_id, :forge_message_type, :project_id, :user_id, :viewed, :secret_key
 
   belongs_to :forge_message ,:polymorphic => true
   belongs_to :project

app/models/forum.rb

@@ -14,7 +14,7 @@ class Forum < ActiveRecord::Base
   'sticky',
   'locked'
   validates_presence_of :name, :creator_id, :description
-  validates_length_of :name, maximum: 50
+  validates_length_of :name, maximum: 160
   #validates_length_of :description, maximum: 255
   validates :name, :uniqueness => true
   after_destroy :delete_kindeditor_assets

app/models/homework_common.rb

@@ -60,6 +60,6 @@ class HomeworkCommon < ActiveRecord::Base
     self.homework_type == 2 && self.homework_detail_programing
   end
 
-  delegate :language_name, :to => :homework_detail_programing
+  delegate :language_name, :language, :to => :homework_detail_programing
 
 end

app/models/homework_detail_programing.rb

@@ -4,6 +4,6 @@ class HomeworkDetailPrograming < ActiveRecord::Base
   belongs_to :homework_common
 
   def language_name
-    %W(c c++).at(self.language.to_i - 1)
+    %W(C C++ Python Java).at(self.language.to_i - 1)
   end
 end

app/models/invite_list.rb

@@ -1,5 +1,5 @@
 class InviteList < ActiveRecord::Base
-  attr_accessible :project_id, :user_id
+  attr_accessible :project_id, :user_id, :mail
   belongs_to :user
   belongs_to :project
 

app/models/issue.rb

@@ -147,6 +147,13 @@ class Issue < ActiveRecord::Base
     unless self.author_id == self.assigned_to_id
       self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
     end
+    if self.tracker_id == 5
+      self.project.members.each do |m|
+        if m.roles.first.to_s.include?("Manager") && m.user_id != self.author_id && m.user_id != self.assigned_to_id
+          self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+        end
+      end
+    end
   end
 
   # 更新缺陷
@@ -1009,7 +1016,7 @@ class Issue < ActiveRecord::Base
         if leaf.start_date
           # Only move subtask if it starts at the same date as the parent
           # or if it starts before the given date
-          if start_date == leaf.start_date || date > leaf.start_date 
+          if start_date == leaf.start_date || date > leaf.start_date
             leaf.reschedule_on!(date)
           end
         else
@@ -1392,6 +1399,7 @@ class Issue < ActiveRecord::Base
   def attachment_added(obj)
     if @current_journal && @current_journal.user_id == obj.author_id && JournalDetail.find_all_by_value(obj.filename).count == 0
       @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :value => obj.filename)
+
     end
   end
 
@@ -1400,6 +1408,9 @@ class Issue < ActiveRecord::Base
     if @current_journal && !obj.new_record?
       @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :old_value => obj.filename)
       @current_journal.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@current_journal.journalized_id}").first
+      user_activity.updated_at = Time.now
+      user_activity.save
     end
   end
 
@@ -1506,6 +1517,9 @@ class Issue < ActiveRecord::Base
         }
       end
       @current_journal.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@current_journal.journalized_id}").first
+      user_activity.updated_at = Time.now
+      user_activity.save
       # reset current journal
       init_journal @current_journal.user, @current_journal.notes
     end

app/models/journal.rb

@@ -171,11 +171,16 @@ class Journal < ActiveRecord::Base
 
   # 缺陷状态更改，消息提醒
   def act_as_forge_message
+    receivers = []
+    # 直接回复
     if self.user_id != self.issue.author_id
-      self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id, :project_id => self.issue.project_id, :viewed => false)
+      receivers << self.issue.author_id
     end
     if self.user_id != self.issue.assigned_to_id && self.issue.assigned_to_id != self.issue.author_id   # 指派人不是自己的话，则给指派人发送
-      self.forge_messages << ForgeMessage.new(:user_id => self.issue.assigned_to_id, :project_id => self.issue.project_id, :viewed => false)
+      receivers << self.issue.assigned_to_id
+    end
+    receivers.each do |r|
+      self.forge_messages << ForgeMessage.new(:user_id => r, :project_id => self.issue.project_id, :viewed => false)
     end
   end
 

app/models/journal_reply.rb

@@ -5,8 +5,34 @@ class JournalReply < ActiveRecord::Base
   
   belongs_to :user
   belongs_to :journal
+  after_create :send_journal_messages
   
   def self.add_reply(journal_id, reply_id, user_id)
     self.create(:journal_id => journal_id, :reply_id => reply_id, :user_id => user_id)
   end
+
+  def send_journal_messages
+    journal = self.journal
+    replier = User.find(self.reply_id)
+    receivers = []
+    # 被回复的人发送消息
+    if journal.user_id != self.reply_id && self.reply_id != journal.issue.author_id && self.reply_id != journal.issue.assigned_to_id
+      receivers << replier
+    end
+    if journal.user_id != journal.issue.author_id && self.reply_id != journal.issue.author_id
+      receivers << self.journal.issue.author
+    end
+    # journal_forge_messages = ForgeMessage.new
+    receivers.each do |r|
+      journal.forge_messages << ForgeMessage.new(:user_id =>r.id, :project_id => journal.issue.project_id, :viewed => false)
+    end
+
+    #   if self.user_id != self.journal_reply.user_id
+    #     receivers << self.journal_reply.user_id
+    #   end
+    # # 给缺陷发布者发送
+    #   if self.user_id != self.issue.author_id && self.journal_reply.user_id != self.issue.author_id
+    #     receivers << self.issue.author_id
+    #   end
+  end
 end

app/models/journals_for_message.rb

@@ -190,13 +190,45 @@ class JournalsForMessage < ActiveRecord::Base
     end
   end
 
-  # 课程作品留言消息通知
+  # 课程/作品回复 留言消息通知
   def act_as_course_message
     if self.jour_type == 'StudentWorksScore'
       if self.user_id != self.jour.user_id
         self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.student_work.homework_common.course.id, :viewed => false)
       end
     end
+    # 课程留言
+    if self.jour_type == 'Course'
+      receivers = []
+      teachers = []
+      # 获取课程的老师
+      self.jour.members.each do |m|
+        if m.user.allowed_to?(:as_teacher, self.jour)
+          teachers << m
+        end
+      end
+      if self.reply_id == 0  # 主留言，即不是回复某条留言
+        teachers.each do |teacher|
+          if teacher.user_id != self.user_id
+            receivers << teacher.user_id
+          end
+        end
+      else # 留言回复
+        reply_to = User.find(self.reply_id)
+        if self.user_id != self.reply_id # 添加我回复的那个人
+          receivers << reply_to.id
+        end
+        # 给老师发送。 过滤条件：老师自己给自己发；回复对象为老师则排除改老师
+        teachers.each do |teacher|
+          if teacher.user_id != self.user_id && self.reply_id != teacher.user_id
+            receivers << teacher.user_id
+          end
+        end
+      end
+      receivers.each do |r|
+        self.course_messages << CourseMessage.new(:user_id => r, :course_id => self.jour.id, :viewed => false)
+      end
+    end
   end
 
   # 用户留言消息通知

app/models/mailer.rb

@@ -34,8 +34,10 @@ class Mailer < ActionMailer::Base
     end
     def method_missing(name, *args, &block)
       if Setting.delayjob_enabled? && Object.const_defined?('Delayed')
+        # with delayed_job
         @target.delay.send(name, *args, &block)
       else
+        # without delayed_job
         @target.send(name, *args, &block).deliver
       end
     end
@@ -45,10 +47,46 @@ class Mailer < ActionMailer::Base
     MailerProxy.new(self)
   end
 
+  # 作业匿评开启
+  def send_mail_anonymous_comment_open(homework_common)
+    course = homework_common.course
+    recipients ||= []
+    course.student.each do |student|
+      user = User.find(student.student_id)
+      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      @token = Token.get_token_from_user(user, 'autologin')
+      @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+      @anonymous_comment_close_name = homework_common.name
+      @author = homework_common.user
+      #收件人邮箱
+      recipients << user.mail
+    end
+    mail :to => recipients,
+         :subject => @subject
+  end
+
+  # 作业匿评关闭
+  def send_mail_anonymous_comment_close(homework_common)
+    course = homework_common.course
+    recipients ||= []
+    course.student.each do |student|
+      user = User.find(student.student_id)
+      @subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_open)}"
+      @token = Token.get_token_from_user(user, 'autologin')
+      @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+      @anonymous_comment_close_name = homework_common.name
+      @author = homework_common.user
+      #收件人邮箱
+      recipients << user.mail
+    end
+    mail :to => recipients,
+         :subject => @subject
+  end
+
   # author: alan
-  # 发送邀请未注册用户加入项目邮件
+  # 邀请未注册用户加入项目
   # 功能： 在加入项目的同时自动注册用户
-  def  send_invite_in_project(email, project, invitor)
+  def send_invite_in_project(email, project, invitor)
     @email = email
     @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
     @password = newpass(6)
@@ -57,8 +95,8 @@ class Mailer < ActionMailer::Base
     login = login.sub(/%40/,'@')
     us = UsersService.new
     # 自动激活用户
-    user = us.register_auto(login, @email, @password)
+    user = us.register_auto(login, email, @password)
-    InviteList.create(:user_id => user.id, :project_id => project.id)
+    InviteList.create(:user_id => user.id, :project_id => project.id, :mail =>email)
     User.current = user unless User.current.nil?
     @user = user
     @token = Token.get_token_from_user(user, 'autologin')
@@ -74,15 +112,23 @@ class Mailer < ActionMailer::Base
     @project_name = "#{project.name}"
     @user = user
     @project = project
-    inviter_lists = InviteList.where(project_id:@project.id, user_id:@user.id).all
+    if InviteList.where("project_id= ? and user_id =? and mail =?", project.id, @user.id, email).first.nil?
-    if inviter_lists.blank?
+      InviteList.create(:user_id => user.id, :project_id => project.id, :mail => email)
-      InviteList.create(:user_id => user.id, :project_id => project.id)
     end
     @token = Token.get_token_from_user(user, 'autologin')
     @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true, :token => @token.value)
+    # 发送消息邀请
+    send_message_request_member(user,project)
+    # end
     mail :to => email, :subject => @subject
   end
 
+  # 邀请信息消息 注：forge_message_id 为邀请人ID(特殊情况)
+  def send_message_request_member(user, project)
+    key = newpass(6).to_s
+    ForgeMessage.create(:user_id => user.id, :project_id => project.id, :forge_message_type => "ProjectInvite",:forge_message_id => User.current.id, :viewed => false, :secret_key =>key)
+  end
+
   # author: alan
   # 根据用户选择发送个人日报或周报
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
@@ -206,6 +252,20 @@ class Mailer < ActionMailer::Base
     mail :to => user.mail,:subject => subject if has_content
   end
 
+  # 作业截止时间邮件提醒
+  def homework_endtime__added(homework_common, user_id)
+    user = User.find(user_id)
+    @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_homework_endtime)} "
+    @token = Token.get_token_from_user(user, 'autologin')
+    @homework_endtime_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+    @homework_endtime_name = homework_common.name
+    @author = homework_common.user
+    #收件人邮箱
+    recipient = user.mail
+    mail :to => recipient,
+         :subject => "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+  end
+
   # 公共讨论区发帖、回帖添加邮件发送信息
   def forum_message_added(memo)
     @memo = memo

app/models/member.rb

@@ -30,6 +30,9 @@ class Member < ActiveRecord::Base
   validate :validate_role
 
   before_destroy :set_issue_category_nil
+  # 删除项目成员一并删除该成员的邀请记录
+  after_destroy :delete_ivite_list
+
 
   def role
   end
@@ -97,6 +100,16 @@ class Member < ActiveRecord::Base
     end
   end
 
+  # 删除成员一并删除该成员的邀请信息
+  def delete_ivite_list
+    member_invite_lists = InviteList.where("user_id =? and project_id =?", self.user_id, self.project_id)
+    unless member_invite_lists.nil?
+      member_invite_lists.each do |member_invite_list|
+        member_invite_list.destroy
+      end
+    end
+  end
+
   # Find or initilize a Member with an id, attributes, and for a Principal
   def self.edit_membership(id, new_attributes, principal=nil)
     @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)

app/models/message.rb

@@ -86,7 +86,7 @@ class Message < ActiveRecord::Base
   }
 
 
-  safe_attributes 'subject', 'content'
+  safe_attributes 'subject', 'content', 'reply_id'
   safe_attributes  'board_id','locked', 'sticky',
     :if => lambda {|message, user|
       if message.project

app/models/onclick_time.rb

@@ -0,0 +1,5 @@
+class OnclickTime < ActiveRecord::Base
+  attr_accessible :onclick_time, :user_id
+
+  belongs_to :user
+end

app/models/project.rb

@@ -66,8 +66,8 @@ class Project < ActiveRecord::Base
   # has_many :students_for_courses, :dependent => :destroy
   has_many :student, :through => :students_for_courses, :source => :user
   has_one :course_extra, :class_name => 'Course', :foreign_key => :extra,:primary_key => :identifier, :dependent => :destroy
-  has_many :applied_projects
+  has_many :applied_projects, :dependent => :destroy
-  has_many :invite_lists
+  has_many :invite_lists, :dependent => :destroy
   has_one :dts
 
   # end

app/models/student_work.rb

@@ -32,10 +32,108 @@ class StudentWork < ActiveRecord::Base
           self.system_score = last_test.test_score
         end
     end
-
+    set_final_score self.homework_common,self
   end
   def set_src
     self.description = last_test.src if last_test
   end
 
+  #成绩计算
+  def set_final_score homework,student_work
+    if homework && homework.homework_detail_manual
+      if homework.homework_type == 1 #匿评作业
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.student_score
+            elsif student_work.student_score.nil?
+              student_work.final_score = student_work.teaching_asistant_score
+            else
+              ta_proportion = homework.homework_detail_manual.ta_proportion
+              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_ta_score + final_s_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil?
+            student_work.final_score = student_work.student_score
+          elsif student_work.student_score.nil?
+            student_work.final_score = student_work.teaching_asistant_score
+          else
+            ta_proportion = homework.homework_detail_manual.ta_proportion
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+            final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+            final_score = final_ta_score + final_s_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil? #教辅未评分
+              if student_work.student_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_st_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            elsif student_work.student_score.nil? #学生未评分
+              if student_work.teaching_asistant_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_ts_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            else
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+              final_score = final_sy_score + final_ts_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil? #教辅未评分
+            if student_work.student_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          elsif student_work.student_score.nil? #学生未评分
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_ts_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          else
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+            final_score = final_sy_score + final_ts_score + final_st_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      end
+    end
+  end
 end

app/models/student_work_test.rb

@@ -45,7 +45,7 @@ class StudentWorkTest < ActiveRecord::Base
   private
   def get_success_count
     self.results.inject(0) do |sum, result|
-      sum += (result["status"].to_i == 0 ? 1 : 0)
+      sum += (result["status"] && result["status"].to_i == 0 ? 1 : 0)
     end || 0
   end
 

app/models/system_message.rb

@@ -0,0 +1,8 @@
+class SystemMessage < ActiveRecord::Base
+  attr_accessible :content, :id, :user_id, :description, :subject
+  belongs_to :user
+
+  validates :subject, presence: true
+  # validates :description, presence: true
+  validates_length_of :description, maximum: 10000
+end

app/models/user.rb

@@ -132,13 +132,15 @@ class User < Principal
   has_many :course_messages
   has_many :memo_messages
   has_many :user_feedback_messages
+  has_one :onclick_time
+  has_many :system_messages
 
 # 虚拟转换
   has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
   has_many :issue_assigns, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Issue"'
   has_many :status_updates, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Journal"'
   # 邮件邀请状态
-  # has_many :invite_lists
+  has_many :invite_lists,  :dependent => :destroy
   # end
 
 ######added by nie
@@ -209,8 +211,10 @@ class User < Principal
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy
   # added by fq
-  after_create :act_as_activity
+  after_create :act_as_activity, :add_onclick_time
   # end
+  # 更新邮箱用户或用户名的同事，同步更新邀请信息
+  after_update :update_invite_list
 
   scope :in_group, lambda {|group|
     group_id = group.is_a?(Group) ? group.id : group.to_i
@@ -257,11 +261,19 @@ class User < Principal
 
   # 新消息统计
   def count_new_message
-    course_count = CourseMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    if OnclickTime.where("user_id =?", User.current).first.nil?
-    forge_count = ForgeMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+      message_new_time = OnclickTime.new
-    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+      message_new_time.user_id = User.current.id
-    user_memo_count = MemoMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+      # 第一次初始化点击铃铛时间
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+      message_new_time.onclick_time = User.current.last_login_on.nil? ? Time.now : User.current.last_login_on
+      message_new_time.save
+    end
+    course_count = CourseMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    system_messages_count = SystemMessage.where("created_at >?", User.current.onclick_time.onclick_time).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count
   end
 
   # 查询指派给我的缺陷记录
@@ -994,6 +1006,23 @@ class User < Principal
     self.acts << Activity.new(:user_id => self.id)
   end
 
+  # 注册用户的时候消息默认点击时间为用户创建时间
+  def add_onclick_time
+    if OnclickTime.where("user_id =?" , self.id).first.nil?
+      OnclickTime.create(:user_id => self.id, :onclick_time => self.created_on)
+    end
+  end
+
+  # 更新邮箱的同事，更新invite_lists表中的邮箱信息
+  def update_invite_list
+    invite_lists = InviteList.where("user_id =?",self.id).all
+    unless invite_lists.blank?
+      invite_lists.each do |invite_list|
+        invite_list.update_attribute(:mail, self.mail)
+      end
+    end
+  end
+
   # Removes references that are not handled by associations
   # Things that are not deleted are reassociated with the anonymous user
   def remove_references_before_destroy

app/views/account/about_us.html.erb

@@ -1,50 +1,50 @@
-<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'new_user'%>
-<div class="homepageContent BgBox">
+<div class="homepageContent BgBox">
-  <h2 class="BgBox_h2">关于我们</h2>
+  <h2 class="BgBox_h2">关于我们</h2>
-  <div class="AgreementBox">
+  <div class="AgreementBox">
-    <p class="AgreementTxt">
+    <p class="AgreementTxt">
-      Trustie是一个面向高校创新实践的在线协作社区，是在中国高校推行大规模开放在线研究（Massive Open Online Research, MOORE）的支撑平台，也简称Trustie平台。老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。
+      Trustie是一个面向高校创新实践的在线协作社区，是在中国高校推行大规模开放在线研究（Massive Open Online Research, MOORE）的支撑平台，也简称Trustie平台。老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。
-    </p>
+    </p>
-    <p class="AgreementTxt">
+    <p class="AgreementTxt">
-      MOORE是国防科学技术大学杨学军院士提出的一个面向高校科研教学活动的新型创新实践概念，为全面支持高校人才培养和科学研究提供了一种新思路。MOORE是对大规模在线开放课程（Massive Open Online Course, MOOC）的拓展，是课堂教学与创新实践深度结合的全新模式，可以看作MOOC2.0。
+      MOORE是国防科学技术大学杨学军院士提出的一个面向高校科研教学活动的新型创新实践概念，为全面支持高校人才培养和科学研究提供了一种新思路。MOORE是对大规模在线开放课程（Massive Open Online Course, MOOC）的拓展，是课堂教学与创新实践深度结合的全新模式，可以看作MOOC2.0。
-    </p>
+    </p>
-    <p class="AgreementTxt">
+    <p class="AgreementTxt">
-      2005年开始，Trustie研制团队围绕网络时代的软件开发效率和质量这一核心问题展开研究，经过十年的磨砺与攻关，逐步揭示出以大众化协同开发、开放式资源共享、持续性可信评估为核心的互联网大规模协同机理，提出了全新的软件开发群体化方法。2008年起，研制团队开始探索如何将这种协同机理引入软件人才培养。MOORE概念的提出为研制团队的人才培养实践提供了新的发展方向和应用模式，使Trustie技术和工具能够更直接、更有效地与高校人才培养对接，形成了今天已被大量师生接受的在线人才培养平台。
+      2005年开始，Trustie研制团队围绕网络时代的软件开发效率和质量这一核心问题展开研究，经过十年的磨砺与攻关，逐步揭示出以大众化协同开发、开放式资源共享、持续性可信评估为核心的互联网大规模协同机理，提出了全新的软件开发群体化方法。2008年起，研制团队开始探索如何将这种协同机理引入软件人才培养。MOORE概念的提出为研制团队的人才培养实践提供了新的发展方向和应用模式，使Trustie技术和工具能够更直接、更有效地与高校人才培养对接，形成了今天已被大量师生接受的在线人才培养平台。
-    </p>
+    </p>
-    <p class="AgreementTxt">
+    <p class="AgreementTxt">
-      研制团队认为MOORE的创新人才培养模式（如图1左图）是将互联网大规模协同机理与高校创新实践活动相结合的全新人才培养方法和模式，研制团队并基于本平台的架构形成了对MOORE核心机理的三方面认识（如图1右图）。
+      研制团队认为MOORE的创新人才培养模式（如图1左图）是将互联网大规模协同机理与高校创新实践活动相结合的全新人才培养方法和模式，研制团队并基于本平台的架构形成了对MOORE核心机理的三方面认识（如图1右图）。
-    </p>
+    </p>
-    <div class="AgreementImg" >
+    <div class="AgreementImg" >
-      <img src="images/aboutus_01.jpg" width="820" height="285" />
+      <img src="images/aboutus_01.jpg" width="619" height="215" />
-      <p class="AgreementTxt T_C fb mt10">图1 基于MOORE的创新人才培养模式与核心机理</p>
+      <p class="AgreementTxt T_C fb mt10">图1 基于MOORE的创新人才培养模式与核心机理</p>
-    </div>
+    </div>
-    <p class="AgreementTxt">
+    <p class="AgreementTxt">
-      目前，Trustie平台已经初步展现出大规模开放在线研究的生态系统蓝图，其核心是在线教学实践平台和在线协同研究平台，如图2。Trustie在线教学实践平台是支持教师和学生围绕课堂学习开展实践的平台（如图2），Trustie在线协同研究平台是支持开发小组围绕实践任务或研究工作开展分布式协作的平台（如图2）。两个核心平台为一名"新手"大学生成长为具有一定创新能力的"创客"提供了从学习到研究的一个渐进式成长环境（如图2）。
+      目前，Trustie平台已经初步展现出大规模开放在线研究的生态系统蓝图，其核心是在线教学实践平台和在线协同研究平台，如图2。Trustie在线教学实践平台是支持教师和学生围绕课堂学习开展实践的平台（如图2），Trustie在线协同研究平台是支持开发小组围绕实践任务或研究工作开展分布式协作的平台（如图2）。两个核心平台为一名"新手"大学生成长为具有一定创新能力的"创客"提供了从学习到研究的一个渐进式成长环境（如图2）。
-    </p>
+    </p>
-    <p class="AgreementTxt">
+    <p class="AgreementTxt">
-      特别是，根据师生的实际需要，Trustie平台提供了私有模式和公开模式，支持针对未公开成果实施有效知识产权保护为前提的交流分享（如图2）。随着越来越多的高校、课程和研究小组的加入，MOORE创新实践模式的生态效益将不断显现出来。
+      特别是，根据师生的实际需要，Trustie平台提供了私有模式和公开模式，支持针对未公开成果实施有效知识产权保护为前提的交流分享（如图2）。随着越来越多的高校、课程和研究小组的加入，MOORE创新实践模式的生态效益将不断显现出来。
-    </p>
+    </p>
-    <div class="AgreementImg" >
+    <div class="AgreementImg" >
-      <img src="images/aboutus_02.jpg" width="756" height="496" />
+      <img src="images/aboutus_02.jpg" width="616" height="405" />
-      <p class="AgreementTxt T_C fb mt10">图2 基于MOORE的支撑平台和生态系统</p>
+      <p class="AgreementTxt T_C fb mt10">图2 基于MOORE的支撑平台和生态系统</p>
-    </div>
+    </div>
-    <p class="AgreementTxt">
+    <p class="AgreementTxt">
-      研制团队特别感谢高校老师和学生的积极反馈、无私创意。平台的很多实用便捷的功能都是老师们积极参与和设计的结果，汇聚了大量师生的宝贵贡献，是研制团队和用户群体共同成长的结果。
+      研制团队特别感谢高校老师和学生的积极反馈、无私创意。平台的很多实用便捷的功能都是老师们积极参与和设计的结果，汇聚了大量师生的宝贵贡献，是研制团队和用户群体共同成长的结果。
-    </p>
+    </p>
-    <p class="AgreementTxt">
+    <p class="AgreementTxt">
-      Trustie平台的基本思路是将开源模式与中国高校人才培养活动相结合，但其本质上是一种O2O（Online To Offline）的创新人才培养模式，只有在以下两个方面同步推进，才能在持续解决实际需求的过程中快速发展：<br />
+      Trustie平台的基本思路是将开源模式与中国高校人才培养活动相结合，但其本质上是一种O2O（Online To Offline）的创新人才培养模式，只有在以下两个方面同步推进，才能在持续解决实际需求的过程中快速发展：<br />
-      &nbsp;&nbsp;&nbsp;&nbsp;（1）构建实践平台，激活创新能力：成为支持不同规模的团队进行协同研究和协同开发的实践平台，支持各类可公开的课程实验任务、教研室科研任务的在线协同，能够有效提升和评估学生的创新能力、协作能力和实践能力。<br />
+      &nbsp;&nbsp;&nbsp;&nbsp;（1）构建实践平台，激活创新能力：成为支持不同规模的团队进行协同研究和协同开发的实践平台，支持各类可公开的课程实验任务、教研室科研任务的在线协同，能够有效提升和评估学生的创新能力、协作能力和实践能力。<br />
-      &nbsp;&nbsp;&nbsp;&nbsp;（2）引入开源理念，形成创客文化：将互联网开源软件运动中的自由、对等、共享、创新的理念引入高校，使"自主创意并亲自动手实现创意"的创客精神深入人才培养活动，在学生群体中形成大胆创意、大胆实践的创新文化。
+      &nbsp;&nbsp;&nbsp;&nbsp;（2）引入开源理念，形成创客文化：将互联网开源软件运动中的自由、对等、共享、创新的理念引入高校，使"自主创意并亲自动手实现创意"的创客精神深入人才培养活动，在学生群体中形成大胆创意、大胆实践的创新文化。
-    </p>
+    </p>
-    <p class="AgreementTxt">
+    <p class="AgreementTxt">
-      研制团队认为，Trustie平台是一种"互联网+"思维在高校教育领域的大型探索性实践。作为一种互联网应用，Trustie平台自身的开发也采取了互联网模式：Trustie研制团队采用了"网构化软件开发模式"，坚持"每周一更"的快速上线、快速体验模式，以最大程度上贴近用户实际需求提升。欢迎高校师生一同投身创新实践，共同见证MOORE创新生态的早日形成。
+      研制团队认为，Trustie平台是一种"互联网+"思维在高校教育领域的大型探索性实践。作为一种互联网应用，Trustie平台自身的开发也采取了互联网模式：Trustie研制团队采用了"网构化软件开发模式"，坚持"每周一更"的快速上线、快速体验模式，以最大程度上贴近用户实际需求提升。欢迎高校师生一同投身创新实践，共同见证MOORE创新生态的早日形成。
-    </p>
+    </p>
-  </div>
+  </div>
-
+
-
+
-
+
-</div><!---BgBox end--->
+</div><!---BgBox end--->
-
+
-<div class="footer"></div>
+<div class="footer"></div>
-
+
-
+

app/views/account/login.html.erb

@@ -1,286 +1,286 @@
-<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'new_user'%>
-<%= stylesheet_link_tag 'leftside'%>
+<%= stylesheet_link_tag 'leftside'%>
-
+
-<script type="text/javascript">
+<script type="text/javascript">
-
+
-//    $(document).ready(function(){
+//    $(document).ready(function(){
-//        $("#loginSignButton").click(function(){
+//        $("#loginSignButton").click(function(){
-//            $("#signUpBox").css({display:"block"});
+//            $("#signUpBox").css({display:"block"});
-//            $("#loginInBox").css({display:"none"});
+//            $("#loginInBox").css({display:"none"});
-//        });
+//        });
-//        $("#loginInButton").click(function(){
+//        $("#loginInButton").click(function(){
-//            $("#signUpBox").css({display:"none"});
+//            $("#signUpBox").css({display:"none"});
-//            $("#loginInBox").css({display:"block"});
+//            $("#loginInBox").css({display:"block"});
-//        });
+//        });
-//    });
+//    });
-//    $(function(){
+//    $(function(){
-//        $("#username").keypress(function(e){
+//        $("#username").keypress(function(e){
-//            alert(11);
+//            alert(11);
-//            if (e.keyCode == '13') {
+//            if (e.keyCode == '13') {
-//                $('#main_login_form').submit();
+//                $('#main_login_form').submit();
-//            }
+//            }
-//        });
+//        });
-//
+//
-//        $("#password").keypress(function(e){
+//        $("#password").keypress(function(e){
-//            if (e.keyCode == '13') {
+//            if (e.keyCode == '13') {
-//                $('#main_login_form').submit();
+//                $('#main_login_form').submit();
-//            }
+//            }
-//        });
+//        });
-//    });
+//    });
-
+
-    $(document).ready(function(){
+    $(document).ready(function(){
-        $(".homepageSearchIcon").click(function(){
+        $(".homepageSearchIcon").click(function(){
-            var val=$('input:radio[name="search_type"]:checked').val();
+            var val=$('input:radio[name="search_type"]:checked').val();
-            if(val==null){
+            if(val==null){
-                $("#navSearchAlert").css({display:"block"});
+                $("#navSearchAlert").css({display:"block"});
-            }
+            }
-            else {
+            else {
-                $("#navSearchAlert").css({display:"none"});
+                $("#navSearchAlert").css({display:"none"});
-            }
+            }
-        });
+        });
-//        $("#loginInButton").click(function(){
+//        $("#loginInButton").click(function(){
-//            $("#signUpBox").css({display:"none"});
+//            $("#signUpBox").css({display:"none"});
-//            $("#loginInBox").css({display:"block"});
+//            $("#loginInBox").css({display:"block"});
-//        });
+//        });
-    });
+    });
-
+
-    $(document).ready(function(){
+    $(document).ready(function(){
-        $(".navHomepageSearchBoxcontainer").mouseover(function(){
+        $(".navHomepageSearchBoxcontainer").mouseover(function(){
-            $(".navSearchTypeBox").css({display:"block"});
+            $(".navSearchTypeBox").css({display:"block"});
-        });
+        });
-        $(".navHomepageSearchBoxcontainer").mouseout(function(){
+        $(".navHomepageSearchBoxcontainer").mouseout(function(){
-            $(".navSearchTypeBox").css({display:"none"});
+            $(".navSearchTypeBox").css({display:"none"});
-        });
+        });
-    })
+    })
-    $(document).ready(function(){
+    $(document).ready(function(){
-        if(<%= @login%>){
+        if(<%= @login%>){
-            $("#signUpBox").css({display:"none"});
+            $("#signUpBox").css({display:"none"});
-            $("#loginInBox").css({display:"block"});
+            $("#loginInBox").css({display:"block"});
-        }else{
+        }else{
-            $("#signUpBox").css({display:"block"});
+            $("#signUpBox").css({display:"block"});
-            $("#loginInBox").css({display:"none"});
+            $("#loginInBox").css({display:"none"});
-        }
+        }
-    });
+    });
-
+
-//    $('#regist_btn').bind('keyup', function(event) {
+//    $('#regist_btn').bind('keyup', function(event) {
-//    if (event.keyCode == "13" && $("#signUpBox").css('display') == 'block')) {
+//    if (event.keyCode == "13" && $("#signUpBox").css('display') == 'block')) {
-//       register();
+//       register();
-//    }
+//    }
-//});
+//});
-    function clearInfo(id, content) {
+    function clearInfo(id, content) {
-                var text = $('#' + id);
+                var text = $('#' + id);
-                if (text.val() == content) {
+                if (text.val() == content) {
-                    $('#' + id).val('');
+                    $('#' + id).val('');
-                }
+                }
-            }
+            }
-
+
-    function showInfo(id, content) {
+    function showInfo(id, content) {
-        var text = $('#' + id);
+        var text = $('#' + id);
-        if (text.val() == '') {
+        if (text.val() == '') {
-            $('#' + id).val(content);
+            $('#' + id).val(content);
-        }
+        }
-    }
+    }
-
+
-    function login(){
+    function login(){
-        $('#main_login_form').submit(); //表单提交没有任何反应的原因：js冲突
+        $('#main_login_form').submit(); //表单提交没有任何反应的原因：js冲突
-    }
+    }
-
+
-    function register(){
+    function register(){
-        if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
+        if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
-            $("#main_reg_form").submit();
+            $("#main_reg_form").submit();
-        }else{
+        }else{
-            $('#user_login').blur();
+            $('#user_login').blur();
-            $('#user_mail').blur();
+            $('#user_mail').blur();
-            $('#user_password').blur();
+            $('#user_password').blur();
-            $('#user_password_confirmation').blur();
+            $('#user_password_confirmation').blur();
-        }
+        }
-    }
+    }
-    var $login_correct = false;
+    var $login_correct = false;
-    var $mail_correct = false;
+    var $mail_correct = false;
-    var $passwd_correct = false;
+    var $passwd_correct = false;
-    var $passwd_comfirm_correct = false;
+    var $passwd_comfirm_correct = false;
-    jQuery(document).ready(function () {
+    jQuery(document).ready(function () {
-        var $login = $('#user_login')
+        var $login = $('#user_login')
-        var $mail = $('#user_mail')
+        var $mail = $('#user_mail')
-        var $password = $('#user_password')
+        var $password = $('#user_password')
-        var $password_confirmation = $('#user_password_confirmation')
+        var $password_confirmation = $('#user_password_confirmation')
-        $login.blur(function (event) {
+        $login.blur(function (event) {
-            if ($(this).is('#user_login')) {
+            if ($(this).is('#user_login')) {
-                $.get(
+                $.get(
-                        '<%=account_valid_ajax_path%>',
+                        '<%=account_valid_ajax_path%>',
-                        { valid: "login",
+                        { valid: "login",
-                            value: this.value },
+                            value: this.value },
-                        function (data) {
+                        function (data) {
-                            if (data.valid) {
+                            if (data.valid) {
-                                $('#login_req').html('<span style="color: green">'+data.message+'</span>');
+                                $('#login_req').html('<span style="color: green">'+data.message+'</span>');
-                                $login_correct = true;
+                                $login_correct = true;
-                            } else {
+                            } else {
-                                $('#login_req').html( '<span style="color: red">'+data.message+'</span>');
+                                $('#login_req').html( '<span style="color: red">'+data.message+'</span>');
-                                $login_correct = false;
+                                $login_correct = false;
-                            }
+                            }
-                            $('#login_req').css('display','block');
+                            $('#login_req').css('display','block');
-                        });
+                        });
-            }
+            }
-            ;
+            ;
-        });
+        });
-
+
-        $mail.blur(function (event) {
+        $mail.blur(function (event) {
-            if ($(this).is('#user_mail')) {
+            if ($(this).is('#user_mail')) {
-                $.get('<%=account_valid_ajax_path%>',
+                $.get('<%=account_valid_ajax_path%>',
-                        { valid: "mail",
+                        { valid: "mail",
-                            value: this.value },
+                            value: this.value },
-                        function (data) {
+                        function (data) {
-                            if (data.valid) {
+                            if (data.valid) {
-                                $('#mail_req').html( '<span style="color: green">'+data.message+'</span>' );
+                                $('#mail_req').html( '<span style="color: green">'+data.message+'</span>' );
-                                 $mail_correct = true;
+                                 $mail_correct = true;
-                            } else {
+                            } else {
-                                $('#mail_req').html( '<span style="color: red">'+data.message+'</span>' );
+                                $('#mail_req').html( '<span style="color: red">'+data.message+'</span>' );
-                                 $mail_correct = false;
+                                 $mail_correct = false;
-                            }
+                            }
-                            $('#mail_req').css('display','block');
+                            $('#mail_req').css('display','block');
-                        });
+                        });
-            }
+            }
-            ;
+            ;
-        });
+        });
-        $password.blur(function () {
+        $password.blur(function () {
-            var pas1 = document.getElementById("user_password").value;
+            var pas1 = document.getElementById("user_password").value;
-            var password_min_length = <%= Setting.password_min_length.to_i %>
+            var password_min_length = <%= Setting.password_min_length.to_i %>
-            if (pas1.length >= password_min_length) {
+            if (pas1.length >= password_min_length) {
-                $('#passwd_req').html('');
+                $('#passwd_req').html('');
-                 $passwd_correct = true;
+                 $passwd_correct = true;
-            }
+            }
-            else {
+            else {
-                $('#passwd_req').html( '<span style="color: red">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>');
+                $('#passwd_req').html( '<span style="color: red">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>');
-                 $passwd_correct = false;
+                 $passwd_correct = false;
-            }
+            }
-            $('#passwd_req').css('display','block');
+            $('#passwd_req').css('display','block');
-
+
-
+
-        });
+        });
-        $password_confirmation.blur(function () {
+        $password_confirmation.blur(function () {
-            var password_min_length = <%= Setting.password_min_length.to_i %>
+            var password_min_length = <%= Setting.password_min_length.to_i %>
-            var pas1 = document.getElementById("user_password").value;
+            var pas1 = document.getElementById("user_password").value;
-            var pas2 = document.getElementById("user_password_confirmation").value;
+            var pas2 = document.getElementById("user_password_confirmation").value;
-            if (pas1.length >= password_min_length && pas1 == pas2 ) {
+            if (pas1.length >= password_min_length && pas1 == pas2 ) {
-                $('#confirm_req').html('<span style="color: green">'+'<%= l(:setting_password_success) %>'+'</span>');
+                $('#confirm_req').html('<span style="color: green">'+'<%= l(:setting_password_success) %>'+'</span>');
-                 $passwd_comfirm_correct = true;
+                 $passwd_comfirm_correct = true;
-            }
+            }
-            else {
+            else {
-                $('#confirm_req').html('<span style="color: red">'+'<%= l(:setting_password_error) %>'+'</span>');
+                $('#confirm_req').html('<span style="color: red">'+'<%= l(:setting_password_error) %>'+'</span>');
-                 $passwd_comfirm_correct = false;
+                 $passwd_comfirm_correct = false;
-
+
-            }
+            }
-            $('#confirm_req').css('display','block');
+            $('#confirm_req').css('display','block');
-
+
-
+
-
+
-        });
+        });
-    });
+    });
-
+
-        function user_name_keypress(e){
+        function user_name_keypress(e){
-            if (e.keyCode == '13') {
+            if (e.keyCode == '13') {
-                $('#main_login_form').submit();
+                $('#main_login_form').submit();
-            }
+            }
-        }
+        }
-</script>
+</script>
-<div class="loginContentContainer">
+<div class="loginContentContainer">
-  <div class="loginContent">
+  <div class="loginContent">
-    <div class="loginLeft">
+    <div class="loginLeft">
-      <div class="loginLogo"><img src="images/trustie_big_log.png" width="100" height="88" alt="Trustie Logo" /></div>
+      <div class="loginLogo"><img src="images/trustie_big_log.png" width="100" height="88" alt="Trustie Logo" /></div>
-      <div class="loginInro">欢迎加入Trustie高校创新实践社区！老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。</div>
+      <div class="loginInro">&nbsp;&nbsp;欢迎加入Trustie高校创新实践社区！老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。<br/><br/>&nbsp;&nbsp;Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。</div>
-    </div>
+    </div>
-    <div class="loginRight">
+    <div class="loginRight">
-      <div id="loginInBox">
+      <div id="loginInBox">
-        <div class="loginChooseBox">
+        <div class="loginChooseBox">
-          <div class="mb5">
+          <div class="mb5">
-          <ul class="loginChooseList">
+          <ul class="loginChooseList">
-            <li class="loginChoose fl"><span class="loginChooseTab">登录</span></li>
+            <li class="loginChoose fl"><span class="loginChooseTab">登录</span></li>
-            <li class="loginChooseBorder fl"></li>
+            <li class="loginChooseBorder fl"></li>
-          </ul>
+          </ul>
-        </div>
+        </div>
-        <div class="loginSignAlert" style="color: red"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></div>
+        <div class="loginSignAlert" style="color: red"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></div>
-        </div>
+        </div>
-        <div class="loginIn">
+        <div class="loginIn">
-
+
-          <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
+          <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
-          <%= back_url_hidden_field_tag %>
+          <%= back_url_hidden_field_tag %>
-          <div class="mb20">
+          <div class="mb20">
-            <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
+            <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
-                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或昵称', :onkeypress => "user_name_keypress(event);"%>
+                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或昵称', :onkeypress => "user_name_keypress(event);"%>
-            <!--<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />-->
+            <!--<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />-->
-          </div>
+          </div>
-          <% if Setting.openid? %>
+          <% if Setting.openid? %>
-                  <div class="mb20">
+                  <div class="mb20">
-                    <%= text_field_tag "openid_url", nil, :tabindex => '3',:placeholder=>'请输入OpenId URL' %>
+                    <%= text_field_tag "openid_url", nil, :tabindex => '3',:placeholder=>'请输入OpenId URL' %>
-                  </div>
+                  </div>
-          <% end %>
+          <% end %>
-          <div>
+          <div>
-            <!--<input type="text" placeholder="请输密码" class="loginSignBox" />-->
+            <!--<input type="text" placeholder="请输密码" class="loginSignBox" />-->
-            <%= password_field_tag 'password', nil, :tabindex => '2',:class=>'loginSignBox' ,:placeholder=>'请输密码', :onkeypress => "user_name_keypress(event);"%>
+            <%= password_field_tag 'password', nil, :tabindex => '2',:class=>'loginSignBox' ,:placeholder=>'请输密码', :onkeypress => "user_name_keypress(event);"%>
-          </div>
+          </div>
-          <div class="loginSignOption">
+          <div class="loginSignOption">
-            <% if Setting.autologin? %>
+            <% if Setting.autologin? %>
-                <div class="fl mt3 mr5">
+                <div class="fl mt3 mr5">
-                  <%= check_box_tag 'autologin', 1, true, :tabindex => 4 %>
+                  <%= check_box_tag 'autologin', 1, true, :tabindex => 4 %>
-                </div>
+                </div>
-                <%= l(:label_stay_logged_in) %>
+                <%= l(:label_stay_logged_in) %>
-            <% end %>
+            <% end %>
-            <a href="<%= lost_password_path %>" class="newsBlue mr40 fr">
+            <a href="<%= lost_password_path %>" class="newsBlue mr40 fr">
-              <% if Setting.lost_password? %>
+              <% if Setting.lost_password? %>
-              <u>忘记密码?</u>
+              <u>忘记密码?</u>
-                  <% end %>
+                  <% end %>
-            </a></div>
+            </a></div>
-        <% end %>
+        <% end %>
-          <div class="loginInButton" >
+          <div class="loginInButton" >
-            <a href="javascript:void(0);" id="login_btn" class="c_white db" onclick="$('#main_login_form').submit();">登录</a>
+            <a href="javascript:void(0);" id="login_btn" class="c_white db" onclick="$('#main_login_form').submit();">登录</a>
-          </div>
+          </div>
-
+
-        </div>
+        </div>
-
+
-      </div>
+      </div>
-      <div id="signUpBox">
+      <div id="signUpBox">
-        <div class="loginChooseBox">
+        <div class="loginChooseBox">
-          <ul class="loginChooseList">
+          <ul class="loginChooseList">
-            <li class="loginChoose fl"><span class="loginChooseTab">注册<%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></a></span>
+            <li class="loginChoose fl"><span class="loginChooseTab">注册<%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></a></span>
-            <li class="loginChooseBorder fl"></li>
+            <li class="loginChooseBorder fl"></li>
-          </ul>
+          </ul>
-        </div>
+        </div>
-        <div class="loginIn">
+        <div class="loginIn">
-          <%= form_for :user, :url => register_path,:method=>'post',:html=>{:id=>'main_reg_form'} do |f| %>
+          <%= form_for :user, :url => register_path,:method=>'post',:html=>{:id=>'main_reg_form'} do |f| %>
-              <%= error_messages_for 'user' %>
+              <%= error_messages_for 'user' %>
-          <div class="loginSignRow">
+          <div class="loginSignRow">
-            <!--<input type="text" placeholder="请输入邮箱地址" class="loginSignBox" />-->
+            <!--<input type="text" placeholder="请输入邮箱地址" class="loginSignBox" />-->
-            <%= f.text_field :mail,:size => 25, :class=>'loginSignBox' ,:placeholder=>"请输入邮箱地址"%>
+            <%= f.text_field :mail,:size => 25, :class=>'loginSignBox' ,:placeholder=>"请输入邮箱地址"%>
-            <div class="loginSignAlert" id="mail_req" style="display: none"  >请输入有效邮箱地址</div>
+            <div class="loginSignAlert" id="mail_req" style="display: none"  >请输入有效邮箱地址</div>
-          </div>
+          </div>
-          <div  class="loginSignRow">
+          <div  class="loginSignRow">
-            <!--<input type="text" placeholder="请输入密码" class="loginSignBox" />-->
+            <!--<input type="text" placeholder="请输入密码" class="loginSignBox" />-->
-            <%= f.password_field :password, :size => 25,:placeholder=>"请输入密码",:class=>'loginSignBox' %>
+            <%= f.password_field :password, :size => 25,:placeholder=>"请输入密码",:class=>'loginSignBox' %>
-            <div class="loginSignAlert" id="passwd_req" style="display: none">至少需要 6 个字符</div>
+            <div class="loginSignAlert" id="passwd_req" style="display: none">至少需要 6 个字符</div>
-          </div>
+          </div>
-          <div  class="loginSignRow">
+          <div  class="loginSignRow">
-            <!--<input type="text" placeholder="请再次输入密码" class="loginSignBox" />-->
+            <!--<input type="text" placeholder="请再次输入密码" class="loginSignBox" />-->
-            <%= f.password_field :password_confirmation, :size => 25,:placeholder=>"请再次输入密码",:class=>'loginSignBox' %>
+            <%= f.password_field :password_confirmation, :size => 25,:placeholder=>"请再次输入密码",:class=>'loginSignBox' %>
-            <div class="loginSignAlert" id="confirm_req" style="display: none">密码不一致</div>
+            <div class="loginSignAlert" id="confirm_req" style="display: none">密码不一致</div>
-          </div>
+          </div>
-          <div  class="loginSignRow">
+          <div  class="loginSignRow">
-            <!--<input type="text" placeholder="请输入用户昵称" class="loginSignBox" />-->
+            <!--<input type="text" placeholder="请输入用户昵称" class="loginSignBox" />-->
-            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户昵称",:class=>'loginSignBox'%>
+            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户昵称",:class=>'loginSignBox'%>
-            <div class="loginSignAlert" id="login_req" style="display: none">用户昵称为2-18个中英文，数字或下划线</div>
+            <div class="loginSignAlert" id="login_req" style="display: none">用户昵称为2-18个中英文，数字或下划线</div>
-          </div>
+          </div>
-              <div class="loginSignOption">
+              <div class="loginSignOption">
-                <div class="fl mt3 mr5">
+                <div class="fl mt3 mr5">
-                  <input type="checkbox" id="read_and_confirm"/>
+                  <input type="checkbox" id="read_and_confirm"/>
-                </div>
+                </div>
-                我已阅读并接受<a href="<%= agreement_path %>" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
+                我已阅读并接受<a href="<%= agreement_path %>" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
-          <div class="loginUpButton">
+          <div class="loginUpButton">
-            <a href="javascript:void(0);" class="c_white db" id="regist_btn" onclick="register();">注册</a>
+            <a href="javascript:void(0);" class="c_white db" id="regist_btn" onclick="register();">注册</a>
-
+
-          </div>
+          </div>
-          <% end %>
+          <% end %>
-        </div>
+        </div>
-      </div>
+      </div>
-    </div>
+    </div>
-    <div class="cl"></div>
+    <div class="cl"></div>
-  </div>
+  </div>
-</div>
+</div>

app/views/admin/messages.html.erb

@@ -0,0 +1,64 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<h3 style="float: left">
+  <%=l(:label_system_message)%>
+</h3><br/>
+<div style="padding-top: 20px; padding-left: 5px;">
+  <%= form_for(@admin_messages, :html => {:id =>'system_messages-form'}) do |f| %>
+      <li>
+        <label><span class="">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
+        <input type="text" name="system_message[subject]" class="hwork_input_news" id="system_message_subject" width="576px" onblur="regexTitle($(this));" maxlength="255" placeholder="255个字符以内" value="">
+        <p id="title_notice_span" class="ml55"></p>
+      </li>
+      <li>
+        <label class="fl" >&nbsp;&nbsp;<span class="c_red"></span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+        <%= f.kindeditor :description,:width=>'87.5%',:editor_id=>'system_message_editor' %>
+        <p id="content_notice_span" class="ml55"></p>
+      </li>
+      <div>
+        <p id="content_notice_span" class="ml55"></p>
+      </div>
+      <div class="actions">
+        <%= link_to l(:label_submit), "javascript:void(0)", :class => "btn_message_free", :onclick => "system_message_editor.sync();submit_message();" %>
+      </div>
+  <% end %>
+</div>
+<script>
+    function system_message_length() {
+        var obj = system_message_editor.html();
+        if (obj.length > 10000) {
+            $("#content_notice_span").text("内容过长，超过10000个字符");
+            $("#content_notice_span").css('color', '#ff0000');
+            $("#content_notice_span").focus();
+            return false;
+        }
+        else {
+            $("#content_notice_span").text("填写正确");
+            $("#content_notice_span").css('color', '#008000');
+            return true;
+        }
+    }
+    function regexTitle(obj){
+        var title = obj.val();
+        if(title.length == 0)
+        {
+            $("#title_notice_span").text("标题不能为空").css("color", "#ff0000").focus();
+            return false;
+        }
+        else if(title.length > 255)
+        {
+            $("#title_notice_span").text("标题长度过长，不能超过255个字符").css("color", "#ff0000").focus();
+            return false;
+        }
+        else{
+            $("#title_notice_span").text("填写正确").css("color", "#008000");
+            return true;
+        }
+    }
+    function submit_message() {
+
+        if (system_message_length() && regexTitle($("#system_message_subject"))) {
+            $("#system_messages-form").submit();
+        }
+    }
+</script>
+

app/views/attachments/file.html.erb

@@ -1,26 +1,38 @@
-<h3><%=h @attachment.filename %></h3>
+<div id="wrapper">
+  <div id="wrapper2">
+    <div id="wrapper3">
+      <div id="main" class="nosidebar">
+        <div id="content_">
+          <h3><%=h @attachment.filename %></h3>
 
-<div class="attachments">
+          <div class="attachments">
-<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
+            <p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
-   <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
+              <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
-<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
+            <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
+              <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
-   <span class="size">
+           <span class="size">
-     <% if @attachment!=nil &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') &&
+             <% if @attachment!=nil &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') &&
-        User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
+                     User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
-          <%= l(:review_assignments)+":" %><%=    link = link_to(l(:button_add), {:controller => 'code_review',
+                  <%= l(:review_assignments)+":" %><%=    link = link_to(l(:button_add), {:controller => 'code_review',
-                                          :action => 'assign', :action_type => 'attachment',
+                                                                                          :action => 'assign', :action_type => 'attachment',
-                                          :id=>@attachment.project,
+                                                                                          :id=>@attachment.project,
-                                          :change_id => '', :attachment_id => @attachment.id,
+                                                                                          :change_id => '', :attachment_id => @attachment.id,
-                                         }, :class => 'icon icon-add') %>
+                                                                                       }, :class => 'icon icon-add') %>
-        <% end %>
+                <% end %>
-   </span></p>
+           </span></p>
+          </div>
+          &nbsp;
+          <%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
+
+          <% html_title @attachment.filename %>
+
+          <% content_for :header_tags do -%>
+              <%= stylesheet_link_tag "scm" -%>
+          <% end -%>
+          <div style="clear:both;"></div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
-&nbsp;
-<%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
 
-<% html_title @attachment.filename %>
-
-<% content_for :header_tags do -%>
-    <%= stylesheet_link_tag "scm" -%>
-<% end -%>

app/views/bids/edit.html.erb

@@ -1,4 +1,5 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'prettify','/assets/kindeditor/pasteimg' %>
+<%= stylesheet_link_tag 'prettify'%>
 <%= labelled_form_for @bid,:html => { :multipart => true } do |f| %>
     <%= render :partial => 'new_homework_form', :locals => { :bid => @bid, :bid_id => "edit_bid_#{@bid.id}",:f=>f,:edit_mode => true} %>
 <% end %>

app/views/boards/_course_show.html.erb

@@ -99,7 +99,7 @@
 //                }
               });
             </script>
-            <div  class="project_board_content break_word f14" id="content_<%=topic.id%>">
+            <div  class="project_board_content break_word f14 list_style" id="content_<%=topic.id%>">
               <div id="contentmessage<%=topic.id %>" class="upload_img">
                 <%= topic.content.html_safe %>
                 <!-- -->
@@ -165,7 +165,7 @@
                           <div class="Msg_txt">
                             <%= link_to User.current.member_of_course?(@board.course) ? "#{message.author.show_name}(#{message.author.login})" : "#{message.author}", user_path(message.author),:class => 'fl c_orange f14 ' %>
                             <br/>
-                            <div class="fl break_word f14">
+                            <div class="fl break_word f14 list_style">
                               <%= textAreailizable message,:content,:attachments => message.attachments %>
                               <!-- -->
                             </div>

app/views/boards/_project_show.html.erb

@@ -51,9 +51,9 @@
                            :data => {:confirm => l(:text_are_you_sure)},
                            :class => 'talk_edit fr',
                            :style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %>
-                <% if topic.sticky? %>
+                <%# if topic.sticky? %>
-                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
+                  <!--<a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%#= l(:label_board_sticky)%></a>-->
-                <% end %>
+                <%# end %>
                 <script>
                     //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
                     //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
@@ -92,7 +92,7 @@
                 </script>
 
               <div class="cl"></div>
-              <div  class="project_board_content break_word f14" id="content_<%=topic.id%>">
+              <div  class="project_board_content break_word f14 list_style" id="content_<%=topic.id%>">
                 <div id="contentmessage<%=topic.id %>" class="upload_img">
                   <%= topic.content.html_safe %>
                   <!-- -->
@@ -150,7 +150,7 @@
                             <div class="Msg_txt">
                               <%= link_to_user_header message.author,false,:class => 'fl c_orange f14 ' %>
                               <br/>
-                              <div class="fl break_word f14">
+                              <div class="fl break_word f14 list_style">
                                 <%= textAreailizable message,:content,:attachments => message.attachments %>
                                 <!-- -->
                               </div>

app/views/comments/create.js.erb

@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data('<%= @user_activity_id%>');
+init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");

app/views/courses/_join_private_course.html.erb

@@ -57,6 +57,8 @@
                    :id => 'new-watcher-form') do %>
           <ul>
             <li>
+              <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+              <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
               <span class="tips">课&nbsp;程&nbsp;ID：</span>
               <input class=" width190" name="object_id" id="object_id" type="text" value="" >
               <input type="text" style="display: none"/>

app/views/courses/new.html.erb

@@ -5,6 +5,8 @@
   <ul>
     <%= labelled_form_for @course do |f| %>
       <li  class="ml45">
+        <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+        <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
         <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
         <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();">
         <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>

app/views/courses/settings.html.erb

@@ -20,6 +20,8 @@
             <div class="cl"></div>
           </li>
           <li  class="ml45">
+            <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+            <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
             <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();" value="<%= @course.name%>">
             <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>

app/views/courses/show.html.erb

@@ -7,7 +7,7 @@
       <a class="problem_pic fl">
         <%= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %>
       </a>
-      <div class="problem_txt fl mt5 upload_img">
+      <div class="problem_txt fl mt5 upload_img list_style">
         <%= link_to_user_header(activity.user,false,:class => 'problem_name c_orange fl') %>
         <span class="fl"> &nbsp;</span>
         <span class="fl"> <%= activity.course_act_type == "Course" ? "创建了课程" : l(:label_new_activity) %>：</span>

app/views/files/_course_list.html.erb

@@ -3,13 +3,13 @@
   <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
   <p class="f_r" style="color: #808080">
     <% if order == "asc" %>
-        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
-        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
-        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
     <% else %>
-        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
-        <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
-        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
     <% end %>
   </p>
 </div>

app/views/files/_tag_yun.html.erb

@@ -3,7 +3,7 @@
         <% if tag_name && tag_name == k%>
             <a href="javascript:void(0);" class="files_tag_select"><%= k%>×<%= v%></a>
         <% else%>
-            <a href="javascript:void(0);" class="files_tag_icon" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"><%= k%>×<%= v%></a>
+        <span class="files_tag_icon">    <a  ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% end%>
     <% end%>
 <% end%>

app/views/files/index.html.erb

@@ -223,6 +223,56 @@
                 });
 
     }
+    <% if @course %>
+    var tagNameHtml; //当前双击的链接的父节点的html
+    var tagName;  //标签的值
+    var parentCssBorder; //当前双击的链接的父节点
+    var ele;    //当前双击的链接
+    var tagId; //标签的id
+    var taggableType; //被标签的类型
+    //这里renameTag有两种情况，一种是改变某个资源的tag名称。如果其他资源也有这个tag。则新增一个改变后的tag名
+    //第二种是改变某个tag名称。其他所有的资源如果拥有这个tag。那么对应的tag名也要改掉。
+    //目前这两种依据 的来源就是 是否 传了参数 id。如果有id。就指定了资源id，就是第一种情况。如果没有id。就是第二种情况
+    function rename_tag(domEle,name,id,type){
+        if(domEle.children().get(0) != undefined ){ //已经是编辑框的情况下不要动
+            return;
+        }
+        tagNameHtml = domEle.parent().html()
+        tagName = name;
+        parentCssBorder = domEle.parent().css("border");
+        ele = domEle;
+        tagId = id;
+        taggableType = type;
+        width = parseInt(domEle.css('width').replace('px','')) >=100 ?  parseInt(domEle.css('width').replace('px','')) : 100
+        domEle.html('<input name="" id="renameTagName" maxlength="<%=Setting.tags_max_length%>" minlength="<%= Setting.tags_min_length%>" style="width:'+width +'px;" value="'+name+'"/>');
+        domEle.parent().css("border","1px solid #ffffff");
+        $("#renameTagName").focus();
+    }
+  //监听所有的单击事件
+   $(document.body).click(function(e){
+       node = document.elementFromPoint(e.clientX, e.clientY);
+       if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+           return;
+       }
+           if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
+               if($("#renameTagName").val().trim() == tagName){ //如果值一样，则恢复原来的状态
+                   ele.parent().css("border","");
+                   ele.parent().html(tagNameHtml);
+
+               }else{ //否则就要更新tag名称了
+                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){
+                          $.post(
+                                    '<%= update_tag_name_path %>',
+                                    {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
+                          )
+                   }else{
+                       ele.parent().css("border","");
+                       ele.parent().html(tagNameHtml);
+                   }
+               }
+           }
+   });
+   <%end %>
 
 </script>
 

app/views/forums/_file_form.html.erb

@@ -0,0 +1,79 @@
+<style type="text/css">
+    input.is_public,input.is_public_checkbox{height:12px;}
+    input.is_public_checkbox{margin-left:4px;margin-right:4px;}
+</style>
+<div class="fl">
+<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) && container && container.saved_attachments %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+    <div class="cl"></div>
+  <% end %>
+      <% container.saved_attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %>
+      <span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+    <div class="cl"></div>
+  <% end %>
+<% end %>
+</span>
+  <% project = project %>
+  <div class="cl"></div>
+  <!--<span class="add_attachment" style="font-weight:normal;">-->
+    <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+    <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+    <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'AnnexBtn fl mt3' %>
+    <a href="javascript:void(0);" onclick="_file.click();" class="AnnexBtn fl mr15">上传附件</a>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :style => ie8? ? '' : 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js', :project => project),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+    <!--<span id="upload_file_count">-->
+      <!--<%#= l(:label_no_file_uploaded) %>-->
+    <!--</span>-->
+    <!--(<%#= l(:label_max_size) %>:-->
+    <%#= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>
+    <!--)-->
+<!--</span>-->
+
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>

app/views/forums/_form_edit_mode.html.erb

@@ -1,49 +1,26 @@
-<!-- added by fq -->
-<!-- %= form_for(@forum) do |f| % -->
 
-<div id="share_new" style = "width: 500px; margin:0 auto; " >
+<div class="homepageContentContainer mb10">
-  <%= labelled_form_for(@forum) do |f|  %>
+  <div class="homepageContent">
-  <% if @forum.errors.any? %>
+    <div class="pageBanner mt15"><div class="NewsBannerName">编辑贴吧</div></div>
-  <!--<div id="error_explanation">
+    <div class="cl"></div>
-    <h2><#%= pluralize(@forum.errors.count, "error") %> prohibited this forum from being saved:</h2>
 
-    <ul>
+    <div class="postContainer">
-      <#% @forum.errors.full_messages.each do |msg| %>
+      <%= labelled_form_for(@forum) do |f|  %>
-      <li><#%= msg %></li>
+      <div id="error" style="display: none;color: red;">
-      <#% end %>
+      </div>
-    </ul>
+      <div>
-  </div> -->
+        <textarea type="text" id="forum_name" name="forum[name]" maxlength="50" class="postCreateInput" placeholder="对应贴吧名称"  ><%= @forum.name.html_safe%></textarea>
-  <% end %>
+      </div>
-  <div style="width: 120%;">
+      <div class="mt15">
-    <div class="field">
+        <textarea type="text" id="forum_desc" name="forum[description]" maxlength="5000" class="postCreateInput" placeholder="对应贴吧描述" ><%= @forum.description.html_safe%></textarea>
-      <%= f.text_field :name, :required => true,  :style => 'width: 100%;', :class => 'create-share', :maxlength => 50%>
+      </div>
-    </div>
+      <div class="mt10">
-    <div>
+        <div class="fr"><a href="javascript:void(0);" class="submit_btn" onclick="check_and_submit($(this));">确定</a></div>
-      <% if User.current.logged? && User.current.admin? %>
+        <div class="fr"><a href="<%= forum_path(@forum)%>" class="linkGrey2 mr10" >取消</a><span class="mr10 fontGrey">或</span></div>
-      <% if @forum.safe_attribute? 'sticky' %>
+        <div class="cl"></div>
-          <%= f.check_box :sticky %>
+      </div>
-          <%= label_tag 'message_sticky', l(:label_board_sticky) %>
-      <% end %>
-      <% if @forum.safe_attribute? 'locked' %>
-          <%= f.check_box :locked %>
-          <%= label_tag 'message_locked', l(:label_board_locked) %>
-      <% end %>
       <% end %>
     </div>
-    <div>
-      <p style="max-width:680px">
-        <%= f.kindeditor :description, :required => true,:owner_id => @forum.id,:owner_type => 2 %>
-      </p>
-      <!-- <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
 
-      <p style="color: #ff0000">
-        (<%= l(:label_forums_max_length) %>)
-      </p>
-    </div>
-    <div class="actions" style=" padding-top: 10px; float:right">
-      <%= submit_tag l(:button_submit) %>
-      <%= link_to l(:button_back), forums_path ,:style => 'font-size: 14px; padding: 0px 3px;'  %>
-    </div>
   </div>
-  <% end %>
+</div>
-</div>

app/views/forums/_forum_form.html.erb

@@ -0,0 +1,15 @@
+<div><img src="images/post_portrait.jpg" width="75" height="75" alt="贴吧图片" id="forum_image" class="mr10 fl" />
+  <a href="javascript:void(0)" class="upImg linkGrey2 fl" onclick="open_upload_diaglog();">上传图片</a>
+  <div class="cl"></div>
+</div>
+<div class="mt15">
+  <input type="text" name="postName" class="postCreateInput" placeholder="输入贴吧名称"  />
+</div>
+<div class="mt15">
+  <input type="text" name="postName" class="postCreateInput" placeholder="输入贴吧描述" />
+</div>
+<div class="mt10">
+  <div class="fr"><a href="javascript:void(0);" class="submit_btn">确定</a></div>
+  <div class="fr"><a href="javascript:void(0);" class="linkGrey2 mr10" onclick="$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();">取消</a><span class="mr10 fontGrey">或</span></div>
+  <div class="cl"></div>
+</div>

app/views/forums/_forum_list.html.erb

@@ -1,57 +1,38 @@
-<!-- added by fq -->
+
-<div class="forums-list">
 <% if forums.any? %>
 	<% forums.each do |forum| %>
-	<div class="forums-index">
+          <div class="postRow">
-		<div class="forums-inex-avatar">
+            <div class="postPortrait"><a href="javascript:void(0);" class="linkGrey2">
-          <%= forum.creator.nil? ? (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar")) : (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator)) %>
+              <%= link_to image_tag(url_to_avatar(forum.creator),:width=>75,:height => 75 ),user_path( forum.creator) %>
-        </div>
+            </div>
-		<div class="forums-index-content">
+            <div class="postWrap">
-          <table class="content-text-list" style="table-layout: fixed;">
+              <div class="postTitle">
-            <tr>
+                <!--<a href="javascript:void(0);" class="f16 linkBlue">新手讨论吧</a>-->
-              <td valign="top" width="500px" class=" <%= forum.sticky? ? 'sticky' : '' %><%= forum.locked? ? 'locked' : '' %>" style="word-break: break-all;word-wrap: break-word;">
+                <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %>
-                  <p >
+              </div>
-                    <%= link_to h(forum.name), forum_path(forum) %>
+              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;"><%= textAreailizable forum.description%></div>
-                  </p>
+              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
-              </td>
+              <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
-            </tr>
+            </div>
-			<tr>
+            <div class="postStatics">
-              <td style="word-break: break-all;word-wrap: break-word;" class="upload_img">
+              <div>
-                <p>
+                <!--<a href="javascript:void(0);" class="linkGrey5 fb">280</a>-->
-                  <%= textAreailizable forum.description%>
+                    <%= link_to ( forum.topic_count), forum_path(forum),:class=>"linkGrey5 fb" %>
-                </p>
+              </div>
-              </td>
+              <div>帖子</div>
-            </tr>
+            </div>
-			<tr>
+            <div class="slice"></div>
-              <td style="word-break: break-all;word-wrap: break-word;">
+            <div class="postStatics mr20">
-                <p >
+              <div>
-                  <%= authoring forum.created_at, forum.creator %>
+                <!--<a href="javascript:void(0);" class="linkGrey5 fb">335</a>-->
-                </p>
+                <%= link_to (forum.memo_count), forum_path(forum),:class=>"linkGrey5 fb" %>
-              </td>
+              </div>
-            </tr>
+              <div>回答</div>
-          </table>
+            </div>
-        </div>
+            <div class="cl"></div>
-		<div class="forums-index-count">
+          </div>
-			<table class="forums-count-color">
-              <tr class="forums-count-color" align="center">
-                <td>
-                  <%= link_to (forum.memo_count), forum_path(forum) %>
-                </td>
-                <td>
-                  <%= link_to (forum.topic_count), forum_path(forum) %>
-                </td>
-              </tr>
-              <tr align="center">
-                <td>回答</td>
-                <td>帖子</td>
-              </tr>
-            </table>
-        </div>
-	</div>	
 	<% end %>
-	<div class="pagination" style="margin-top: 10px;">
+
-      <%= pagination_links_full @forums_pages, @forums_count %>
-    </div>
 <% else %>
-<% end %>
+    <%= render :partial => "layouts/no_content" %>
-</div>
+<% end %>

app/views/forums/_forum_tag_list.html.erb

@@ -0,0 +1,8 @@
+<% forum.tag_list.each do |tag|%>
+    <span class="postlabel mr10">
+                <a href="javascript:void(0);" ondblclick="rename_tag($(this),<%= tag %>,<%= forum.id%>,5);" style="cursor: default" class="fontGrey2 mr5"><%= tag %></a>
+      <%if forum.creator.id == User.current.id%>
+                <a href="javascript:void(0);" class="fontGrey2" onclick="delete_forum_tag($(this));">×</a>
+       <% end %>
+        </span>
+<% end %>

app/views/forums/_post_banner.html.erb

@@ -0,0 +1,33 @@
+
+
+<div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a>
+  <% if order_type=='reorder_complex' && order_str == 'desc' %>
+    <a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveD"></a>
+  <% elsif order_type=='reorder_complex' && order_str == 'asc' %>
+      <a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveU"></a>
+  <% else %>
+      <a href="javascript:void(0);" id="reorder_complex" ></a>
+  <% end %>
+</div>
+<div class="postSort" id="popu"><a href="javascript:void(0);" class="linkGrey2 fl">人气</a>
+  <% if order_type=='reorder_popu' && order_str == 'desc' %>
+      <a href="javascript:void(0);" id="reorder_popu" class="sortArrowActiveD"></a>
+  <% elsif order_type=='reorder_popu' && order_str == 'asc' %>
+      <a href="javascript:void(0);" id="reorder_popu" class="sortArrowActiveU"></a>
+  <% else %>
+      <a href="javascript:void(0);" id="reorder_popu" ></a>
+  <% end %>
+</div>
+<div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a>
+  <% if order_type=='reorder_time' && order_str == 'desc' %>
+      <a href="javascript:void(0);" id="reorder_time" class="sortArrowActiveD"></a>
+  <% elsif order_type=='reorder_time' && order_str == 'asc' %>
+      <a href="javascript:void(0);" id="reorder_time" class="sortArrowActiveU"></a>
+  <% else %>
+      <a href="javascript:void(0);" id="reorder_time" ></a>
+  <% end %>
+</div>
+<div class="creatPost">
+  <a href="javascript:void(0);" id="create_btn" class="c_white db creatPostIcon bBlue"
+     onclick="$('#error').hide();clear_form();$('#new_forum_div').slideToggle();$(this).parent().slideToggle();">新建贴吧</a></div>
+<div class="cl"></div>

app/views/forums/_show_topics.html.erb

@@ -1,47 +1,31 @@
-<script>$(function(){$("img").removeAttr("alt");});</script>
-<div class="borad-topic-count">共有 <%=link_to @forum.memos.count %> 个贴子</div>
 <div style="padding-top: 10px">
   <% if memos.any? %>
       <% memos.each do |topic| %>
-          <table class="content-text-list">
+          <div class="postDetailRow">
-            <tr>
+            <div class="postDetailPortrait">
-              <td colspan="2" valign="top" style="width: 50px;">
+              <!--<img src="images/homepageImage.jpg" width="50" height="50" alt="贴吧图片" /></a>-->
-                <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%>
+              <%= link_to image_tag(url_to_avatar(topic.author), :width => 50,:height => 50,:alt => '贴吧图片'), user_path(topic.author) if topic.author%>
-              </td>
+            </div>
-              <td>
+            <div class="postDetailWrap">
-                <table width="630px" border="0">
+              <div class="postDetailTitle"><a href="<%= forum_memo_path(topic.forum, topic) %>" class="f14 linkGrey4 fb"><%=topic.subject%></a></div>
-                  <tr>
+              <div class="postDetailDes"><%= topic.content.html_safe%>
-                    <td valign="top" width="500px" class="<%= topic.sticky ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), forum_memo_path(topic.forum, topic) %></td>
+                <!--<a href="javascript:void(0);" class="linkBlue2 underline ml8">显示全部</a>-->
-                    <td align="right" rowspan="3">
+              </div>
-                      <table class="borad-count">
+              <% author = topic.last_reply.try(:author)%>
-                        <tr>
+              <% if author%>
-                          <td align="center" class="borad-count-digit"><%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic) %></td>
+                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
-                        </tr>
+                  <div class="postDetailDate"><%= format_date(topic.last_reply.created_at)%></div>
-                        <tr>
+              <% end%>
-                          <td align="center">回答</td>
+
-                        </tr>
+            </div>
-                      </table></td>
+            <div class="postDetailReply">
-                  </tr>
+              <a href="<%= forum_memo_path(topic.forum, topic)%>" class="postReplyIcon mr5" target="_blank"></a>
-                  <tr>
+              <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
-                    <td colspan="2" ><span class="font_description">		</span></td>
+            </div>
-                  </tr>
+            <div class="cl"></div>
-                  <tr>
+          </div>
-                    <td align="left" colspan="2" ><span class="font_lighter"><%= authoring topic.created_at, topic.author %>
-                      <span class="font_description2">
-                        <% author = topic.last_reply.try(:author)%>
-                        <% if author%>
-                            最后回复：<%=link_to_user author %>
-                        <% end%>
-                      </span>
-                        <br />
-                    </span></td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
       <% end %>
-      <div class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></div>
+
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>

app/views/forums/create.js.erb

@@ -0,0 +1,6 @@
+<%if @save_flag%>
+$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
+$('#reorder_time').click();
+<%else%>
+ $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
+<%end %>

app/views/forums/delete_forum_tag.js.erb

@@ -0,0 +1,2 @@
+$("#forum_tag_list").html("<%= escape_javascript( render :partial=>'forum_tag_list',:locals=>{:forum=>@forum}) %>");
+$('#add_tag01').hide();

app/views/forums/edit.html.erb

@@ -1,4 +1,78 @@
-<!-- added by fq -->
+
-<h1>编辑讨论区</h1>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'new_user' %>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<script>
+
+
+    function check_and_submit(doc){
+        $("#error").html('').hide();
+        check_forum_name();
+        if(check_pass == false){
+            return;
+        }
+        if(  $("textarea[name='forum[name]']").val().trim() == "" &&  $("textarea[name='forum[description]']").val().trim()  != "" ){
+            $("#error").html("名称不能为空").show();
+            return;
+        } else if( $("textarea[name='forum[description]']").val().trim()  == "" && $("textarea[name='forum[name]']").val().trim() != "" ){
+            $("#error").html("描述不能为空").show();
+            return;
+        }else if($("textarea[name='forum[description]']").val().trim()  == "" && $("textarea[name='forum[name]']").val().trim() == ""){
+            $("#error").html("名称和描述不能为空").show();
+            return;
+        }
+        else{
+            doc.parent().parent().parent().submit();
+        }
+    }
+    var check_pass = true;
+    function check_forum_name(){
+        check_pass = true;
+        name = $("textarea[name='forum[name]']").val().trim();
+        if( name != ""){
+            $.get(
+                    '<%= check_forum_name_forums_path %>',
+                    {"forum_name":name,"forum_id":<%= @forum.id%>},
+                    function(data){
+
+                        if( data == 'true'){
+                            $("#error").html("贴吧名称已经存在").show();
+                            check_pass = false;
+                        }
+                    }
+            );
+        }else{
+            check_pass = false;
+        }
+    }
+</script>
 <%= render 'form_edit_mode' %>
+<script>
+    var textarea = document.getElementById('forum_name');
+    autoTextarea(textarea);
+    var textarea1 = document.getElementById('forum_desc');
+    autoTextarea(textarea1);
+    $(function(){
+        $('#forum_name').keypress(function(e)
+        {
+            var n = 0;
+            var str = this.value;
+            for (i = 0; i < str.length; i++) {
+                var leg = str.charCodeAt(i);//ASCII码
+                if (leg > 255) {
+                    n += 2;
+                } else {
+                    n += 1;
+                }
+            }
+            if(n >= 160 && e.keyCode != 8)
+                if(document.all)
+                {
+                    e.returnValue = false;
+                }
+                else
+                {
+                    e.preventDefault();
+                }
+
+        })
+    })
+</script>

app/views/forums/index.html.erb

@@ -1,48 +1,177 @@
-<% @nav_dispaly_home_path_label = 1
+<%= javascript_include_tag 'new_user' %>
-   @nav_dispaly_main_course_label = 1
+<%= stylesheet_link_tag 'public'%>
-   @nav_dispaly_main_project_label = 1
+<script>
-   @nav_dispaly_main_contest_label = 1 %>
+  function add_class(id){
-<!-- added by fq -->
+      if($("#"+id).hasClass("sortArrowActiveD")){
-<div class="top-content">
+          $("#"+id).removeClass("sortArrowActiveD");
-	<table width="940px">
+          $("#"+id).addClass("sortArrowActiveU");
-		<tr>
+          $.ajax({
-			<td class="info_font" style="width: 220px; color: #15bccf">公共贴吧 </td>
+              type: 'GET',
-			<td class="location-list">
+              url: '<%= forums_path %>' + '.js?' + id + '=asc&page='+<%= @forums_pages.page%>
-              <strong>
-                <%= l(:label_user_location) %> :
-              </strong>
-            </td>
-			<td rowspan="2"> 
-                <% if User.current.logged? %>
-                <%= link_to( l(:label_forum_new), new_forum_path, :class => 'icon icon-add') %>
-                <% end %>
-			</td>
-			<td rowspan="2" width="250px" >
-				<div class="top-content-search">
-					<%#= form_tag(:controller => 'forums', :action => "search_forum", :method => :get) do %>
-					<%#= text_field_tag 'name', params[:name], :size => 20 %>
-					<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-					<%# end %>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="padding-left: 8px">
-              <a>
-                <%= link_to request.host()+"/forums", forums_path %>
-              </a>
-            </td>
-			<td >
-              <%= link_to l(:field_homepage), home_path %> >
-              <%= link_to "公共贴吧", forums_path %>
-            </td>
-		</tr>
-	</table>
-</div>
-<% if @forums.size > 0 %>
-  <%= render :partial => 'forums/forum_list', :locals => {:forums => @forums} %>
-<% else %>
-  <%= render :partial => "layouts/no_content" %>
-<% end %>
 
-<%html_title l(:label_forum)%>
+          });
+      }else if($("#"+id).hasClass("sortArrowActiveU")){
+          $("#"+id).removeClass("sortArrowActiveU");
+          $("#"+id).addClass("sortArrowActiveD");
+          $.ajax({
+              type: 'GET',
+              url: '<%= forums_path %>' + '.js?' + id + '=desc&page='+<%= @forums_pages.page%>
+
+          });
+      }else{
+          $("#"+id).addClass("sortArrowActiveD");
+          $.ajax({
+              type: 'GET',
+              url: '<%= forums_path %>' + '.js?' + id + '=desc&page='+<%= @forums_pages.page%>
+
+          });
+      }
+  }
+  $(function() {
+      $("#complex").click(function(){
+          $("#reorder_popu").removeClass("sortArrowActiveU");
+          $("#reorder_popu").removeClass("sortArrowActiveD");
+          $("#reorder_time").removeClass("sortArrowActiveD");
+          $("#reorder_time").removeClass("sortArrowActiveU");
+          add_class("reorder_complex");
+      });
+      $("#popu").click(function () {
+          $("#reorder_complex").removeClass("sortArrowActiveD");
+          $("#reorder_complex").removeClass("sortArrowActiveU");
+          $("#reorder_time").removeClass("sortArrowActiveD");
+          $("#reorder_time").removeClass("sortArrowActiveU");
+          add_class("reorder_popu");
+      });
+      $("#time").click(function () {
+          $("#reorder_complex").removeClass("sortArrowActiveD");
+          $("#reorder_complex").removeClass("sortArrowActiveU");
+          $("#reorder_popu").removeClass("sortArrowActiveU");
+          $("#reorder_popu").removeClass("sortArrowActiveD");
+          add_class("reorder_time");
+      });
+      $('#forum_name').keypress( function(e)
+      {
+          var n = 0;
+          var str = this.value;
+          for (i = 0; i < str.length; i++) {
+              var leg = str.charCodeAt(i);//ASCII码
+              if (leg > 255) {//大于255的都是中文
+                  n += 2;//如果是中文就是2个字节
+              } else {
+                  n += 1;//英文，不多说了
+              }
+          }
+          if(n >= 160 && e.keyCode != 8)
+              if(document.all)
+              {
+                  e.returnValue = false;
+              }
+              else
+              {
+                  e.preventDefault();
+              }
+      })
+  });
+  function check_and_submit(doc){
+      $("#error").html('').hide();
+      check_forum_name();
+    if(  $("textarea[name='forum[name]']").val().trim() == "" &&  $("textarea[name='forum[description]']").val().trim()  != "" ){
+        $("#error").html("名称不能为空").show();
+        return;
+    } else if( $("textarea[name='forum[description]']").val().trim()  == "" && $("textarea[name='forum[name]']").val().trim() != "" ){
+        $("#error").html("描述不能为空").show();
+        return;
+    }else if($("textarea[name='forum[description]']").val().trim()  == "" && $("textarea[name='forum[name]']").val().trim() == ""){
+        $("#error").html("名称和描述不能为空").show();
+        return;
+    }
+    else{
+        doc.parent().parent().submit();
+    }
+  }
+  var check_pass = true;
+  function check_forum_name(){
+      check_pass = true;
+      name = $("textarea[name='forum[name]']").val().trim();
+      if( name != ""){
+          $.get(
+              '<%= check_forum_name_forums_path %>',
+              {"forum_name":encodeURIComponent(name)},
+             function(data){
+
+                 if( data == 'true'){
+                     $("#error").html("贴吧名称已经存在").show();
+                     check_pass = false;
+                 }
+              }
+          );
+      }else{
+          check_pass = false;
+      }
+      if(check_pass == false){
+          return ;
+      }
+  }
+
+  function hideError(){
+      $("#error").html("").hide();
+  }
+
+  function create_cancle(){
+      $('#error').hide();
+      $('#new_forum_div').slideToggle();
+      $('#create_btn').parent().slideToggle();
+      clear_form();
+  }
+  function clear_form(){
+      $("#forum_name").val('');
+      $("#forum_desc").val('');
+  }
+</script>
+
+<div class="homepageContentContainer mb10">
+    <div class="homepageContent">
+    <div class="postContainer">
+     <div id="new_forum_div" class="mb5" style="display: none">
+       <div class="red fl mb10" id="error" style="display: none">error</div>
+       <%= form_tag({:controller => 'forums',:action=>'create',:format=>'js'},:method => 'post',:remote=>'true') do  |f| %>
+       <div class="mt15">
+         <textarea type="text" name="forum[name]"  id="forum_name" maxlength="80"  class="postCreateInput" onfocus="hideError();" onblur="check_forum_name();" placeholder="输入贴吧名称"  ></textarea>
+         <script>
+           var textarea = document.getElementById('forum_name');
+               autoTextarea(textarea);
+         </script>
+       </div>
+       <div class="mt15">
+         <textarea type="text" name="forum[description]" id="forum_desc" maxlength="5000" class="postCreateInput"  placeholder="输入贴吧描述"></textarea>
+         <script>
+             var textarea1 = document.getElementById('forum_desc');
+             autoTextarea(textarea1);
+         </script>
+       </div>
+       <div class="mt10">
+         <div class="fr"><a href="javascript:void(0);" class="submit_btn" onclick="check_and_submit($(this));">确定</a></div>
+         <div class="fr"><a href="javascript:void(0);" class="linkGrey2 mr10" onclick="create_cancle();">取消</a><span class="mr10 fontGrey">或</span></div>
+         <div class="cl"></div>
+       </div>
+       <% end %>
+     </div>
+    <div class="postBanner" id="postBanner">
+      <%= render :partial => 'post_banner' ,:locals => {:order_type=>@type,:order_str=>@str}%>
+      <!--<div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a><a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveD"></a></div>-->
+      <!--<div class="postSort" id="popu"><a href="javascript:void(0);" class="linkGrey2 fl">人气</a><a href="javascript:void(0)"  id="reorder_popu" ></a></div>-->
+      <!--<div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a><a href="javascript:void(0)"  id="reorder_time" ></a></div>-->
+      <!--<div class="creatPost"><a href="javascript:void(0);" id="create_btn" class="c_white db creatPostIcon bBlue" onclick="$('#error').hide();$('#new_forum_div').slideToggle();$(this).parent().slideToggle();">新建贴吧</a></div>-->
+      <!--<div class="cl"></div>-->
+
+     </div>
+      <div id="forum_list">
+      <%= render :partial => 'forum_list',:locals => {:forums=>@forums}%>
+      </div>
+      <ul class="wlist fr" id="pages" style="margin-top: 10px;">
+        <%= pagination_links_full @forums_pages, @forums_count ,:per_page_links => true,:remote =>true,:flag=>true%>
+      </ul>
+    <div class="cl"></div>
+    </div>
+    </div>
+</div>

app/views/forums/index.js.erb

@@ -0,0 +1,4 @@
+//$("#postBanner").html("<%#= render :partial => 'post_banner' ,:locals => {:order_type=>@type,:order_str=>@str }%>");
+$("#forum_list").html("<%= escape_javascript(render :partial => 'forum_list',:locals => {:forums=>@forums}) %>");
+//这里出现一个问题竟然是单双引号引起的。注意！！
+$("#pages").html('<%= pagination_links_full @forums_pages, @forums_count,:per_page_links => false,:remote =>true,:flag=>true%>');

app/views/forums/show.html.erb

@@ -1,42 +1,144 @@
-<!-- added by fq -->
+<%= javascript_include_tag 'new_user' %>
-<div id="add-memo" class='lz' style="<% unless @memo.errors.any?%>display: none;<% end %> padding: 20px;">
+<script>
-  <h3>
+    function add_class(id){
-    <%=l(:label_memo_new)%>
+        if($("#"+id).hasClass("sortArrowActiveD")){
-  </h3>
+            $("#"+id).removeClass("sortArrowActiveD");
-  <% if User.current.logged? %>
+            $("#"+id).addClass("sortArrowActiveU");
-      <%= labelled_form_for(@memo, :url => create_memo_forum_path(@forum), :html => {:multipart => true} ) do |f|  %>
+            $.ajax({
-          <div class="actions" style="max-width:680px">
+                type: 'GET',
-            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=asc&page='+<%= @topic_pages.page%>
-            <p>
+
-              <%= f.text_field :subject, :required => true, :maxlength => 50%>
+            });
-            </p>
+        }else if($("#"+id).hasClass("sortArrowActiveU")){
-            <p style="max-width:680px">
+            $("#"+id).removeClass("sortArrowActiveU");
-              <%= f.kindeditor :content, :required => true %>
+            $("#"+id).addClass("sortArrowActiveD");
-            </p>
+            $.ajax({
-            <!--<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script>-->
+               type: 'GET',
-            <p style="color: #ff0000">
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
-              (<%= l(:label_memos_max_length) %>)
+
-            </p>
+            });
-            <p class="fl" style="margin-top: 5px;">
+        }else{
-              <%= l(:label_attachment_plural) %>
+            $("#"+id).addClass("sortArrowActiveD");
-              <br />
+            $.ajax({
-              <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
+                type: 'GET',
-            </p>
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
-            <div class="cl"></div>
+
-            <%= f.submit :value => l(:label_memo_create) %>
+           });
-            <%= link_to l(:button_cancel), "#", :onclick => '$("#add-memo").hide(); return false;' %>
+        }
-          </div>
+    }
-      <% end %>
+    $(function() {
-  <% end %>
+        $("#complex").click(function(){
+            $("#reorder_popu").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveU");
+            add_class("reorder_complex");
+        });
+        $("#popu").click(function () {
+            $("#reorder_complex").removeClass("sortArrowActiveD");
+            $("#reorder_complex").removeClass("sortArrowActiveU");
+            $("#reorder_time").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveU");
+            add_class("reorder_popu");
+        });
+        $("#time").click(function () {
+            $("#reorder_complex").removeClass("sortArrowActiveD");
+            $("#reorder_complex").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveD");
+            add_class("reorder_time");
+        });
+        <% if @errors %>
+            $('#create_memo_div').slideToggle();$('#create_memo_btn').slideToggle();
+            $("#error").html('<%= @errors.html_safe %>').show();
+        <% end %>
+    });
+
+    function check_and_submit(){
+        if(!check_memo_name()){
+            return;
+        }
+        if($("textarea[name='memo[subject]']").val().trim() != "" && $("textarea[name='memo[content]']").val().trim() != "" ){
+            $("#new_memo").submit();
+        }else if($("textarea[name='memo[subject]']").val().trim() == "" && $("textarea[name='memo[content]']").val().trim() != "" ){
+            $("#error").html("主题不能为空").show();
+        }else if($("textarea[name='memo[subject]']").val().trim() != "" && $("textarea[name='memo[content]']").val().trim() == ""){
+            $("#error").html("内容不能为空").show();
+        }
+    }
+
+    function check_memo_name(){
+        if($("#memo_subject").val().trim().length > 50){
+            $("#error").html("主题 过长（最长为 50 个字符）").show();
+            return false;
+        }
+        if($("#memo_content").val().trim().length > 5000){
+            $("#error").html("内容 过长（最长为 5000 个字符）").show();
+            return false;
+        }
+        return true;
+    }
+
+    function create_cancle(){
+        $('#create_memo_div').slideToggle();
+        $('#create_memo_btn').slideToggle();
+        $('#memo_subject').val('');
+        $('#memo_content').val('')
+        $('#error').html('').hide();
+    }
+</script>
+<div class="postRightContainer">
+  <div id="create_memo_div" style="display: none">
+    <div id="error" class="red fl mb10" style="display: none">error</div>
+    <%= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
+    <div>
+      <textarea type="text" name="memo[subject]" id="memo_subject" maxlength="50" onblur="check_memo_name();" onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子标题"  ></textarea>
+      <script>
+          var textarea1 = document.getElementById('memo_subject');
+          autoTextarea(textarea1);
+      </script>
+    </div>
+    <div class="mt15">
+      <textarea type="text" name="memo[content]" id="memo_content"  maxlength="5000" onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子内容" /></textarea>
+      <script>
+          var textarea = document.getElementById('memo_content');
+          autoTextarea(textarea);
+      </script>
+    </div>
+    <div class="mt10">
+      <!--<a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>-->
+      <%= render :partial => 'file_form', :locals => {:container => @memo} %>
+      <div class="fr">
+        <a href="javascript:void(0);" class="submit_btn" onclick="check_and_submit();">确定</a>
+      </div>
+      <div class="fr"><a href="javascript:void(0);" class="linkGrey2 mr10" onclick="create_cancle();">取消</a><span class="mr10 fontGrey">或</span></div>
+      <div class="cl"></div>
+    </div>
+    <% end %>
+  </div>
+  <div class="postDetailBanner">
+    <div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a><a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveD"></a><!--<a href="javascript:void(0);" class="sortArrowActiveD"></a>--></div>
+    <div class="postSort" id="popu"><a href="javascript:void(0);" class="linkGrey2 fl">人气</a><a href="javascript:void(0);"  id="reorder_popu" class=""></a></div>
+    <div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a><a href="javascript:void(0);" id="reorder_time" class=""></a></div>
+    <div class="creatPost" id="create_memo_btn"><a href="javascript:void(0);" class="c_white db creatPostIcon bBlue" onclick="$('#error').hide();$('#create_memo_div').slideToggle();$(this).parent().slideToggle();">发布新帖</a></div>
+    <div class="cl"></div>
+  </div>
+  <div id="topics_list">
+    <%= render :partial => 'show_topics',:locals => {:memos=>@memos}%>
+  </div>
+  <ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
+    <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
+  </ul>
+
+  <!--<div class="pageRoll">-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="linkBlue">上一页</a></div>-->
+    <!--<div class="pageCell pageCellActive"><a href="javascript:void(0);" class="c_white">1</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="fontBlue">2</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="fontBlue">3</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="fontBlue">...</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="fontBlue">14</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="linkBlue">下一页</a></div>-->
+  <!--</div>-->
+  <!--<div class="cl"></div>-->
 </div>
-<!--modified by huang-->
+</div>
-<span class="contextual-borad">
-  <%= link_to(image_tag('edit.png')+l(:label_forum_edit),{:action => 'edit', :id => @forum},  :method => 'get', :title => l(:button_edit)) if @forum.editable_by?(User.current) %>
-  <%= link_to(image_tag('delete.png')+'删除讨论区', {:action => 'destroy', :id => @forum}, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :title => l(:button_delete)
-      ) if @forum.destroyable_by?(User.current) %>
-</span>
-<span>
-	<%= link_to l(:label_memo_new_from_forum), new_forum_memo_path(@forum), :class => 'icon icon-add',
-                :onclick => 'showAndScrollTo("add-memo", "memo_subject"); return false;' if User.current.logged? %>
-</span>
-<%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %>

app/views/forums/show.js.erb

@@ -0,0 +1,2 @@
+$("#topics_list").html("<%= escape_javascript(render :partial => 'show_topics',:locals => {:memos=>@memos})%>")
+$("#pages").html('<%= pagination_links_full @topic_pages, @topic_count,:per_page_links => false,:remote =>true%>');

app/views/homework_common/_homework_detail_manual_form.html.erb

@@ -1,110 +0,0 @@
-<ul class="hwork_new_basic mb10">
-  <li>
-    <label class="label02 mb20">
-      <span class="c_red">*</span>
-      &nbsp;<%= l(:field_name)%>：&nbsp;
-    </label>
-    <input  type="text" name="homework_common[name]" id="homework_name" class="w548 h26  fl" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>" >
-    <p id="homework_name_span" class="c_red ml110"></p>
-  </li>
-  <div class="cl"></div>
-  <li >
-    <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
-    <div style="width: 83%;float: left;">
-      <% if edit_mode %>
-          <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-      <% else %>
-          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-          <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
-      <% end %>
-    </div>
-  </li>
-  <div class="cl"></div>
-  <li class="mt10">
-    <label class="label02">&nbsp;&nbsp;附件：&nbsp;</label>
-    <%= render :partial => 'attachments/new_form', :locals => {:container => homework} %>
-  </li>
-  <div class="cl"></div>
-  <li class="fl">
-    <label class="label02">
-      <span class="c_red">*</span>
-      &nbsp;<%= l(:label_limit_time)%>：&nbsp;
-    </label>
-    <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.end_time%>" >
-    <%= calendar_for('homework_end_time')%>
-    <div class="cl"></div>
-  </li>
-  <li class="fl ml100" style="display: none;">
-    <label class="label02">&nbsp;发布日期：&nbsp;</label>
-    <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.publish_time%>" >
-    <%= calendar_for('homework_publish_time')%>
-    <div class="cl"></div>
-  </li>
-  <div class="cl"></div>
-</ul><!--hwork_new_basic end--->
-<div class="hwork_new_set" >
-  <p class="fl ml20 f14 mb10 c_orange">基本规则设置（总分为100分）</p>
-  <div class="cl"></div>
-    <ul class="ml10">
-      <li>
-        <label class="label02">迟交扣分：&nbsp;</label>
-        <%#= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
-        <input type="number" value="<%= homework.late_penalty%>" min="0" max="50" class="fl mb10 h26 w70" name="late_penalty" onkeyup="check_late_penalty()">
-        <span class="fl mt5">&nbsp;分</span>
-        <div class="cl"></div>
-      </li>
-      <li style="display: none;">
-        <label class="label02" >是否匿评：&nbsp;</label>
-        <%= f.check_box :homework_type, :class => "mb10 mt5 fl" %>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <label class="label02">评分比例：&nbsp;</label>
-        <%= select_tag :ta_proportion,options_for_select(ta_proportion_option,homework.homework_detail_manual.ta_proportion), {:class => "fl mb10 h26 w70"}  %>
-        <span class="ml5 fl mt5">×&nbsp;教辅评分</span>
-        <span class="ml5 fl mt5">&nbsp;&nbsp;+&nbsp;&nbsp;</span>
-        <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion* 100).to_i%>%" class="fl mb10 h26 w70" readonly>
-        <span class="ml5 fl mt5">×&nbsp;匿评得分</span>
-        <span class="ml5 fl mt5">=&nbsp;学生得分</span>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <label class="label02" >&nbsp;&nbsp;</label>
-        <span class=" fl  c_red">如果教师对学生作品进行了评分，则教师评分为学生最终得分。</span>
-        <div class="cl"></div>
-      </li>
-    </ul>
-</div><!--hwork_new_set end-->
-
-<div class="hwork_new_set" id="evaluation_setting" >
-  <p class="fl ml20 f14 mb10 c_orange">学生互评设置</p>
-  <div class="cl"></div>
-  <ul class="ml10">
-    <li style="display: none;">
-      <label class="label02">互评启动时间：&nbsp;</label>
-      <input  type="text" name="evaluation_start" id="evaluation_start_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_start%>" >
-      <%= calendar_for('evaluation_start_time')%>
-      <div class="cl"></div>
-    </li>
-    <li style="display: none;">
-      <label class="label02">互评结束时间：&nbsp;</label>
-      <input  type="text" name="evaluation_end" id="evaluation_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_end%>" >
-      <%= calendar_for('evaluation_end_time')%>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <label class="label02">匿评分配数：&nbsp;</label>
-      <input  type="text" name="evaluation_num" id="evaluation_num" class=" hwork_input02 fl"  value="<%= homework.homework_detail_manual.evaluation_num%>" maxlength="2" onkeyup="regex_evaluation_num()">
-      <p class="ml5 fl mt5" id="evaluation_num_notice">每个学生将收到<span class="c_red">&nbsp;3&nbsp;</span>份待匿评作品</p>
-      <div class="cl"></div>
-    </li>
-
-    <li>
-      <label class="label02">缺评扣分：&nbsp;</label>
-      <%= select_tag :absence_penalty,options_for_select(absence_penalty_option,homework.homework_detail_manual.absence_penalty), {:class => "fl mb10 h26 w70"}  %>
-      <span class="fl mt5">&nbsp;分</span>
-      <p class="ml5 fl mt5">学生漏评1个作品将扣<span class="c_red" id="absence_penalty_notice">&nbsp;<%= homework.homework_detail_manual.absence_penalty%>&nbsp;</span>分</p>
-      <div class="cl"></div>
-    </li>
-  </ul> <!-- h1 end--->
-</div><!--hwork_new_set end-->

app/views/homework_common/_homework_detail_programing_form.html.erb

@@ -1,193 +0,0 @@
-<ul class="hwork_new_basic">
-  <li >
-    <label class="label02 mb20">
-      <span class="c_red">*</span>
-      &nbsp;<%= l(:field_name)%>：&nbsp;
-    </label>
-    <input  type="text" name="homework_common[name]" id="homework_name" class="w548 h26  fl" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>" >
-    <p id="homework_name_span" class="c_red ml110"></p>
-  </li>
-  <div class="cl"></div>
-  <li >
-    <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
-    <div style="width: 83%;float: left;">
-      <% if edit_mode %>
-          <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-      <% else %>
-          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-          <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
-      <% end %>
-    </div>
-  </li>
-  <div class="cl"></div>
-  <li class="mt10">
-    <label class="label02">&nbsp;&nbsp;附件：&nbsp;</label>
-    <%= render :partial => 'attachments/new_form', :locals => {:container => homework} %>
-  </li>
-  <div class="cl"></div>
-  <li class="fl">
-    <label class="label02">
-      <span class="c_red">*</span>
-      &nbsp;<%= l(:label_limit_time)%>：&nbsp;
-    </label>
-    <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.end_time%>" >
-    <%= calendar_for('homework_end_time')%>
-    <div class="cl"></div>
-  </li>
-  <li class="fl ml100" style="display: none;">
-    <label class="label02">&nbsp;发布日期：&nbsp;</label>
-    <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.publish_time%>" >
-    <%= calendar_for('homework_publish_time')%>
-    <div class="cl"></div>
-  </li>
-
-  <li>
-    <label class="label02">迟交扣分：&nbsp;</label>
-    <%#= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
-    <input type="number" value="<%= homework.late_penalty%>" min="0" max="50" class="fl mb10 h26 w70" name="late_penalty" onkeyup="check_late_penalty()">
-    <span class="fl mt5">&nbsp;分</span>
-    <div class="cl"></div>
-  </li>
-</ul><!--hwork_new_basic end--->
-
-<div class="cl"></div>
-<div class="hwork_new_set">
-  <p class="fl ml20 f14 mb10 c_orange">编程评测设置</p>
-  <div class="cl"></div>
-  <ul>
-    <li >
-      <label class="label02">&nbsp;开发语言：&nbsp;</label>
-      <%= select_tag :language,options_for_select(programing_languages_options,homework.homework_detail_programing.language.to_i), {:class => "fl mb10 h26 w70",:onchange => "homework_language_change($(this));"}  %>
-      <div class="cl"></div>
-    </li>
-
-    <li >
-      <label class="label02">评分比例：&nbsp;</label>
-      <%= select_tag :ta_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.ta_proportion), {:class => "fl mb10 h26 w70"}  %>
-      <span class="ml5 fl mt5">×&nbsp;教辅评分</span>
-      <span class="ml5 fl mt5">&nbsp;&nbsp;+&nbsp;&nbsp;</span>
-      <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_programing.ta_proportion* 100).to_i%>%" class="fl mb10 h26 w70" readonly>
-      <span class="ml5 fl mt5">×&nbsp;系统评分</span>
-      <span class="ml5 fl mt5">=&nbsp;学生得分</span>
-      <div class="cl"></div>
-    </li>
-    <li >
-      <label class="label02" >&nbsp;&nbsp;</label>
-      <span class=" fl  c_red">如果教师对学生作品进行了评分，则教师评分为学生最终得分。</span>
-      <div class="cl"></div>
-    </li>
-
-    <li >
-      <label class="label02">&nbsp;标准代码：&nbsp;</label>
-      <textarea  name="standard_code"  class=" w547 h400 mb10 fl" oninput="init_programing_test();" onpropertychange="init_programing_test()"><%= homework.homework_detail_programing.standard_code || c_stantard_code_teacher%></textarea>
-      <div class="cl"></div>
-    </li>
-
-    <% if edit_mode %>
-        <% homework.homework_tests.each do |homework_test|%>
-            <div>
-              <li>
-                <label class="label02">&nbsp;测试输入：&nbsp;</label>
-                <input type="text" class="fl h26 w190 mb10" name="input[<%= homework_test.id%>]" value="<%= homework_test.input%>"/>
-              </li>
-              <li >
-                <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-                <input type="text" class="fl h26 w190  mb10" name="output[<%= homework_test.id%>]" value="<%= homework_test.output%>"/>
-              </li>
-              <li>
-                <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
-                <a class="icon_remove" href="javascript:void(0);" title="删除测试" onclick="remove_programing_test($(this).parent().parent())"></a>
-                <% if homework_test.result && !homework_test.result.to_s.empty?%>
-                    <% if homework_test.result == 0%>
-                        <a class="green_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">正确</a>
-                    <% else%>
-                        <a class="red_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">错误</a>
-                    <% end%>
-                <% else%>
-                    <a class="blue_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">测试</a>
-                <% end%>
-                <input type="hidden"  id="test_result_<%= homework_test.id%>" name="result[<%= homework_test.id%>]"  value="<%= homework_test.result%>"/>
-              </li>
-              <div class="cl"></div>
-            </div>
-        <% end%>
-    <% else %>
-        <div>
-          <li>
-            <label class="label02">&nbsp;测试输入：&nbsp;</label>
-            <input type="text" class="fl h26 w190 mb10" name="input[0]" value="1 2"/>
-          </li>
-          <li >
-            <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-            <input type="text" class="fl h26 w190  mb10" name="output[0]" value="3"/>
-          </li>
-          <li>
-            <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
-            <a class="icon_remove" href="javascript:void(0);" title="删除测试" onclick="remove_programing_test($(this).parent().parent())"></a>
-            <a class="blue_btn fl ml5 mt programing_test" onclick="programing_test('0')" id="test_send_0">测试</a>
-            <input type="hidden"  id="test_result_0" name="result[0]"  />
-          </li>
-          <div class="cl"></div>
-        </div>
-    <% end %>
-    <input type="hidden" name="error_msg" id="homework_test_error_msg" value="<%= homework.homework_tests.first.error_msg if homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg%>">
-    <table class="border_ce" cellpadding="0" cellspacing="0" id="homework_work_test_show" style="display: <%= homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg && !homework.homework_tests.first.error_msg.empty? ? "block" : "none"%>">
-      <tbody>
-      <tr class="border_t" >
-        <td  class="td_end fb c_red w60 td_board_left">
-          错误信息:
-        </td>
-        <td  class="td_end wl" id="homework_work_test_desc">
-          <% if  homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg %>
-            <%= homework.homework_tests.first.error_msg%>
-          <% end%>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-  </ul>
-</div>
-
-<script type="text/javascript">
-
-    //点击测试，发送
-    function programing_test(obj) {
-        $.post(
-                '<%= programing_test_homework_common_index_path%>',
-                {
-                    src: $("textarea[name='standard_code']").val(),
-                    input: $("input[name='input[" + obj +"]']").val(),
-                    output: $("input[name='output[" + obj + "]']").val(),
-                    language: $("select[name='language']").val(),
-                    index: obj
-                },
-                function (data) {
-
-                }
-        );
-    }
-
-    function init_programing_test()
-    {
-        $(".programing_test").each(function(){
-            $(this).removeClass("green_btn red_btn").addClass("blue_btn").text("测试");
-            $(this).next("input").val("");
-        });
-    }
-
-    function homework_language_change(obj)
-    {
-        if(obj.val() == "1")
-        {
-//            alert(1);
-            $("textarea[name='standard_code']").val("<%= escape_javascript c_stantard_code_teacher%>");
-
-        }
-        else if(obj.val() == "2")
-        {
-//            alert(2);
-            $("textarea[name='standard_code']").val("<%= escape_javascript c_stantard_code_teacher_%>");
-
-        }
-    }
-</script>

app/views/homework_common/_new_homework_detail_manual_form.html.erb

@@ -1,74 +0,0 @@
-<div class="homepageRight">
-  <div class="HomeWork">
-    <div class="RightBanner">
-      <div class="NewsBannerName">发布作业</div>
-    </div>
-    <div class="HomeWorkCon">
-        <div class="mt15">
-            <textarea class="InputBox  W700 " placeholder="请输入作业标题" name="homework_common[name]" id="homework_name" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>"></textarea>
-        </div>
-        <div class=" mt10">
-            <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
-            <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.end_time%>" placeholder="截止日期"></input>
-                <div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date"></a></div>
-                <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.publish_time%>" placeholder="发布日期"></input>
-                <div class="fl DateBorder"><a href="javascript:void(0);" class="pic_date"></a></div>
-            <div class="cl"></div>
-        </div>
-        <div class="mt10">
-        <% if edit_mode %>
-            <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-        <% else %>
-            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-            <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
-        <% end %>
-        </div>
-        <div class="mt10">
-            <textarea class="InputBox  W700 SearchIcon" placeholder="发送到课程" style="margin-top: 0px; margin-bottom: 0px; height: 29px;"></textarea>
-        </div>
-        <div class="mt5">
-            <a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
-            <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
-            <div class="cl"></div>
-        </div>
-        
-        <div class="mt10">
-            <a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
-            <div class="DropLine"></div>
-            <div class="cl"></div>
-        </div>
-        <div class="advanced_option" style="display:none;">
-          <div class="mt10">
-              <select class="InputBox W120" required="true">
-                  <option value="语言选择">语言选择</option>
-                  <option value="C语言">C语言</option>
-                  <option value="C++">C++</option>
-                </select>
-          </div>
-          
-          <div class="mt10">
-              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
-              <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-              <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-              <div class="cl"></div>
-          </div>
-        </div>
-        <div class="mt10">
-            <a href="javascript:void(0);" onClick="submit_homework('new_homework_common');" class="BlueCirBtnMini fr">发布</a>
-            <span class="fr mr10 mt3">或</span><%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'fr mr10 mt3'%>
-            <div class="cl"></div>
-        </div>
-    </div>
-  </div><!----HomeWork end-->
-  
-</div>
-
-<script id="t:test-answer-list" type="text/html">
-  <div class="mt10">
-      <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
-      <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-      <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-      <div class="cl"></div>
-  </div>
-</script>
-

app/views/homework_common/_set_evalutation_att.html.erb

@@ -0,0 +1,53 @@
+<div class="markPopup" id="popbox02">
+  <%= form_for('new_form',:url =>  {:controller => 'homework_common',:action => 'set_evaluation_attr',:homework => @homework.id},:method => "post",:remote => true) do |f|%>
+      <span class="uploadText">匿评设置</span>
+      <div class="cl"></div>
+
+      <div class="mt15">
+        <span class="f14 fontGrey3 fl mt5">开启匿评</span>
+        <div class="calendar_div fl ml10">
+          <input  type="text" name="evaluation_start" id="evaluation_start_time" placeholder="开启匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= @homework_detail_manual.evaluation_start%>"/>
+          <%= calendar_for('evaluation_start_time')%>
+        </div>
+        <div class="cl"></div>
+        <p id="homework_evaluation_start_time" class="c_red"></p>
+      </div>
+      <div class="cl"></div>
+
+      <div class="mt15">
+        <span class="f14 fontGrey3 fl mt5">关闭匿评</span>
+        <div class="calendar_div fl ml10">
+          <input  type="text" name="evaluation_end" id="evaluation_end_time" placeholder="关闭匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= @homework_detail_manual.evaluation_end%>"/>
+          <%= calendar_for('evaluation_end_time')%>
+        </div>
+        <div class="cl"></div>
+        <p id="homework_evaluation_end_time" class="c_red"></p>
+      </div>
+      <div class="cl"></div>
+
+      <div class="mt15 mb10">
+        <span class="f14 fontGrey3 mr10 fl mt5">匿评人数</span>
+        <input type="text" name="evaluation_num" id="evaluation_num" placeholder="默认匿评人数为3" maxlength="2" class="markInput fl" value="<%= @homework_detail_manual.evaluation_num%>"/>
+        <div class="cl"></div>
+        <p id="evaluation_num_notice" class="c_red"></p>
+      </div>
+      <div class="cl"></div>
+
+      <div class="mb20 none">
+        <span class="f14 fontGrey3 mr10">禁用匿评</span>
+        <input type="checkbox" />
+        <span class="f12 c_red ml10">禁用后将无法进行学生互评</span>
+      </div>
+      <div class="cl"></div>
+
+      <div>
+        <div class="courseSendSubmit">
+          <a href="javascript:void(0);" class="sendSourceText" onclick="submit_set_evaluation_attr('<%= @homework.end_time%>');">确定</a>
+        </div>
+        <div class="courseSendCancel">
+          <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>
+        </div>
+      </div>
+      <div class="cl"></div>
+  <% end%>
+</div>

app/views/homework_common/alert_anonymous_comment.js.erb

@@ -3,5 +3,4 @@ showModal('ajax-modal', '500px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
 "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed");
-$('#ajax-modal').parent().addClass("anonymos");

app/views/homework_common/edit.html.erb

@@ -1,24 +1,24 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<script type="text/javascript">
-<%= error_messages_for 'homework_common' %>
+    function reset_homework(){
-
+        $("#homework_name").val("");
-<div class="project_r_h">
+        $("#homework_end_time").val("");
-  <h2 class="project_h2">
+        $("#course_id").val($("#option_select").val());
-    <%= l(:label_course_homework_edit)%>
+        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
-  </h2>
+        homework_description_editor.html("");
+        $("#homework_editor").toggle();
+    }
+</script>
+<div class="homepageRightBanner mb10">
+  <div class="NewsBannerName">编辑作业</div>
 </div>
-<div class="hwork_new">
-  <%if @homework.homework_type == 2%>
-      <%= form_for @homework do |f| %>
-          <%= render :partial => 'homework_common/homework_detail_programing_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-  <% else %>
-      <%= form_for @homework do |f| %>
-          <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-  <% end%>
-</div><!--hwork_new end-->
 <div class="cl"></div>
+
+<!-- 老师身份才可以发布作业 -->
+<div class="HomeWork mb10">
+  <%= form_for @homework do |f| %>
+      <input type="text" name="is_in_course" class="none" value="<%= @is_in_course%>"/>
+      <div id="HomeWorkCon">
+        <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
+      </div>
+  <% end%>
+</div><!----HomeWork end-->

app/views/homework_common/index.html.erb

@@ -25,9 +25,9 @@
           ( <%= link_to homework.student_works.count, student_work_index_path(:homework => homework.id), :class => 'c_red'%> )
         </p>
         <% if @is_teacher%>
+            <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework,:is_in_course => 1),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit")  %>
+            <%= link_to(l(:button_edit),edit_homework_common_path(homework,:is_in_course => 1), :class => "fr mr10 work_edit ml10") %>
             <%= homework_anonymous_comment(homework)%>
-            <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit")  %>
-            <%#= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %>
         <% elsif @is_student%>
             <%= student_anonymous_comment homework %>
             <%= student_new_homework homework %>
@@ -37,7 +37,7 @@
             $(function(){if($("#bid_description_<%= homework.id%>_content").height()>360){$("#bid_show_more_des_button<%= homework.id%>").show();}});
         </script>
         <div  id="bid_description_<%= homework.id%>" class="news_description mt5">
-          <div id="bid_description_<%= homework.id%>_content" class="upload_img">
+          <div id="bid_description_<%= homework.id%>_content" class="upload_img list_style">
             <%= homework.description.html_safe %>
           </div>
         </div>
@@ -78,11 +78,7 @@
             <div class="mt5">
               <span class="tit_fb"  style="width: auto;"> 开发语言：</span>
               <div class="fl">
-                <% if homework.homework_detail_programing.language.to_i == 1%>
+                <%= homework.language_name%>
-                    C
-                <% elsif homework.homework_detail_programing.language.to_i == 2%>
-                    C++
-                <% end%>
               </div>
             </div>
             <div class="cl"></div>
@@ -98,17 +94,17 @@
             <div class="cl"></div>
         <% end%>
 
-        <div class="mt5">
+        <!--div class="mt5">
           <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>
           <div class="fl mb5 c_red">
-            <% if homework.homework_type == 1%>
+            <%# if homework.homework_type == 1%>
-                <%= scoring_rules homework.late_penalty,homework.id,@is_teacher,homework.homework_detail_manual.absence_penalty%>
+                <%#= scoring_rules homework.late_penalty,homework.id,@is_teacher,homework.homework_detail_manual.absence_penalty%>
-            <% else%>
+            <%# else%>
-                <%= scoring_rules homework.late_penalty,homework.id,@is_teacher%>
+                <%#= scoring_rules homework.late_penalty,homework.id,@is_teacher%>
-            <% end%>
+            <%# end%>
           </div>
         </div>
-        <div class="cl"></div>
+        <div class="cl"></div-->
 
         <span class="fl"><%= l(:label_end_time)%>：<%= homework.end_time%></span>
         <% if betweentime(homework.end_time) < 0 %>

app/views/homework_common/new.html.erb

@@ -1,17 +0,0 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-<%= error_messages_for 'homework_common' %>
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_course_homework_new)%>
-  </h2>
-</div>
-<div class="hwork_new">
-  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-      <%= hidden_field_tag "course",@course.id%>
-      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-      <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-  <% end%>
-</div><!--hwork_new end-->
-<div class="cl"></div>

app/views/homework_common/next_step.html.erb

@@ -1,30 +0,0 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<%= error_messages_for 'homework_common' %>
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_course_homework_new)%>
-  </h2>
-</div>
-<% if @homework_type == "1"%>
-    <div class="hwork_new">
-      <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-          <%= hidden_field_tag "course",@course.id%>
-          <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-          <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-    </div><!--hwork_new end-->
-<% elsif @homework_type == "2"%>
-    <div class="hwork_new">
-      <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-          <%= hidden_field_tag "course",@course.id%>
-          <%= hidden_field_tag "homework_common[homework_type]","2"%>
-          <%= render :partial => 'homework_common/homework_detail_programing_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-          <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-    </div><!--hwork_new end-->
-    <div class="cl"></div>
-<% end%>

app/views/homework_common/set_evaluation_attr.js.erb

@@ -0,0 +1 @@
+clickCanel();

app/views/homework_common/start_anonymous_comment.js.erb

@@ -1,6 +1,6 @@
 <% if @statue == 1%>
 alert('启动成功');
-$("#<%= @homework.id %>_start_anonymous_comment").replaceWith('<%= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "fr mr10 work_edit")%>');
+$("#<%= @homework.id %>_start_anonymous_comment").replaceWith('<%= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');
 <% elsif @statue == 2 %>
 alert('启动失败\n作业总数大于等于2份时才能启动匿评');
 <% elsif @statue == 3%>

app/views/homework_common/start_evaluation_set.js.erb

@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att') %>');
+showModal('ajax-modal', '350px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+"<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");

app/views/homework_common/stop_anonymous_comment.js.erb

@@ -1,2 +1,2 @@
-$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('<span class="fr  pr_join_span mr10" title="匿评结束">匿评结束</span>');
+$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('');
 alert('关闭成功');

app/views/issues/_action_menu.html.erb

@@ -3,4 +3,4 @@
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'talk_edit fr' if User.current.allowed_to?(:add_issues, @project) %>
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
 <%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
-<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
+<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>

app/views/issues/_attributes.html.erb

@@ -6,12 +6,11 @@
           <li>
             <label class="label"><span class="c_red f12">*</span><%= l(:field_status) %>：</label>
             <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
-                <%= f.select :status_id,
+                <%= f.select :status_id, (@allowed_statuses.collect { |p| [p.name, p.id] }),
-                             (@allowed_statuses.collect { |p| [p.name, p.id] }),
+                         {:no_label => true},
-                             {:no_label => true},
+                         # ajax 刷新
-                             # ajax 刷新
+                          #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
-                             #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
+                          :class => "w150" %>
-                             :class => "w150" %>
             <% else %>
                 <%= h(@issue.status.name) %>
             <% end %>
@@ -20,10 +19,9 @@
           <li>
             <label class="label"><span class="c_red f12">*</span><%= l(:field_priority) %>：</label>
             <% if @issue.safe_attribute? 'priority_id' %>
-                <%= f.select :priority_id,
+                <%= f.select :priority_id, (@priorities.collect { |p| [p.name, p.id] }),
-                             (@priorities.collect { |p| [p.name, p.id] }),
+                         {:required => true, :no_label => true}, :disabled => !@issue.leaf?,
-                             {:required => true, :no_label => true}, :disabled => !@issue.leaf?,
+                          :class => "w150" %>
-                             :class => "w150" %>
             <% end %>
           </li>
           <div class="cl"></div>
@@ -32,8 +30,8 @@
             <label class="label"><%= l(:field_assigned_to) %>：</label>
             <% if @issue.safe_attribute? 'assigned_to_id' %>
                 <%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to),
-                             {:required => @issue.required_attribute?('assigned_to_id'), :no_label => true},
+                         {:required => @issue.required_attribute?('assigned_to_id'), :no_label => true},
-                             :class => "w150" %>
+                          :class => "w150" %>
             <% end %>
           </li>
           <div class="cl"></div>
@@ -41,8 +39,8 @@
             <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
             <label class="label"><%= l(:field_fixed_version) %>：</label>
                 <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version),
-                             {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true},
+                         {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true},
-                             :class => "w150" %>
+                          :class => "w150" %>
                 <%#= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
                               new_project_version_path(@issue.project),
                               :remote => true,
@@ -60,11 +58,7 @@
           <li>
             <label class="label02"><%= l(:field_start_date) %>：</label>
             <% if @issue.safe_attribute? 'start_date' %>
-                <%= f.text_field :start_date,
+                <%= f.text_field :start_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true, :required => @issue.required_attribute?('start_date') %>
-                                 :size => 22,
-                                 :disabled => !@issue.leaf?,
-                                 :no_label => true,
-                                 :required => @issue.required_attribute?('start_date') %>
                 <%= calendar_for('issue_start_date', 'start_date') if @issue.leaf? %>
             <% end %>
           </li>
@@ -72,10 +66,7 @@
           <li>
             <label class="label02"><%= l(:field_due_date) %>：</label>
             <% if @issue.safe_attribute? 'due_date' %>
-                <%= f.text_field :due_date, :size => 22,
+                <%= f.text_field :due_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true, :required => @issue.required_attribute?('due_date') %>
-                                 :disabled => !@issue.leaf?,
-                                 :no_label => true,
-                                 :required => @issue.required_attribute?('due_date') %>
                 <%= calendar_for('issue_due_date', 'start_date') if @issue.leaf? %>
             <% end %>
           </li>
@@ -83,10 +74,7 @@
           <li>
             <label class="label02"><%= l(:field_estimated_hours) %>：</label>
             <% if @issue.safe_attribute? 'estimated_hours' %>
-                <%= f.text_field :estimated_hours, :size => 22,
+                <%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true, :required => @issue.required_attribute?('estimated_hours') %>
-                                 :disabled => !@issue.leaf?,
-                                 :no_label => true,
-                                 :required => @issue.required_attribute?('estimated_hours') %>
                 <span class="mt3 ml5"><%= l(:field_hours) %></span>
             <% end %>
           </li>
@@ -94,9 +82,9 @@
           <li><label class="label02">&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</label>
             <% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %>
                 <%= f.select :done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }),
-                             {:required => @issue.required_attribute?('done_ratio'), :no_label => true},
+                          {:required => @issue.required_attribute?('done_ratio'), :no_label => true},
-                             :onchange => "PrecentChange(this.value)",
+                          :onchange => "PrecentChange(this.value)",
-                             :class => "w150" %>
+                          :class => "w150" %>
             <% end %>
           </li>
           <div class="cl"></div>

app/views/issues/_attributes_show.html.erb

@@ -0,0 +1,52 @@
+<!--属性-->
+<div class="pro_info_box mb10">
+  <%= issue_fields_rows do |rows| %>
+      <ul class="fl" >
+        <li><p class="label03" >&nbsp;状态&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= @issue.status.name %></p>
+        </li>
+        <div class="cl"></div>
+        <% unless @issue.disabled_core_fields.include?('assigned_to_id') %>
+            <li><p class="label03" >&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %></span>
+            </li>
+        <% end %>
+        <div class="cl"></div>
+      </ul>
+      <ul class="fl" >
+        <li><p class="label03" >&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.priority.name %></span>
+        </li>
+        <div class="cl"></div>
+        <% unless @issue.disabled_core_fields.include?('done_ratio') %>
+            <li><p class="label03" >&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.done_ratio %>%</span>
+            </li>
+        <% end %>
+        <div class="cl"></div>
+      </ul>
+      <ul class="fl " >
+        <% unless @issue.disabled_core_fields.include?('start_date') %>
+            <li><p class="label03" style="width:50px;" >&nbsp;开始&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= format_date(@issue.start_date) %></p>
+            </li>
+        <% end %>
+        <div class="cl"></div>
+        <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
+            <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
+            </li>
+        <% end %>
+        <div class="cl"></div>
+      </ul>
+      <ul class="fl " >
+        <% unless @issue.disabled_core_fields.include?('due_date') %>
+            <li><p class="label03" >&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %></span>
+            </li>
+        <% end %>
+        <div class="cl"></div>
+        <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
+            <li><p class="label03" >&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
+            </li>
+        <% end %>
+        <div class="cl"></div>
+      </ul>
+      <% end %><!--pro_info_box end-->
+  <%#= render_custom_fields_rows(@issue) %>
+  <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
+</div>
+<!--pro_info_box 属性 end-->

app/views/issues/_edit.html.erb

@@ -1,3 +1,4 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
@@ -6,24 +7,20 @@
         <div id="all_attributes" style="display:none;">
           <%= render :partial => 'form', :locals => {:f => f} %>
           <div class="ping_C mb10 ml10"></div>
-          <!--<a remote="true" href="javascript:void(0)" class="blue_btn fl" style="margin-left: 80px;margin-bottom: 10px;margin-top: -10px;" onclick="$('#issue-form').submit();">-->
-            <!--<%#= l(:button_submit) %>-->
-          <!--</a>-->
         </div>
-
     <% end %><!--end-->
 
-    <!--<fieldset><legend><%#= l(:field_notes) %></legend>-->
-    <!--回复框-->
     <% if @journals.present? %>
         <div id="history">
           <%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>
         </div>
     <% end %>
-    <div id="journal_issue_note" class="wiki"></div>
+    <div id="journal_issue_note" class="wiki">
+
+    </div>
     <input name="issue_quote_new" type="hidden" value="<%= %>" />
     <fieldset><legend>回复</legend>
-    <%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %>
+    <%= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply' %>
     </fieldset>
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
     <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->

app/views/issues/_form.html.erb

@@ -28,11 +28,7 @@
         <li>
           <% if @issue.safe_attribute? 'subject' %>
               <label class="label"><span class="c_red f12">*</span>&nbsp;主题&nbsp;&nbsp;:&nbsp;</label>
-              <%= f.text_field :subject,
+              <%= f.text_field :subject, :class => "w576", :maxlength => 255, :style => "font-size:small", :no_label => true %>
-                             :class => "w576",
-                             :maxlength => 255,
-                             :style => "font-size:small",
-                             :no_label => true %>
               <!--Added by young-->
               <%= javascript_tag do %>
                   observeAutocompleteField('issue_subject',
@@ -53,13 +49,7 @@
               <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %>
               <%#= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
               <%#= content_tag 'span', :id => "issue_description_and_toolbar" do %>
-              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",
+              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'87%', :resizeType => 0, :no_label => true %>
-                             # :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
-                             # :accesskey => accesskey(:edit),
-                             # :class => "w583",
-                             :width=>'87%',
-                             :resizeType => 0,
-                             :no_label => true %>
               <%# end %>
               <%#= wikitoolbar_for 'issue_description' %>
           <% end %>
@@ -68,13 +58,13 @@
       </ul>
     </div>
     <li>
-      <% if @copy_from && @copy_from.attachments.any? %>
+      <%# if @copy_from && @copy_from.attachments.any? %>
-          <p>
+          <!--<p>-->
             <!-- 去除附件复制功能 -->
             <!-- <label for="copy_attachments"><#%= l(:label_copy_attachments) %></label>
             <#%= check_box_tag 'copy_attachments', '1', @copy_attachments %>  -->
-          </p>
+          <!--</p>-->
-      <% end %>
+      <%# end %>
       <% if @copy_from && !@copy_from.leaf? %>
           <p>
             <label for="copy_subtasks"><%= l(:label_copy_subtasks) %></label>

app/views/issues/_form_custom_fields.html.erb

@@ -1,13 +1,13 @@
 <div class="splitcontent">
-<div class="splitcontentleft">
+  <div class="splitcontentleft">
-<% i = 0 %>
+    <% i = 0 %>
-<% split_on = (@issue.custom_field_values.size / 2.0).ceil - 1 %>
+    <% split_on = (@issue.custom_field_values.size / 2.0).ceil - 1 %>
-<% @issue.editable_custom_field_values.each do |value| %>
+    <% @issue.editable_custom_field_values.each do |value| %>
-  <p><%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %></p>
+        <p><%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %></p>
-<% if i == split_on -%>
+        <% if i == split_on -%>
-</div><div class="splitcontentright">
+            </div><div class="splitcontentright">
-<% end -%>
+        <% end -%>
-<% i += 1 -%>
+        <% i += 1 -%>
-<% end -%>
+    <% end -%>
-</div>
+  </div>
 </div>

app/views/issues/_history.html.erb

@@ -12,9 +12,9 @@
             <p>
               <% if journal.details.any? %>
                 <% details_to_strings(journal.details).each do |string| %>
-                  <p><%= string %></p>
+                  <p><%= string.html_safe %></p>
                 <% end %>
-            <% end %>
+              <% end %>
             </p>
           </div>
           <!--编辑、引用、回复按钮-->

app/views/issues/add_journal.js.erb

@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data(<%= @user_activity_id%>);
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");

app/views/issues/show.html.erb

@@ -12,6 +12,7 @@
     <div class="ping_dispic">
       <%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
     </div>
+
     <div class="talk_txt fl">
       <p class="pro_page_tit" style="word-break:break-all;">
         <span class='<%= "#{get_issue_type(@issue.tracker_id)[0]} fl" %>' title="<%= get_issue_type(@issue.tracker_id)[1] %>"></span>
@@ -20,104 +21,53 @@
       </p><br/>
 
       <div class="cl"></div>
-      <p>由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>
+      由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>添加于 <%= format_time(@issue.created_on).html_safe %>
-        <%# if @issue.created_on != @issue.updated_on %>
-            添加于 <%= format_time(@issue.created_on).html_safe %>
-        <%# else %>
-         <%#= format_time(@issue.updated_on).html_safe %>
-        <%# end %>
     </div>
+
     <!--talk_txt end-->
     <a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>
     <div class="cl"></div>
-    <div class="talk_info mb10" style="word-break:break-all;">
+    <% if @issue.description? || @issue.attachments.any? -%>
-      <% if @issue.description? || @issue.attachments.any? -%>
+        <div class="talk_info mb10" style="word-break:break-all;">
           <% if @issue.description? %>
               <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
               <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
           <% end %>
-          </div>
+        </div>
-          <div class="pro_pic_box mb10">
+    <% end -%>
-            <a href="javascript:void(0)" class="link_img fl">
+
-              <!--显示附件、图片-->
+    <div class="pro_pic_box mb10">
-              <%= link_to_attachment_project @issue, :thumbnails => true %></a><br/>
+      <a href="javascript:void(0)" class="link_img fl">
-      <% end -%>
+        <!--显示附件、图片-->
-      <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
+        <%= link_to_attachment_project @issue, :thumbnails => true %></a><br/>
-      </div><!--pro_pic_box  end-->
+      <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
-      <div class="cl"></div>
+    </div><!--pro_pic_box  end-->
-      <!--属性-->
+    <div class="cl"></div>
-      <div class="pro_info_box mb10">
+
-        <%= issue_fields_rows do |rows| %>
+    <!--属性-->
-              <ul class="fl" >
+    <%= render :partial => 'attributes_show' %>
-                <li><p class="label03" >&nbsp;状态&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= @issue.status.name %></p>
+    <!--pro_info_box 属性 end-->
-                </li>
+
-                <div class="cl"></div>
+    <%# 该应用是对issue主题内容的引用，对应:to => 'journals#new %>
-              <% unless @issue.disabled_core_fields.include?('assigned_to_id') %>
+    <!--<div class="cl"></div>-->
-                <li><p class="label03" >&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %></span>
+    <!--<%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %>-->
-                </li>
+    <div class="cl"></div>
-              <% end %>
+  </div>
-                <div class="cl"></div>
-              </ul>
-              <ul class="fl" >
-                <li><p class="label03" >&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.priority.name %></span>
-                </li>
-                <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('done_ratio') %>
-                <li><p class="label03" >&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.done_ratio %>%</span>
-                </li>
-              <% end %>
-                <div class="cl"></div>
-              </ul>
 
-              <ul class="fl " >
-              <% unless @issue.disabled_core_fields.include?('start_date') %>
-                <li><p class="label03" style="width:50px;" >&nbsp;开始&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= format_date(@issue.start_date) %></p>
-                </li>
-              <% end %>
-                <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
-                <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
-                </li>
-              <% end %>
-                <div class="cl"></div>
-              </ul>
-              <ul class="fl " >
-                <% unless @issue.disabled_core_fields.include?('due_date') %>
-                <li><p class="label03" >&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %></span>
-                </li>
-              <% end %>
-                <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
-                <li><p class="label03" >&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
-                </li>
-              <% end %>
-                <div class="cl"></div>
-              </ul>
-            <% end %><!--pro_info_box end-->
-        <%#= render_custom_fields_rows(@issue) %>
-        <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
-      </div>
-      <!--pro_info_box 属性 end-->
-      <div class="cl"></div>
-      <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %></a>
-      <div class="cl"></div>
-      </div>
   <!--problem_main end-->
   <div style="clear: both;"></div>
+
   <!--留言-->
   <% if @issue.editable? %>
       <div id="update">
         <%= render :partial => 'edit' %>
       </div>
       <p style="padding-top: 5px"></p>
-
+      <%#--引用时不能修改，剥离出引用内容--%>
-<!--引用时不能修改，剥离出引用内容-->
+      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();issue_journal_kind_reply.sync();$('#issue-form').submit();">
-
-      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
         <%= l(:button_submit) %>
       </a>
   <% end %>
-
   <%#= submit_tag l(:button_submit) %>
   <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%>
 </div>
@@ -128,6 +78,7 @@
       <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %>
     </div>
 <% end %>
+
 <div class="cl"></div>
 <% other_formats_links do |f| %>
     <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>