Merge branch 'szzh' into develop

app/controllers/comments_controller.rb

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

app/controllers/courses_controller.rb

@@ -8,7 +8,7 @@ class CoursesController < ApplicationController
   helper :attachments
   helper :activity_notifys
 
-  before_filter :auth_login1, :only => [:show, :feedback]
+  before_filter :auth_login1, :only => [:show, :course_activity, :feedback]
   menu_item :overview
   menu_item :feedback, :only => :feedback
   menu_item :homework, :only => :homework
@@ -610,11 +610,37 @@ class CoursesController < ApplicationController
     end
   end
 
+  def course_activity
+    redirect_to course_url(@course, type: params[:type], page: params[:page])
+  end
+
   def show
-    course_activities = @course.course_activities.order("created_at desc")
+    course_activities = @course.course_activities
     @canShowRealName = User.current.member_of_course? @course
-    @course_activities = paginateHelper course_activities,10
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    if params[:type].present?
+      case params[:type]
+        when "homework"
+          @course_activities = course_activities.where("course_act_type = 'HomeworkCommon'").order('updated_at desc').limit(10).offset(@page * 10)
+        when "news"
+          @course_activities = course_activities.where("course_act_type = 'News'").order('updated_at desc').limit(10).offset(@page * 10)
+        when "message"
+          @course_activities = course_activities.where("course_act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
+        when "poll"
+          @course_activities = course_activities.where("course_act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10)
+        when "attachment"
+          @course_activities = course_activities.where("course_act_type = 'Attachment'").order('updated_at desc').limit(10).offset(@page * 10)
+        when "journalsForMessage"
+          @course_activities = course_activities.where("course_act_type = 'JournalsForMessage'").order('updated_at desc').limit(10).offset(@page * 10)
+        else
+          @course_activities = course_activities.order('updated_at desc').limit(10).offset(@page * 10)
+      end
+    else
+      @course_activities = course_activities.order('updated_at desc').limit(10).offset(@page * 10)
+    end
+    @type = params[:type]
     respond_to do |format|
+      format.js
       format.html{render :layout => 'base_courses'}
       format.api
     end

app/controllers/files_controller.rb

@@ -176,12 +176,6 @@ class FilesController < ApplicationController
 
   def index
     @flag = params[:flag] || false
-    #sort_init 'filename', 'asc'
-    # sort_init 'created_on', 'desc'
-    # sort_update   'created_on' => "#{Attachment.table_name}.created_on",
-    #               'filename' => "#{Attachment.table_name}.filename",
-    #               'size' => "#{Attachment.table_name}.filesize",
-    #               'downloads' => "#{Attachment.table_name}.downloads"
     sort = ""
     @sort = ""
     @order = ""

app/controllers/git_usage_controller.rb

@@ -1,12 +0,0 @@
-#added by baiyu
-class GitUsageController < ApplicationController
-  layout "new_base"
-  def ch_usage
-    
-  end
-  
-  def en_usage
-    
-  end
-end
-#end

app/controllers/homework_common_controller.rb

@@ -11,11 +11,16 @@ class HomeworkCommonController < ApplicationController
   before_filter :member_of_course, :only => [:index]
 
   def index
-    homeworks = @course.homework_commons.order("created_at desc")
+    @new_homework = HomeworkCommon.new
+    @new_homework.homework_detail_manual = HomeworkDetailManual.new
+    @new_homework.course = @course
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    @homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
-    @homeworks = paginateHelper homeworks,20
+    @is_new = params[:is_new]
     respond_to do |format|
+      format.js
       format.html
     end
   end
@@ -32,7 +37,7 @@ class HomeworkCommonController < ApplicationController
 
   def edit
     @user = User.current
-    @is_in_course = params[:is_in_course]
+    @is_in_course = params[:is_in_course].to_i
     respond_to do |format|
       format.html{render :layout => 'new_base_user'}
     end
@@ -148,9 +153,9 @@ class HomeworkCommonController < ApplicationController
   # 开启/关闭匿评消息通知
   def send_message_anonymous_comment(homework, m_status )
      # status 标记匿评状态 1为关闭 0为开启
-     course = @homework.course
+     course = homework.course
-     course.student.each do |st|
+     course.members.each do |m|
-       @homework.course_messages << CourseMessage.new(:user_id => st.student_id, :course_id => course.id, :viewed => false, :status => m_status)
+       @homework.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => m_status)
      end
   end
   #提示

app/controllers/messages_controller.rb

@@ -162,9 +162,16 @@ class MessagesController < ApplicationController
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
     # @reply.reply_id = params[:id]
     @topic.children << @reply
+    course_activity = CourseActivity.where("course_act_type='Message' and course_act_id =#{@topic.id}").first
+    if course_activity
+      course_activity.updated_at = Time.now
+      course_activity.save
+    end
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
-    user_activity.updated_at = Time.now
+    if user_activity
-    user_activity.save
+      user_activity.updated_at = Time.now
+      user_activity.save
+    end
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]

app/controllers/news_controller.rb

@@ -175,19 +175,19 @@ class NewsController < ApplicationController
           update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
         end
         # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add start
-        teachers = searchTeacherAndAssistant(@course)
+        # teachers = searchTeacherAndAssistant(@course)
-        for teacher in teachers
+        # for teacher in teachers
-          if(teacher.user_id != User.current.id)
+        #   if(teacher.user_id != User.current.id)
-            notify = ActivityNotify.new()
+        #     notify = ActivityNotify.new()
-            notify.activity_container_id = @course.id
+        #     notify.activity_container_id = @course.id
-            notify.activity_container_type = 'Course'
+        #     notify.activity_container_type = 'Course'
-            notify.activity_id = @news.id
+        #     notify.activity_id = @news.id
-            notify.activity_type = 'News'
+        #     notify.activity_type = 'News'
-            notify.notify_to = teacher.user_id
+        #     notify.notify_to = teacher.user_id
-            notify.is_read = 0
+        #     notify.is_read = 0
-            notify.save()
+        #     notify.save()
-          end
+        #   end
-        end
+        # end
         # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
         render_attachment_warning_if_needed(@news)
         flash[:notice] = l(:notice_successful_create)

app/controllers/student_work_controller.rb

@@ -173,6 +173,16 @@ class StudentWorkController < ApplicationController
       end
 
       if student_work.save
+        course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
+        if course_activity
+          course_activity.updated_at = Time.now
+          course_activity.save
+        end
+        user_activity = UserActivity.where("act_type='HomeworkCommon' and act_id =#{@homework.id}").first
+        if user_activity
+          user_activity.updated_at = Time.now
+          user_activity.save
+        end
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)
@@ -261,6 +271,7 @@ class StudentWorkController < ApplicationController
       end
       @is_new = false
     else
+      @is_last_a = @work.student_works_scores.empty?
       @score = StudentWorksScore.new
       @score.score = params[:score] if params[:score]
       @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""

app/controllers/tags_controller.rb

@@ -244,10 +244,11 @@ class TagsController < ApplicationController
     @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即可
+      #看重命名后的tag是否存在。如果存在的话，只需要更改taggings里边的id,
       if @rename_tag
-        @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type)
+        @taggings = ActsAsTaggableOn::Tagging.where(" `taggings`.`tag_id` = #{ @tag_id} AND `taggings`.`taggable_type` = 'Attachment' ")#find_by_tag_id_and_taggable_type(@tag_id,@taggable_type)
-        @taggings.update_attributes({:tag_id=>@rename_tag.id})
+        @taggings.each { |t| t.update_attributes({:tag_id=> @rename_tag.id}) if t.tag_id != @rename_tag.id }
+        ActsAsTaggableOn::Tag.find(@tag_id).update_attributes(:name=>@rename_tag_name)#并且将该tag改名
       else #如果不存在，那么就直接更新该tag名称为新的名称
         (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).update_attributes(:name=>@rename_tag_name)
       end

app/controllers/users_controller.rb

@@ -346,6 +346,7 @@ class UsersController < ApplicationController
       user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
       @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
       @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
+      @is_in_course = params[:is_in_course].to_i || 0
       respond_to do |format|
         format.js
         format.html {render :layout => 'new_base_user'}
@@ -357,6 +358,7 @@ class UsersController < ApplicationController
 
   #导入作业
   def user_import_homeworks
+    @select_course = params[:select_course] ? 1 : 0
     @user_homeworks = HomeworkCommon.where(:user_id => @user.id).order("created_at desc")
     respond_to do |format|
       format.js
@@ -376,6 +378,7 @@ class UsersController < ApplicationController
     homework = HomeworkCommon.find_by_id params[:checkMenu]
     homework_detail_programing = homework.homework_detail_programing
     @homework = HomeworkCommon.new
+    @select_course = params[:select_course] || 0
     if homework
       @homework.name = homework.name
       @homework.description = homework.description
@@ -508,7 +511,13 @@ class UsersController < ApplicationController
         if homework.save
           homework_detail_manual.save if homework_detail_manual
           homework_detail_programing.save if homework_detail_programing
-          redirect_to user_homeworks_user_path(User.current.id)
+
+          if params[:is_in_course] == "1"
+            redirect_to homework_common_index_path(:course => homework.course_id)
+          else
+            redirect_to user_homeworks_user_path(User.current.id)
+          end
+
         end
       end
     else

app/controllers/words_controller.rb

@@ -53,7 +53,19 @@ class WordsController < ApplicationController
               :notes => content, 
               :is_readed => false}
     @jfm = add_reply_adapter options
-
+    @save_succ = true if @jfm.errors.empty?
+    if @save_succ
+      course_activity = CourseActivity.where("course_act_type='JournalsForMessage' and course_act_id =#{parent_id}").first
+      if course_activity
+        course_activity.updated_at = Time.now
+        course_activity.save
+      end
+      user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first
+      if user_activity
+        user_activity.updated_at = Time.now
+        user_activity.save
+      end
+    end
     respond_to do |format|
       # format.html {
       #   if @jfm.errors.empty?
@@ -63,10 +75,12 @@ class WordsController < ApplicationController
       #   end
       #   render 'test/index'
       # }
-      format.js{
+      format.js {
-        @save_succ = true if @jfm.errors.empty?
+        @user_activity_id = params[:user_activity_id] if
+        @activity = JournalsForMessage.find(parent_id)
       }
     end
+
   end
   
   def destroy

app/helpers/journals_helper.rb

@@ -119,7 +119,7 @@ module JournalsHelper
     content << textAreailizable(journal, :notes)
     css_classes = "wiki"
     css_classes << " editable" if editable
-    content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes ,:style => "width:510px")
+    content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes)
   end
 
   def link_to_in_place_notes_editor(text, field_id, url, options={})

app/models/course_message.rb

@@ -1,4 +1,7 @@
 class CourseMessage < ActiveRecord::Base
+  # status说明： status在课程不同的类型，区分不同的功能
+  # HomeworkCommon：status：
+  # nil：发布了作业； 1：作业截止时间到了提醒！；2:开启匿评； 3：关闭匿评； 4：匿评开始失败
   attr_accessible :course_id, :course_message_id, :course_message_type, :user_id, :viewed, :content, :status
 
   # 多态 虚拟关联

app/models/forge_message.rb

@@ -1,14 +1,7 @@
 class ForgeMessage < ActiveRecord::Base
-  # 公共表中活动类型,命名规则:TYPE_OF_{类名}_ACT
+  # status在不同的类中，作用不同
-  TYPE_OF_ISSUE_ACT = "Issue"
+  # Isseu： satus nil：发布了缺陷；：1：缺陷计划完成日志到了提醒
-  TYPE_OF_MESSAGE_ACT = "Message"
+  attr_accessible :forge_message_id, :forge_message_type, :project_id, :user_id, :viewed, :secret_key, :status
-  TYPE_OF_ATTACHMENT_ACT = "Attachment"
-  TYPE_OF_DOCUMENT_ACT = "Document"
-  TYPE_OF_JOURNAL_ACT = "Journal"
-  TYPE_OF_WIKI_ACT = "Wiki"
-  TYPE_OF_NEWS_ACT = "News"
-
-  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/homework_common.rb

@@ -40,9 +40,9 @@ class HomeworkCommon < ActiveRecord::Base
   def act_as_course_message
     if self.course
       self.course.members.each do |m|
-        if m.user_id != self.user_id
+        # if m.user_id != self.user_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
-        end
+        # end
       end
     end
   end

app/models/journals_for_message.rb

@@ -185,7 +185,7 @@ class JournalsForMessage < ActiveRecord::Base
 
   #课程动态公共表记录
   def act_as_course_activity
-    if self.jour_type == 'Course'
+    if self.jour_type == 'Course' && self.m_parent_id.nil?
       self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.jour_id)
     end
   end

app/models/mailer.rb

@@ -51,8 +51,8 @@ class Mailer < ActionMailer::Base
   def send_mail_anonymous_comment_open(homework_common)
     course = homework_common.course
     recipients ||= []
-    course.student.each do |student|
+    course.members.each do |member|
-      user = User.find(student.student_id)
+      user = User.find(member.user_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))
@@ -69,9 +69,9 @@ class Mailer < ActionMailer::Base
   def send_mail_anonymous_comment_close(homework_common)
     course = homework_common.course
     recipients ||= []
-    course.student.each do |student|
+    course.members.each do |member|
-      user = User.find(student.student_id)
+      user = User.find(member.user_id)
-      @subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_open)}"
+      @subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_close)}"
       @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
@@ -83,6 +83,27 @@ class Mailer < ActionMailer::Base
          :subject => @subject
   end
 
+  # 匿评失败给老师发送邮件通知
+  def send_mail_anonymous_comment_fail(homework_common)
+    course = homework_common.course
+    recipients ||= []
+    # 只给该课程的老师发送邮件提醒
+    course.members.each do |member|
+      if member.user.allowed_to?(:as_teacher,course)
+        user = User.find(member.user_id)
+        @subject = "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
+        @token = Token.get_token_from_user(user, 'autologin')
+        @anonymous_comment_fail_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+        @anonymous_comment_fail_name = homework_common.name
+        @author = homework_common.user
+        #收件人邮箱
+        recipients << user.mail
+      end
+    end
+    mail :to => recipients,
+         :subject => @subject
+  end
+
   # author: alan
   # 邀请未注册用户加入项目
   # 功能： 在加入项目的同时自动注册用户
@@ -247,6 +268,7 @@ class Mailer < ActionMailer::Base
 
     has_content = [@issues,@issues_journals,@course_messages,@project_messages,@course_news,@course_news_comments,@project_news,@project_news_comments,@project_attachments,
                    @course_journal_messages,@user_journal_messages,@project_journal_messages,@forums,@memos,@attachments,@bids,@wiki_contents].any? {|o| !o.empty?}
+
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
     mail :to => user.mail,:subject => subject if has_content
@@ -263,7 +285,7 @@ class Mailer < ActionMailer::Base
     #收件人邮箱
     recipient = user.mail
     mail :to => recipient,
-         :subject => "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+         :subject => @subject
   end
 
   # 公共讨论区发帖、回帖添加邮件发送信息

app/models/memo.rb

@@ -79,7 +79,7 @@ class Memo < ActiveRecord::Base
         receivers << self.forum.creator
       end
       # 添加发帖人
-      if  self.author_id != self.parent.author_id
+      if  self.author_id != self.parent.author_id &&  self.parent.author_id != self.forum.creator_id
         receivers << self.parent.author
       end
     end

app/models/message.rb

@@ -194,7 +194,7 @@ class Message < ActiveRecord::Base
 
   #课程动态公共表记录
   def act_as_course_activity
-    if self.course
+    if self.course && self.parent_id.nil?
       self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.board.course_id)
     end
   end

app/views/avatar/_new_avatar_form.html.erb

@@ -2,10 +2,10 @@
   <%= image_tag(url_to_avatar(source), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
 </a>
 <%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %>
-<a href="javascript:void(0)" class="upbtn fl"><%= l(:button_upload_photo) %></a>
+<a href="javascript:void(0)" class="upbtn fl" onclick="$('#upload_course_logo').click();"><%= l(:button_upload_photo) %></a>
 <%= file_field_tag 'avatar[image]',
-                   :id => nil,
+                   :id => 'upload_course_logo',
-                   :class => 'upload_file',
+                   :class => 'undis upload_file',
                    :size => "1",
                    :multiple => true,
                    :data => {

app/views/courses/_course_activity.html.erb

@@ -0,0 +1,127 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<style type="text/css">
+    /*回复框*/
+    div.ke-toolbar {
+        display: none;
+        width: 400px;
+        border: none;
+        background: none;
+        padding: 0px 0px;
+    }
+
+    span.ke-toolbar-icon {
+        line-height: 26px;
+        font-size: 14px;
+        padding-left: 26px;
+    }
+
+    span.ke-toolbar-icon-url {
+        background-image: url(/images/public_icon.png)
+    }
+
+    div.ke-toolbar .ke-outline {
+        padding: 0px 0px;
+        line-height: 26px;
+        font-size: 14px;
+    }
+
+    span.ke-icon-emoticons {
+        background-position: 0px -671px;
+        width: 50px;
+        height: 26px;
+    }
+
+    span.ke-icon-emoticons:hover {
+        background-position: -79px -671px;
+        width: 50px;
+        height: 26px;
+    }
+
+    div.ke-toolbar .ke-outline {
+        border: none;
+    }
+
+    .ke-inline-block {
+        display: none;
+    }
+
+    div.ke-container {
+        float: left;
+    }
+</style>
+<% course_activities.each do |activity| if course_activities %>
+        <script>
+            function expand_reply(container, btnid) {
+                var target = $(container);
+                var btn = $(btnid);
+                if (btn.data('init') == '0') {
+                    btn.data('init', 1);
+                    btn.html('收起回复(' + btn.data('count') + ')');
+                    target.show();
+                } else {
+                    btn.data('init', 0);
+                    btn.html('展开更多(' + btn.data('count') + ')');
+                    target.hide();
+                    target.eq(0).show();
+                    target.eq(1).show();
+                }
+            }
+
+            function expand_reply_input(id) {
+                $(id).toggle();
+            }
+
+            $(function () {
+                init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                var description_images=$("div#activity_description_<%= activity.id %>").find("img");
+                if (description_images.length>0) {
+                    for (var i=0; i<description_images.length; i++){
+                        var image=$(description_images[i]);
+                        var element=$("<a></a>").attr("href",image.attr('src'));
+                        image.wrap(element);
+                    }
+                }
+                $('#activity_description_<%= activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
+
+                var reply_images=$("div#reply_content_<%= activity.id %>").find("img");
+                if (reply_images.length>0) {
+                    for (var i=0; i<reply_images.length; i++){
+                        var image=$(reply_images[i]);
+                        var element=$("<a></a>").attr("href",image.attr('src'));
+                        image.wrap(element);
+                    }
+                }
+                $('#reply_content_<%= activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
+            });
+        </script>
+            <% if activity %>
+                <% act = activity.course_act %>
+                <% case activity.course_act_type.to_s %>
+                <% when 'HomeworkCommon' %>
+                    <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                <% when 'News' %>
+                    <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                <% when 'Message' %>
+                    <%= render :partial => 'users/course_message', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                <% when 'Poll' %>
+                    <%= render :partial => 'users/course_poll', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                <% when 'JournalsForMessage' %>
+                    <%= render :partial => 'users/course_journalsformessage', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                <% when 'Attachment' %>
+                    <%= render :partial => 'users/course_attachment', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                <% when 'Course' %>
+                    <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                <% end %>
+            <% end %>
+    <% end %>
+<% end %>
+
+<% if course_activities.count == 10 %>
+    <div id="show_more_course_activities" class="loadMore mt10 f_grey">展开更多<%= link_to "", course_activity_path(@course.id, :type => type, :page => page), :id => "more_course_activities_link", :remote => "true", :class => "none" %></div>
+<% end %>
+
+<script type="text/javascript">
+    $("#show_more_course_activities").mouseover(function () {
+        $("#more_course_activities_link").click();
+    });
+</script>

app/views/courses/show.html.erb

@@ -1,83 +1,31 @@
-<div class="project_r_h">
-  <h2 class="fl project_h2"><%= l(:label_activity)%></h2>
-</div>
-
-<%@course_activities.each do |activity|%>
-    <div class="problem_main" nhname="container">
-      <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 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>
-        <%#= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), link,
-                    :class => "problem_tit c_dblue fl fb",'data-type'=>e.event_type,
-                    'data-notify-id'=>(e.respond_to?('get_notify_id') ? e.get_notify_id : ''),:nhname=>"nh_act_link",
-                    'data-href'=>(course_activity_notifys_path(@course)+"/chang_read_flag?an_id="+(e.respond_to?('get_notify_id') ? e.get_notify_id : '').to_s)%>
-        <%#if @controller_name=='ActivityNotifys' && e.get_notify_is_read!=1%>
-            <!--span nhname="nh_act_flag" class="ml10 fl"><img src="/images/new.png" width="35" height="15"/></span-->
-        <%#end%>
-        <%= link_to course_activity_link activity%>
-        <div class="cl"></div>
-        <p class="mt5 break_word">
-          <%= course_activity_desc activity%>
-          <br />
-            <div class="cl"></div>
-            <%= activity.course_act_type == "Course" ? l(:label_create_time) : l(:label_activity_time)  %> ： <%= format_time(activity.created_at) %>
-        </p>
-        <%= link_to_attachments_course(activity.course_act) if activity.course_act_type.to_s == "News" %>
-      </div>
-      <div class="cl"></div>
-    </div><!--课程动态 end-->
-<% end%>
-
-<ul class="wlist">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-</ul>
-<div class="cl"></div>
-
 <script type="text/javascript">
-  $(function(){
+    $(function(){
-      function nh_new_notify_count_show(){
+        $("#RSide").removeAttr("id");
-          var new_notify_count = $("#new_notify_count").html();
+        $("#Container").css("width","1000px");
-          if(new_notify_count>0){
+    });
-              $("#new_notify_count").parent('span').show();
-          }else{
-              $("#new_notify_count").parent('span').hide();
-          }
-      }
-      $("div[nhname='container']").each(function(){
-          var container = $(this);
-          var btn = $("a[nhname='nh_act_link']",container);
-          if(btn.data('notify-id')>0){
-              btn.attr('target','_blank');
-              btn.click(function(){
-                  var flag = $("span[nhname='nh_act_flag']",container);
-                  if(flag!=undefined){
-                      var url = $(this).data('href');
-                      $.ajax({url:url,dataType:'text',success:function(data){
-                          if(data == 'true'){
-                              flag.remove();
-                              $("#new_notify_count").html($("#new_notify_count").html()-1);
-                              nh_new_notify_count_show();
-                          }
-                      }});
-                  }
-                  return true;
-              });
-          }
-      });
-      $("label[nhname='nh_act_link_all']").click(function(){
-          var url = $(this).data('href');
-          $.ajax({url:url,dataType:'text',success:function(data){
-              if(data == 'true'){
-                  $("span[nhname='nh_act_flag']").remove();
-                  $("#new_notify_count").html('0');
-                  nh_new_notify_count_show();
-              }
-          }});
-      });
-      nh_new_notify_count_show();
-  });
 </script>
+
+<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
+<div class="homepageRight mt0 ml10">
+<div class="homepageRightBanner">
+  <div class="NewsBannerName">课程动态</div>
+  <ul class="resourcesSelect">
+    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+      <ul class="homepagePostType">
+        <li>
+          <ul class="homepagePostTypeHomework fl">
+            <li><%= link_to "全部动态", {:controller => "courses", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%></li>
+            <li><%= link_to "作业动态", {:controller => "courses", :action => "show", :type => "homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%></li>
+            <li><%= link_to "通知动态", {:controller => "courses", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey"%></li>
+            <li><%= link_to "资源库动态", {:controller => "courses", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey"%></li>
+            <li><%= link_to "论坛动态", {:controller => "courses", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey"%></li>
+            <li><%= link_to "留言动态", {:controller => "courses", :action => "show", :type => "journalsForMessage"}, :class => "homepagePostTypeMessage postTypeGrey"%></li>
+            <li><%= link_to "问卷动态", {:controller => "courses", :action => "show", :type => "poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%></li>
+          </ul>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
+  <%= render :partial => 'courses/course_activity', :locals => {:course_activities => @course_activities,:page => 0,:type => @type} %>
+</div>

app/views/courses/show.js.erb

@@ -0,0 +1 @@
+$("#show_more_course_activities").replaceWith("<%= escape_javascript( render :partial =>  'courses/course_activity',:locals => {:course_activities => @course_activities, :page => @page,:type => @type} )%>");

app/views/courses/show_old.html.erb

@@ -0,0 +1,83 @@
+<div class="project_r_h">
+  <h2 class="fl project_h2"><%= l(:label_activity)%></h2>
+</div>
+
+<%@course_activities.each do |activity|%>
+    <div class="problem_main" nhname="container">
+      <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 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>
+        <%#= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), link,
+                    :class => "problem_tit c_dblue fl fb",'data-type'=>e.event_type,
+                    'data-notify-id'=>(e.respond_to?('get_notify_id') ? e.get_notify_id : ''),:nhname=>"nh_act_link",
+                    'data-href'=>(course_activity_notifys_path(@course)+"/chang_read_flag?an_id="+(e.respond_to?('get_notify_id') ? e.get_notify_id : '').to_s)%>
+        <%#if @controller_name=='ActivityNotifys' && e.get_notify_is_read!=1%>
+            <!--span nhname="nh_act_flag" class="ml10 fl"><img src="/images/new.png" width="35" height="15"/></span-->
+        <%#end%>
+        <%= link_to course_activity_link activity%>
+        <div class="cl"></div>
+        <p class="mt5 break_word">
+          <%= course_activity_desc activity%>
+          <br />
+            <div class="cl"></div>
+            <%= activity.course_act_type == "Course" ? l(:label_create_time) : l(:label_activity_time)  %> ： <%= format_time(activity.created_at) %>
+        </p>
+        <%= link_to_attachments_course(activity.course_act) if activity.course_act_type.to_s == "News" %>
+      </div>
+      <div class="cl"></div>
+    </div><!--课程动态 end-->
+<% end%>
+
+<ul class="wlist">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+</ul>
+<div class="cl"></div>
+
+<script type="text/javascript">
+  $(function(){
+      function nh_new_notify_count_show(){
+          var new_notify_count = $("#new_notify_count").html();
+          if(new_notify_count>0){
+              $("#new_notify_count").parent('span').show();
+          }else{
+              $("#new_notify_count").parent('span').hide();
+          }
+      }
+      $("div[nhname='container']").each(function(){
+          var container = $(this);
+          var btn = $("a[nhname='nh_act_link']",container);
+          if(btn.data('notify-id')>0){
+              btn.attr('target','_blank');
+              btn.click(function(){
+                  var flag = $("span[nhname='nh_act_flag']",container);
+                  if(flag!=undefined){
+                      var url = $(this).data('href');
+                      $.ajax({url:url,dataType:'text',success:function(data){
+                          if(data == 'true'){
+                              flag.remove();
+                              $("#new_notify_count").html($("#new_notify_count").html()-1);
+                              nh_new_notify_count_show();
+                          }
+                      }});
+                  }
+                  return true;
+              });
+          }
+      });
+      $("label[nhname='nh_act_link_all']").click(function(){
+          var url = $(this).data('href');
+          $.ajax({url:url,dataType:'text',success:function(data){
+              if(data == 'true'){
+                  $("span[nhname='nh_act_flag']").remove();
+                  $("#new_notify_count").html('0');
+                  nh_new_notify_count_show();
+              }
+          }});
+      });
+      nh_new_notify_count_show();
+  });
+</script>

app/views/files/_tag_yun.html.erb

@@ -1,9 +1,13 @@
 <% unless tag_list.nil?%>
     <% tag_list.each do |k,v|%>
         <% if tag_name && tag_name == k%>
-            <a href="javascript:void(0);" class="files_tag_select"><%= k%>×<%= v%></a>
+            <!-- 鼠标不能移动是因为 href="javascript:void(0);"导致的 -->
+            <span>    <a  class="files_tag_select" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% else%>
-        <span class="files_tag_icon">    <a  ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
+        <span class="files_tag_icon" >
+          <a  title="双击可编辑"
+              onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"
+              ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% end%>
     <% end%>
 <% end%>

app/views/files/index.html.erb

@@ -234,6 +234,8 @@
     //第二种是改变某个tag名称。其他所有的资源如果拥有这个tag。那么对应的tag名也要改掉。
     //目前这两种依据 的来源就是 是否 传了参数 id。如果有id。就指定了资源id，就是第一种情况。如果没有id。就是第二种情况
     function rename_tag(domEle,name,id,type){
+        isdb = true; //这是双击
+        //clearTimeout(clickFunction);
         if(domEle.children().get(0) != undefined ){ //已经是编辑框的情况下不要动
             return;
         }
@@ -250,8 +252,10 @@
     }
   //监听所有的单击事件
    $(document.body).click(function(e){
+       isdb = false; //这是单击
        node = document.elementFromPoint(e.clientX, e.clientY);
        if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+           isdb = true; //为了防止在编辑的时候又去单击其他tag去过滤。导致tag过滤不可用
            return;
        }
            if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
@@ -260,15 +264,15 @@
                    ele.parent().html(tagNameHtml);
 
                }else{ //否则就要更新tag名称了
-                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){
+//                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){  去掉询问
                           $.post(
                                     '<%= update_tag_name_path %>',
                                     {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
                           )
-                   }else{
+//                   }else{
-                       ele.parent().css("border","");
+//                       ele.parent().css("border","");
-                       ele.parent().html(tagNameHtml);
+//                       ele.parent().html(tagNameHtml);
-                   }
+//                   }
                }
            }
    });

app/views/forums/_forum_list.html.erb

@@ -2,15 +2,15 @@
 <% if forums.any? %>
 	<% forums.each do |forum| %>
           <div class="postRow">
-            <div class="postPortrait"><a href="javascript:void(0);" class="linkGrey2">
+            <div class="postPortrait">
               <%= link_to image_tag(url_to_avatar(forum.creator),:width=>75,:height => 75 ),user_path( forum.creator) %>
             </div>
             <div class="postWrap">
               <div class="postTitle">
-                <!--<a href="javascript:void(0);" class="f16 linkBlue">新手讨论吧</a>-->
+                <a href="<%=  forum_path(forum) %>" class="f16 linkBlue" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%=forum.name.gsub(/(\r\n)/,'<br/>').html_safe %></a>
-                <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %>
+                <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
-              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;"><%= textAreailizable forum.description%></div>
+              <div class="postDes"><%= textAreailizable forum.description%></div>
               <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
               <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
             </div>

app/views/forums/index.html.erb

@@ -135,7 +135,7 @@
      <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">
+       <div>
          <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');

app/views/forums/show.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag 'new_user' %>
+<%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor' %>
 <script>
     function add_class(id){
         if($("#"+id).hasClass("sortArrowActiveD")){
@@ -58,11 +58,15 @@
         if(!check_memo_name()){
             return;
         }
-        if($("textarea[name='memo[subject]']").val().trim() != "" && $("textarea[name='memo[content]']").val().trim() != "" ){
+        if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){
+            memo_content.sync();
             $("#new_memo").submit();
-        }else if($("textarea[name='memo[subject]']").val().trim() == "" && $("textarea[name='memo[content]']").val().trim() != "" ){
+        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){
+            $("#error").html("主题和内容不能为空").show();
+        }
+        else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
             $("#error").html("主题不能为空").show();
-        }else if($("textarea[name='memo[subject]']").val().trim() != "" && $("textarea[name='memo[content]']").val().trim() == ""){
+        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().val().trim() == ""){
             $("#error").html("内容不能为空").show();
         }
     }
@@ -72,7 +76,7 @@
             $("#error").html("主题 过长（最长为 50 个字符）").show();
             return false;
         }
-        if($("#memo_content").val().trim().length > 5000){
+        if(memo_content.html().trim().length > 5000){
             $("#error").html("内容 过长（最长为 5000 个字符）").show();
             return false;
         }
@@ -83,7 +87,7 @@
         $('#create_memo_div').slideToggle();
         $('#create_memo_btn').slideToggle();
         $('#memo_subject').val('');
-        $('#memo_content').val('')
+        memo_content.html('')
         $('#error').html('').hide();
     }
 </script>
@@ -99,11 +103,7 @@
       </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>
+      <%= kindeditor_tag 'memo[content]','',:height=>300,:editor_id=>'memo_content'%>
-      <script>
-          var textarea = document.getElementById('memo_content');
-          autoTextarea(textarea);
-      </script>
     </div>
     <div class="mt10">
       <!--<a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>-->

app/views/git_usage/ch_usage.html.erb

@@ -1,352 +0,0 @@
-
-<!-- added by baiyu -->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>无标题文档</title>
-
-<style type="text/css">
-body table tr th {
-	font-size: 24px;
-	color: #666;
-}
-body table tr td {
-	color: #333;
-}
-body table tr td {
-	color: #000;
-	font-size: 20px;
-	font-family: "Comic Sans MS", cursive;
-}
-body table tr td span {
-	color: #039;
-}
-body p {
-	font-size: 18px;
-	color: #009;
-}
-body table tr td p {
-	color: #333;
-}
-body table tr td span1 {
-	color: #09C;
-	font-weight: bold;
-}
-body table tr td span2 {
-	font-weight: bold;
-	color: #09C;
-}
-body table tr td p span3 {
-	color: #6C6;
-}
-body table tr td p span3 {
-	font-weight: bold;
-}
-body table tr td p span4 {
-	color: #F00;
-}
-body table tr td p span4 {
-	font-weight: bold;
-}
-body table tr td span5 {
-	color: #F00;
-}
-body table tr td span5 {
-	font-weight: bold;
-}
-body table tr td p span6 {
-	color: #33F;
-	font-weight: bold;
-}
-body table tr td span6 {
-	color: #33F;
-	font-weight: bold;
-	font-size: 24px;
-}
-</style>
-</head>
-
-<body><table width="896" border="0">
-  <tr>
-    <th width="890" align="center" valign="middle"> Git使用说明</th>
-  </tr>
-</table>
-
-<table width="892" border="0">
-  <tr>
-    <td width="886">我们将使用 <span>git</span> 这个分布式版本控制系统来提交代码，下面就来介绍一下代码的提交方法。</td>
-  </tr>
-</table>
-
-<table width="900" border="0">
-  <tr>
-    <td><p>&nbsp;</p>
-    <p><span6>Windows</span6></p></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><span1>1、安装</span1></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><p><span>Step1：</span></p>
-<p>到<a href="http://code.google.com/p/msysgit" >http://code.google.com/p/msysgit</a>下载<span>msysgit</span>, 我们使用的版本是Git-1.7.4-preview20110204.exe</p></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>安装时，选择Checkout as-is, commit as-is,这样Git 就不会修改换行风格了. 其他用缺省设置即可。</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><p><span>Step2：</span></p>
-    <p>到<a href="http://code.google.com/p/tortoisegit/" >http://code.google.com/p/tortoisegit/</a>下载<span>TortoiseGit</span>,我们使用的版本是Tortoisegit-1.6.5.0-32bit.msi</p></td>
-  </tr>
-  <tr>
-    <td>安装时, 选择TortoisePLink。</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>这两个软件安装完成后, 就可以开始使用了。</td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step3：</span></p>
-    <p>在目录中右键单击TortoiseGit 再选Create Branch…就可以创建分支了。</p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<table width="900" border="0">
-  <tr>
-    <td width="450"><span2>2、配置</span2></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><p >在桌面上点击鼠标右键，选择TortoiseGit的Settings进行设置</p></td>
-  </tr>
-  <tr>
-    <td align="left">Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到,<span5> 其中的name和email要和<%= Setting.host_name %>上的登陆名和邮箱保持一致</span5>
-    ，方便代码贡献统计    ）。 </td>
-  </tr>
-  <tr>
-    <td align="left"><p >接着可以定制上下文菜单：</p>
-    <p >我们在Context Menu里勾选的是 <span>Clone</span>、<span>Sync</span>和<span>Commit</span></p>
-    <p >在Set Extend Menu Item里勾选的是<span>Import Svn Ignore</span>、<span>Show Reflog</span>、<span>Browse References</span>、<span>Stash Apply</span>和<span>Submodule Sync</span></p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><span2>3、日常用法</span2></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step1:</span></p>
-    <p>创建版本库（两种途径）</p>
-    <p><span>（a）</span>在文件夹中按右键, 选择Git Create repository here 就可以创建库了，在出现的窗口中, 不勾选选项, 直接按OK。</p>
-    <p>完成上述操作后，可以看到工作区中出现了隐藏目录&nbsp;<span>.git</span>。这个隐藏的&nbsp;.git目录就是git版本库（repository）。 </p>
-    <p>&nbsp;</p>
-    <p><span>（b）</span>从远程服务器上克隆一个已存在的版本库到本地：在目录中单击右键，选择Git Clone... 然后在URL里填入要clone的文件的地址。</p></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step2:</span></p>
-    <p>添加文件和文件夹</p>
-    <p>在文件夹中按右键, 选Git Commit -&gt; &quot;<span>master</span>&quot;… ，接着填写Message, 勾选<span>Whole Project</span> 选项, 这样Commit 的时候可以将整个项目的信息全部Commit 上去, 可以实现不需要打Tag 就能Checkout 出每次Commit 的内容.</p>
-    <p>比如：</p>
-    <p>在工作区添加file1.txt，commit以后接着修改file1.txt，再创建一个文件夹dir1, 并且放置一个file2.txt 在dir1 目<br />
-    录中, 再次commit 时, 就可以将dir1 和file2.txt 一起加入了.</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step3:</span></p>
-    <p>创建分支</p>
-    <p>在目录中单击右键，选择TortoiseGit 里的<span>create Branch…</span>就可以创建分支了。</p>
-    <p>勾选<span>Switch to new branch</span>, 就可以跳转到建立好的分支上。</p>
-    <p>比如：</p>
-    <p>添加一个file3.txt 后, commit 修改。接着通<span>过Switch/Checkout…</span>.可以切换回master 分支。</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step4：</span></p>
-    <p>看分支情况及修改log</p>
-    <p>在目录中单击右键，选择TortoiseGit 里的<span>Show log</span>, 可以看分支情况和修改log。 勾选<span>All Branches </span>可以看到所有分支的情况.</p>
-    <p>在Message 列中,<span3> 绿色</span3>
-    的是<span3>分支</span3>,<span4> 红色</span4>
-    的是<span4>当前工作分支</span4>。</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step5:</span></p>
-    <p>比较版本差异</p>
-    <p>通过按Shift , 可以选中两个版本, 接着再按鼠标右键, 选中<span>Compare revisions</span>, 就可以比较两个revision 了。</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step6:</span></p>
-    <p>合并分支</p>
-    <p>首先切换到master 分支, 接着点击鼠标右键选择TortoiseGit 里的<span>Merge</span>，就可以实现将分支合并到主版本。</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step7:</span></p>
-    <p>其他操作</p>
-    <p><span>(a)</span> Stash</p>
-    <p>Git 提供了一个暂存修改的功能, 称为<span>Stash</span>。 在一些程序进行了修改, 但还不<br />
-      想commit 成revision 时, 就可以将这些修改Stash 起来, 等到后面需要时再将它<br />
-    们Pop 出来。</p>
-    <p><span>(b)</span> 忽略文件</p>
-    <p>一些编辑器在修改文件后会产生bak 文件, 一般不希望这些备份文件也加入<br />
-      库中, 可以选中一个.bak 文件, 然后选择<span>Add to ignore list</span> 中的<span>*.bak</span>, 这样bak 文<br />
-    件以后就不会被commit 了。</p></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p >&nbsp;</p>
-    <p >Tips： </p></td>
-  </tr>
-  <tr>
-    <td><p >在碰到不熟悉的命令时，可以通过&nbsp;<span>git&nbsp;help</span>命令查看git的用户手册，命令如下： </p></td>
-  </tr>
-</table>
-<table width="297" border="0">
-  <tr>
-    <td width="291" align="center"><p ><span>$git&nbsp;help&nbsp;&lt;command&gt;</span> </p></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<table width="901" border="0">
-  <tr>
-    <td width="895"><span6>Linux</span6></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><span1>1、安装</span1></td>
-  </tr>
-  <tr>
-    <td>如果你用的是Linux，你可以用你的本地包管理系统（native package management system)来安装。</td>
-  </tr>
-  <tr>
-    <td><p><span>$ yum install git-core </span> </p>
-    <p>在redhat等系统下用yum</p>
-    <p><span>$apt-get install git-core</span></p>
-    <p>在debian，ubuntu等系统下用apt-get</p></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><span1>2、配置</span1></td>
-  </tr>
-  <tr>
-    <td><p ><span>$git&nbsp;config&nbsp;--global&nbsp;user.name&nbsp;&#8220;your_name&#8221;</span></p>
-    <p><span>$git&nbsp;config&nbsp;--global&nbsp;user.email&nbsp;&#8220;your_email&#8221;&nbsp;</span> </p>
-    <p>Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到,
-      <span5> 其中的name和email要和<%= Setting.host_name %>上的登陆名和密码保持一致</span5>
-，方便代码贡献统计    ）。</p></td>
-    
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><span1>3、代码提交方法</span1></td>
-  </tr>
-  <tr>
-    <td><p>cd file1</p>
-    <p><span>$ git add file1</span></p>
-    <p><span>$ git init</span></p>
-    <p><span>$ git commit -a</span></p>
-    <p><span>$ git remote add [name] [版本库里给的URL（去掉http）]</span></p>
-    <p><span>$ git push [name] master</span></p>
-    <p>输入password后即可上传。</p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<table width="831" border="0">
-  <tr>
-    <td width="825" align="right">——Trustie团队</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-</body>
-</html>
-
-<!-- end -->

app/views/git_usage/en_usage.html.erb

@@ -1,346 +0,0 @@
-<!-- added by baiyu -->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>无标题文档</title>
-
-<style type="text/css">
-body table tr th {
-	font-size: 24px;
-	color: #666;
-	font-family: "Comic Sans MS", cursive;
-}
-body table tr td {
-	color: #333;
-}
-body table tr td {
-	color: #333;
-	font-size: 18px;
-	font-family: "Comic Sans MS", cursive;
-}
-body table tr td span {
-	color: #039;
-}
-body p {
-	font-size: 18px;
-	color: #009;
-}
-body table tr td p {
-	color: #333;
-	font-family: "Comic Sans MS", cursive;
-	font-weight: normal;
-}
-body table tr td table tr td span1 {
-	color: #09c;
-}
-body table tr td span1 {
-	color: #09c;
-	font-weight: bold;
-}
-span3 {
-	color: #6C6;
-}
-span4 {
-	color: #F00;
-}
-body table tr td p span5 {
-	color: #F00;
-}
-body table tr td p span5 {
-	font-weight: bold;
-}
-body table tr td table tr td span6 {
-	color: #33F;
-	font-weight: bold;
-	font-size: 24px;
-}
-body table tr td span6 {
-	color: #33F;
-	font-weight: bold;
-	font-size: 24px;
-}
-</style>
-</head>
-
-<body><table width="898" border="0">
-  <tr>
-    <th width="890" align="center" valign="middle"> Git User Guide</th>
-  </tr>
-</table>
-
-<table width="892" border="0">
-  <tr>
-    <td width="886">We will use <span>git</span>	which is a distributed version control and source code management system to submit our code, here is the submission method.</td>
-  </tr>
-</table>
-
-<table width="456" border="0">
-  <tr>
-    <td><table width="200" border="0">
-      <tr>
-        <td>&nbsp;</td>
-      </tr>
-    </table>
-      <table width="900" border="0">
-        <tr>
-          <td><span6>Windows</span6></td>
-        </tr>
-      </table>
-      <table width="900" border="0">
-        <tr>
-          <td><span1>1. Installation</span1></td>
-        </tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td width="450"><p ><span>Step1：</span> </p></td>
-  </tr>
-  <tr>
-    <td><p >Download <span>msysgit</span> from <a href="http://code.google.com/p/msysgit">http://code.google.com/p/msysgit</a>, the version we have used is </p>
-    <p >Git-1.7.4-preview20110204.exe.</p></td>
-  </tr>
-  <tr>
-    <td align="left"><p >Please tick &quot;<span>Checkout as-is</span>&quot; and &quot;<span>commit as-is</span>&quot; options during installation so git does not modify the line feed style. Other options you can use the default settings.</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step2:</span></p>
-    <p>Download <span>TortoiseGit</span> from <a href="http://code.google.com/p/tortoisegit/" >http://code.google.com/p/tortoisegit/</a>, the version we have used is </p>
-    <p>Tortoisegit-1.6.5.0-32bit.msi.</p>
-    <p>Please tick &quot;TortoisePLink&quot; option during installation.</p>
-    <p>You can start using Git when you complete the installation.</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step3:</span></p>
-    <p>You can create a branch with method that right-click the &quot;TortoiseGit&quot; in the directory and check the &quot;Create Branch… &quot; option.</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><span1>2. Configuration</span1></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p>Right-click on the desktop and select the &quot;Settings&quot; in the &quot;TortoiseGit&quot;</p>
-    <p>User name and email are used to set your own user name and contact information( user.name and user.email must be completed because these will be used when submitting the repository, <span5> the name and email must be the same with  login name and email you registed in the <%= Setting.host_name %></span5>
-    ). </p>
-    <p>Then you can customize the &quot;Context Menu&quot;:</p>
-    <p>Please check the &quot;<span>Clone</span>&quot;,&quot;<span>Sync</span>&quot; and &quot;<span>Commit</span>&quot; options in the &quot;<span>Context Menu</span>&quot;,</p>
-    <p>check the &quot;<span>Import Svn Ignore</span>&quot;, &quot;<span>Show Reflog</span>&quot;, &quot;<span>Browse References</span>&quot;, &quot;<span>Stash Apply</span>&quot; and &quot;<span>Submodule Sync</span>&quot; in the &quot;<span>Set Extend Menu Item</span>&quot;.</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><span1>3. Simple usage</span1></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step1:</span></p>
-    <p>Create a new repository by two ways, here we go </p>
-    <p><span>(a) </span>You can create a repository by right-click in the folder and select &quot;Git Create repository here&quot;. Uncheck any options in the new window, instead of it please click &quot;OK&quot;.</p>
-    <p>After completed these operation, you can see there is a hidden directory ( <span>.git </span>) in the workspace and this hidden directory is the git repository. </p>
-    <p><span>(b)</span> Clone a exist version from the remote server to local:  right-click in the folder and select &quot; Git Clone..&quot; and fill in the URL where you had clone from.</p></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step2:</span></p>
-    <p>Add the new file and folder</p>
-    <p> Right-click in the folder and select   Git Commit -&gt; &quot;<span>master</span>&quot;… ， then fill in the &quot;Message&quot; and check the &quot; <span> Whole Project </span> &quot; option so that the whole information of the project can commit.</p>
-    <p>For example:</p>
-    <p>Create a new file in the workspace named &quot;file1.txt&quot;, commit  it, and then creat a new folder in the workspace named &quot;dir1&quot;, after that create a new file again, but this file is in the folder dir1, named &quot;file2.txt&quot;. After that select &quot;Git Commit&quot;, then file1 and dir1 can be joined together.</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step3:</span></p>
-    <p> Create a new Branch </p>
-    <p>You can create a new branch by right-click in the folder and select     TortoiseGit   -&gt; &quot;<span>  create Branch…  </span>&quot;.</p>
-    <p>You will switch to the new branch when you check <span>&quot;Switch to new branch&quot; </span>option.</p>
-    <p>For example:</p>
-    <p>Create a new file in the workspace named &quot;file3.txt&quot;, commit  it. And you can switch to the &quot;master&quot; by select the &quot;Switch/Checkout...&quot;   in the &quot;TortoiseGit&quot;.</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step4:</span></p>
-    <p>View and modify the log</p>
-    <p>You can view the situation of the branch by right-click in the folder and select     TortoiseGit   -&gt; &quot;<span> Show log</span>&quot;. Even you can also modify the log in it. And you can view all the branch's situation by check the &quot;  <span>All Branches </span> &quot; option.</p>
-    <p>In the &quot;Message&quot; colume, <span3>branch</span3> is 
-      <span3>green</span3> 
-    and the <span4>current branch</span4> is <span4>red</span4>
-    .</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step5:</span></p>
-    <p>Compare the version</p>
-    <p>You can select two version in the same time by press &quot;shift&quot;, and you can compare the different between two version by right-click the &quot;  <span>Compare revisions</span>  &quot;.</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step6:</span></p>
-    <p>Merge the branch</p>
-    <p>First, you should switch to the &quot;master&quot;,  then righr-click on it and select   TortoiseGit -&gt;   &quot;<span>Merge</span>&quot;   so that the branch can merge into the main version.</p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p><span>Step7:</span></p>
-    <p>Other operations</p>
-    <p><span>(a)</span> Stash</p>
-    <p>Git provides a function named <span>Stash </span>to temporarily store the revised programs. When you revise some programs but still do not want to commit them, you can stash these revised programs and pop them if you need them then.</p>
-    <p><span>(b) </span>Ignore Files</p>
-    <p>The editor will generate some .bak files after editing. If you do not want to add these .bak files to the repository you can select the &quot;.bak&quot; file and check the &quot;<span>*.bak</span>&quot; in the &quot; <span>Add to ignore list</span>&quot;. Then the .bak files will not be commited.<br />
-    </p>
-    <p><br />
-    </p></td>
-  </tr>
-</table>
-<table width="200" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><p>Tips:</p>
-    <p>You can read the user manual by enter &quot;&nbsp;<span>git&nbsp;help</span> &quot; command when you are confused, command as follows: </p></td>
-  </tr>
-</table>
-<table width="307" border="0">
-  <tr>
-    <td width="301" align="center"><span> $git help &lt;command&gt; </span></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<table width="900" border="0">
-  <tr>
-    <td><span6>Linux</span6></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td><span1>1.Installation</span1></td>
-  </tr>
-  <tr>
-    <td><p>If you are useing Linux, you can install git through native package management system.</p>
-    <p><span>$ yum install git-core</span></p>
-    <p>if you are using redhat, you should type &quot;yum&quot;.</p>
-    <p><span>$apt-get install git-core</span></p>
-    <p>if you are using debian or ubuntu, you should type &quot;apt-get&quot;.</p></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><span1>2. Configuration</span1></td>
-  </tr>
-  <tr>
-    <td><p><span>$git config --global user.name &ldquo;your_name&rdquo;M</span></p>
-    <p><span>$git config --global user.email &ldquo;your_email&rdquo;</span> </p>
-    <p>User name and email are used to set your own user name and contact information( user.name and user.email must be completed because these will be used when submitting the repository,
-      <span5> the name and email must be the same with  login name and email you registed in the <%= Setting.host_name %></span5>
-). </p></td>
-  </tr>
-</table>
-<table width="900" border="0">
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><span1>3. How to commit</span1></td>
-  </tr>
-  <tr>
-    <td><p>cd file1</p>
-    <p><span>$ git add file1</span></p>
-    <p><span>$ git init</span></p>
-    <p><span>$ git commit -a</span></p>
-    <p><span>$ git remote add [name] [The URL which we give you in our website（with out http）]</span></p>
-    <p><span>$ git push [name] master</span></p>
-    <p>The last step is enter your password. </p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<table width="831" border="0">
-  <tr>
-    <td width="825" align="right">—— By Trustie Team</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-
-
-<!-- end -->

app/views/homework_common/index.html.erb

@@ -1,129 +1,55 @@
-<div class="project_r_h">
+<script type="text/javascript">
-  <h2 class="project_h2">
+    function reset_homework(){
-    <%= l(:label_homework)%>
+        $("#homework_name").val("");
-  </h2>
+        $("#homework_end_time").val("");
-</div>
+        $("#course_id").val($("#option_select").val());
-<div class="talk_top">
+        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
-  <p class="fl">
+        homework_description_editor.html("");
-    <%= l(:label_totle)%>
+        $("#homework_editor").toggle();
-    <span><%= @obj_count%></span>
+    }
-    <%= l(:label_homework_count)%>
-  </p>
-  <%#= link_to( l(:label_course_homework_new), new_homework_common_path(:course => @course.id), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
-  <div class="cl"></div>
-</div>
-<% @homeworks.each do |homework|%>
-    <div class="problem_main">
-      <%= link_to(image_tag(url_to_avatar(homework.user), :width => "42", :height => "42"), user_path(homework.user), :class => "problem_pic fl") %>
-      <div class="problem_txt fl mt5">
-        <%= link_to(homework.user.lastname+homework.user.firstname, user_path(homework.user),:class => 'problem_name fl',:target => "_blank") %>
-        <span class="fl"> <%= l(:label_user_create_project_homework) %>：</span>
-        <%= link_to(homework.name, student_work_index_path(:homework => homework.id), :class => 'problem_tit fl fb c_dblue',:target => "_blank") %>
-        <div class="cl mb5"></div>
-        <p class="fl ">
-          <%= l(:lebel_homework_commit)%>
-          ( <%= 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)%>
-        <% elsif @is_student%>
-            <%= student_anonymous_comment homework %>
-            <%= student_new_homework homework %>
-        <% end %>
-        <div class="cl"></div>
-        <script>
-            $(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 list_style">
-            <%= homework.description.html_safe %>
-          </div>
-        </div>
-        <div class="cl"></div>
 
-        <div class="news_foot currentDd fr" id="bid_show_more_des_button<%= homework.id%>" onclick="bid_show_more_des(<%= homework.id%>);" style="cursor:pointer;display: none;">
+    $(function(){
-          [展开]
+        $("#RSide").removeAttr("id");
-        </div>
+        $("#Container").css("width","1000px");
-        <div class="cl"></div>
+    });
 
-        <% if homework.homework_type == 2 && homework.homework_detail_programing%>
+    <% if @is_new%>
-            <% if @is_teacher%>
+        $(function(){
-                <table class="border_ce" cellpadding="0" cellspacing="0">
+            $("#homework_name").focus();
-                  <tbody>
+        });
-                  <tr class="<%= cycle("", "b_grey") %>">
+    <%end%>
-                    <td  class="td_tit">
+</script>
-                      输入
+<style>
-                    </td>
+    /*日历选择图*/
-                    <td  class="td_tit">
+    img.ui-datepicker-trigger {display:block;background:url(../images/public_icon.png) -31px 0 no-repeat;cursor: pointer;vertical-align: middle;width:16px;height:15px;float:left;margin: 7px;}
-                      输出
+    .description{display: none !important;}
-                    </td>
+    .ispublic-label{display: none !important;}
-                  </tr>
+    .is_public_checkbox{display: none !important;}
-                  <% homework.homework_tests.each do |test|%>
+    .is_public{display: none !important;}
-                      <tr class="<%= cycle("", "b_grey") %>">
+    .link_file{ background:url(../images/pic_file.png) 0 5px no-repeat !important;}
-                        <td  class="td_tit">
+    #attachments_fields input.filename{ background:url(../images/pic_file.png) 0 5px no-repeat !important;padding-left:20px !important; color:#64bdd9 !important;}
-                          <%=test.input%>
+    .link_file_a{background:url(../images/pic_file.png) 0 5px no-repeat !important;padding-left:20px !important; color:#64bdd9 !important;}
-                        </td>
+</style>
-                        <td  class="td_tit">
-                          <%= test.output%>
-                        </td>
-                      </tr>
-                  <% end%>
-                  </tbody>
-                </table>
-                <div class="cl"></div>
-            <% end%>
 
-            <div class="mt5">
+<div class="homepageRight mt0 ml10">
-              <span class="tit_fb"  style="width: auto;"> 开发语言：</span>
+  <div class="homepageRightBanner mb10">
-              <div class="fl">
+    <div class="NewsBannerName">作业</div>
-                <%= homework.language_name%>
+  </div>
-              </div>
+  <div class="cl"></div>
-            </div>
-            <div class="cl"></div>
-        <% end%>
 
-        <% unless homework.attachments.empty?%>
+  <% if @is_teacher%>
-            <div class="mt5">
+      <!-- 老师身份才可以发布作业 -->
-              <span class="tit_fb"  style="width: auto;"> 附件：</span>
+      <div class="HomeWork mb10">
-              <div class="fl mb5">
+        <%= labelled_form_for @new_homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
-                <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework.attachments} %>
+            <div id="HomeWorkCon">
-              </div>
+              <%= render :partial => 'users/user_homework_form', :locals => { :homework => @new_homework,:f => f,:edit_mode => false,:select_course => false } %>
+              <input type="hidden" name="is_in_course" value="1"/>
             </div>
-            <div class="cl"></div>
         <% end%>
+      </div><!----HomeWork end-->
+  <% end%>
 
-        <!--div class="mt5">
+  <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0,:is_in_course => 1,:course_id => @course.id} %>
-          <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>
+</div>
-          <div class="fl mb5 c_red">
+<div class="cl"></div>
-            <%# if homework.homework_type == 1%>
-                <%#= scoring_rules homework.late_penalty,homework.id,@is_teacher,homework.homework_detail_manual.absence_penalty%>
-            <%# else%>
-                <%#= scoring_rules homework.late_penalty,homework.id,@is_teacher%>
-            <%# end%>
-          </div>
-        </div>
-        <div class="cl"></div-->
-
-        <span class="fl"><%= l(:label_end_time)%>：<%= homework.end_time%></span>
-        <% if betweentime(homework.end_time) < 0 %>
-            <span class='fr mr10 c_red '>
-              <%= l(:label_commit_limit)%>
-            </span>
-        <% else %>
-            <script type="text/javascript">
-                window.setInterval(function(){show_bid_dead_line(<%= homework.end_time.year%>,<%= homework.end_time.month%>,<%= homework.end_time.day + 1%>,"bid_deadline_<%= homework.id%>");},1000)
-            </script>
-            <div id="bid_deadline_<%= homework.id%>">
-            </div>
-        <% end %>
-      </div>
-      <div class="cl"></div>
-    </div>
-<% end%>
 
-<ul class="wlist">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-</ul>
-<div class="cl"></div>

app/views/homework_common/index.js.erb

@@ -0,0 +1 @@
+$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>");

app/views/issues/show.html.erb

@@ -28,7 +28,7 @@
     <a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>
     <div class="cl"></div>
     <% if @issue.description? || @issue.attachments.any? -%>
-        <div class="talk_info mb10" style="word-break:break-all;">
+        <div class="talk_info mb10 issue_desc" 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 %>

app/views/layouts/_logined_header.html.erb

@@ -94,11 +94,13 @@
       </li>
     </ul>
   </div>
+
   <div class="navHomepageNews">
     <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon" %>
     <% if User.current.count_new_message >0 %>
-        <div ><%= link_to "" , user_message_path(User.current), :class => "newsActive" %></div>
+        <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive" %></div>
     <% end %>
+      <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
   </div>
 </div>
 

app/views/layouts/base.html.erb

@@ -19,7 +19,7 @@
 <%= yield :header_tags -%>
   <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
-<body class="<%=h body_css_classes %>">
+<body class="<%=h body_css_classes %>" onload="prettyPrint();">
 
 <div class="cl"></div>
 <div class="navContainer mb10">

app/views/layouts/base_courses.html.erb

@@ -17,13 +17,13 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2','prettify', 'courses','header'%>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','public', 'leftside','prettify', 'courses','header'%>
   <%= javascript_include_tag "course","header","attachments",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
-<body>
+<body onload="prettyPrint();">
 <div class="navContainer mb10">
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>
@@ -93,7 +93,7 @@
         <div class="subNav">
           <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
           <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
-          <%= link_to( "+#{l(:label_course_homework_new)}", "javascript:void(0)", :class => 'subnav_green c_white', :onclick => "new_homework_alert();") if is_teacher %>
+          <%= link_to( "+#{l(:label_course_homework_new)}", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'subnav_green c_white') if is_teacher %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>

app/views/layouts/base_forums.html.erb

@@ -21,7 +21,7 @@
         function edit_desc(){
             if(<%=@forum.creator.id == User.current.id%>) {
                 desc = $("#forum_desc_span").html();
-                $("#forum_desc_span").html("<textarea id='forum_desc_input' onblur='change_forum_desc();' class='homepageSignatureTextarea'>" + desc + "</textarea>");
+                $("#forum_desc_span").html("<textarea id='forum_desc_input' onblur='change_forum_desc();'  style='width: 200px;height: 80px; max-width: 207px; max-height: 80px; border: 1px solid #d9d9d9;outline: none;margin: 0px 0px 12px 0px;'>" + desc + "</textarea>");
                 $("#forum_desc_input").focus();
             }
         }
@@ -123,17 +123,17 @@
             }
         });
 
-        function del_confirm(){
+        function del_forum_confirm(){
             if(confirm('您确定要删除么?')){
                 $("#del_link").click();
             }
         }
     </script>
 	</head>
-	<body class="<%= h body_css_classes %>">
+	<body class="<%= h body_css_classes %>" onload="prettyPrint();">
 
     <div class="cl"></div>
-    <div class="navContainer mb10">
+    <div class="navContainer">
       <% if User.current.logged? %>
           <%= render :partial => 'layouts/logined_header' %>
       <% else%>
@@ -143,21 +143,23 @@
     <div class="cl"></div>
     <div class="homepageContentContainer">
       <div class="homepageContent">
+        <div class="postRouteContainer mb10">
+          »&nbsp;<a href="<%= forums_path%>" class="postRouteLink">贴吧</a>&nbsp;»&nbsp;<a href="<%= forum_path(@forum)%>" title="<%=@forum.name %>" class="postRouteLink"><%= truncate(@forum.name,:lenght=>32)%></a>&nbsp;<%if @memo %> »&nbsp;<font class="fontGrey2"><%= @memo.subject%></font><% end %>
+        </div>
         <div class="homepageLeft">
           <div class="postDetailContainer">
             <div class="fl mr10 pr"> <%= link_to image_tag(url_to_avatar(@forum.creator),:width=>75,:height => 75,:alt=>'贴吧图像' ),user_path( @forum.creator) %>
               <!--<div class="homepageEditProfile"><a href="javascript:void(0);" class="homepageEditProfileIcon"></a></div>-->
             </div>
             <div class="fl">
-              <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;"><%= @forum.name%></div>
+              <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;"><%= @forum.name%></div>
               <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= @forum.creator.name%></a></div>
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
             </div>
             <div class="cl"></div>
-            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description%></span>
+            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description.html_safe%></span>
               <%if @forum.creator.id == User.current.id%>
                   <a href="javascript:void(0);" onclick="edit_desc();">
-                  <!--<img src="<%#= Rails.root%>/images/signature_edit.png" width="12" height="12" />-->
                   <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
                   </a>
                <%end%>
@@ -178,7 +180,7 @@
              <span class="postEdit">
             </span>
             <a href="<%= edit_forum_path(@forum) %>" class="linkGrey3">编辑贴吧</a>
-            <a href="javascript:void(0);" data-method="delete" onclick="del_confirm();" class="fr linkGrey3">删除贴吧</a>
+            <a href="javascript:void(0);" data-method="delete" onclick="del_forum_confirm();" class="fr linkGrey3">删除贴吧</a>
                 <a href="<%= forum_path(@forum)%>" data-method="delete" id="del_link" type="hidden"></a>
             <span class="postDelete"></span>
              <% end %>

app/views/layouts/base_projects.html.erb

@@ -21,7 +21,7 @@
 
 </head>
 <!--add by huang-->
-<body onload=" ">
+<body onload="prettyPrint();">
 <div class="navContainer mb10">
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>

app/views/layouts/base_users_new.html.erb

@@ -14,7 +14,7 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new',prettify,'users', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','prettify','users', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= javascript_include_tag "avatars",'prettify'%>
@@ -25,7 +25,7 @@
 
 
 </head>
-<body>
+<body onload="prettyPrint();">
 <div id="Container">
   <%= render :partial => 'layouts/base_header_new'%>
   <div id="TopBar">

app/views/layouts/new_base.html.erb

@@ -19,7 +19,7 @@
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
-<body>
+<body onload="prettyPrint();">
 
 <div class="navContainer mb10">
   <% if User.current.logged? %>

app/views/layouts/new_base_user.html.erb

@@ -16,7 +16,7 @@
   <%= yield :header_tags -%>
 </head>
 
-<body>
+<body onload="prettyPrint();">
 <div class="navContainer">
   <% is_current_user = User.current.logged? && User.current == @user%>
   <% if User.current.logged? %>
@@ -25,7 +25,7 @@
       <%= render :partial => 'layouts/unlogin_header' %>
   <% end%>
 </div>
-
+<div class="cl"></div>
 <div class="homepageContentContainer">
   <!--div class="homepageRightBannerImg"></div-->
   <div class="cl"></div>

app/views/layouts/users_base.html.erb

@@ -18,7 +18,7 @@
   <%= yield :header_tags -%>
   <%= stylesheet_link_tag 'base','header','new_user' ,:media => 'all'%>
 </head>
-<body>
+<body onload="prettyPrint();">
 <div class="cl"></div>
 <div class="navContainer mb10">
   <% if User.current.logged? %>

app/views/mailer/send_for_user_activities.html.erb

@@ -7,7 +7,7 @@
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#474646; "><%= l(:label_course_overview)%></h3>
       <!-- 课程通知 -->
-      <% unless @course_news.first.nil? || @course_news_comments.first.nil? %>
+      <% if !@course_news.first.nil? || !@course_news_comments.first.nil? %>
           <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_course_news) %>
@@ -190,7 +190,7 @@
          @project_attachments.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#474646; "><%= l(:label_project_overview_new)%></h3>
-      <% unless @issues.first.nil? || @issues_journals.first.nil? %>
+      <% if !@issues.first.nil? || !@issues_journals.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_issue_tracking) %>
@@ -302,7 +302,7 @@
       <% end %>
 
       <!--项目新闻-->
-      <% unless @project_news.first.nil? || @project_news_comments.first.nil? %>
+      <% if !@project_news.first.nil? || !@project_news_comments.first.nil? %>
           <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_project_news) %>

app/views/mailer/send_mail_anonymous_comment_close.text.erb

@@ -0,0 +1,3 @@
+<%= l(:mail_issue_content)%>
+<%=link_to @author, user_url(@author) %>
+<%=link_to @anonymous_comment_close_name, @anonymous_comment_close_url%>

app/views/mailer/send_mail_anonymous_comment_fail.html.erb

@@ -0,0 +1,10 @@
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+          <p><%=link_to @author, user_url(@author) %> 发布的作业：<%=link_to @anonymous_comment_fail_name, @anonymous_comment_fail_url%> <span style="color: red; padding-left: 10px;">匿评开启失败！</span></p>
+        </span>
+    </li>
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>

app/views/memos/_attachments_links.html.erb

@@ -1,4 +1,4 @@
-<div class="mt10 fl" >
+<div class="mt10 fl" style="width: 600px">
   <% for attachment in attachments %>
       <!--<p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">-->
           <!--<div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">-->
@@ -20,43 +20,13 @@
             <div class="cl"></div>
         <% else %>
             <span class="pic_files fl "></span>
-          <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 32 -%>
+          <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 45 -%>
           <a  href="javascript:void(0);" class="fl FilesName02"> (<%= number_to_human_size attachment.filesize , :precision => 0 %>)</a>
           <% if options[:deletable] %>
-              <%#= link_to image_tag('delete.png'), attachment_path(attachment),
-                          :data => {:confirm => l(:text_are_you_sure)},
-                          :method => :delete,
-                          :class => 'delete',
-                          #:remote => true,
-                          #:id => "attachments_" + attachment.id.to_s,
-                          :title => l(:button_delete) %>
               <a href="<%=attachment_path(attachment) %>" onclick="confirm(<%=l(:text_are_you_sure) %>)" data-method="delete">  <span class="pic_del fl "></span> </a>
           <% end %>
             <div class="cl"></div>
         <% end %>
-
-      <%# if attachment.is_text? %>
-          <%#= link_to image_tag('magnifier.png'),
-                      :controller => 'attachments',
-                      :action => 'show',
-                      :id => attachment,
-                      :filename => attachment.filename%>
-      <%# end %>
-      <!--<span title="<%#= attachment.description%>">-->
-    <!--<%#= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>-->
-  <!--</span>-->
-
-      <!--<%# if options[:wrap] %>-->
-          <!--<br/>-->
-          <!--&nbsp;-->
-      <!--<%# end %>-->
-      <!--<%# if options[:author] %>-->
-    <!--<span class="author" title="<%#= attachment.author%>">-->
-      <%#= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>
-      <!--<%#= format_time(attachment.created_on) %>-->
-    <!--</span>-->
-      <!--<%# end %>-->
-      <!--</p>-->
   <% end %>
   <% if defined?(thumbnails) && thumbnails %>
       <% images = attachments.select(&:thumbnailable?) %>

app/views/memos/_praise_tread.html.erb

@@ -2,18 +2,18 @@
    <% if User.current.logged? %>
     <% if horizontal %>
         <!-- 横排 -->
-        <div id="praise_tread_<%= obj.id %>" style="float:right;">
+        <div id="praise_tread_<%= obj.id %>" style="float:right; " >
           <% @is_valuate = is_praise_or_tread(obj,user_id)%>
           <% if @is_valuate.size > 0 %> <!-- 评价过   1代表赞 0代表踩 -->
               <% @flag = @is_valuate.first.praise_or_tread %>
               <% if  @flag == 1 %> <!-- 顶过  --><!-- modified by bai -->
-                  <a href="javascript:void(0);" class="linkGrey2 postLikeIcon" title="<%= l(:label_issue_praise_over)%>" >   <%= get_praise_num(obj)%></a>
+                  <a href="javascript:void(0);" class="<%= obj.author.id == User.current.id ? 'linkGrey2 postLikeIcon mr30':'linkGrey2 postLikeIcon' %>" title="<%= l(:label_issue_praise_over)%>" >   <%= get_praise_num(obj)%></a>
               <% end %>
           <% else %>
               <% if user_id == obj.author_id %>
 
                         <!--<%#= image_tag "/images/praise_tread/praise_true.png" , weight:"22px", height:"22px",:title => l(:label_issue_not_praise_over) %>-->
-                        <a href="javascript:void(0);" class="linkGrey2 postLikeIcon" title="<%= l(:label_issue_not_praise_over)%>" >   <%= get_praise_num(obj)%></a>
+                        <a href="javascript:void(0);" class="linkGrey2 postLikeIcon mr30" title="<%= l(:label_issue_not_praise_over)%>" >   <%= get_praise_num(obj)%></a>
 
               <% else %>
                   <!-- 积分少于2分不能踩帖 -->

app/views/memos/edit.html.erb

@@ -1,21 +1,24 @@
-<%= javascript_include_tag 'new_user'%>
+<%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor'%>
 <script>
 
   function check_and_submit(){
-      if($("textarea[name='memo[subject]']").val().trim() != "" && $("textarea[name='memo[content]']").val().trim() != "" ){
+      if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){
           if($("textarea[name='memo[subject]']").val().trim().length > 50 ){
               $("#error").html('主题不能超过50个字符').show();
               return;
           }
-          if($("textarea[name='memo[content]']").val().trim().length > 5000 ){
+          if(memo_content.html().trim().length > 5000 ){
               $("#error").html('内容不能超过5000个字符').show();
               return;
           }
+          memo_content.sync();
           $("#edit_memo").submit();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && $("textarea[name='memo[content]']").val().trim() != "" ){
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
           $("#error").html("主题不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() != "" && $("textarea[name='memo[content]']").val().trim() == ""){
+      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() == ""){
           $("#error").html("内容不能为空").show();
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){
+          $("#error").html("主题和内容不能为空").show();
       }
   }
 </script>
@@ -35,11 +38,7 @@
     </script>
   </div>
   <div class="mt15">
-    <textarea type="text" id="memo_content" name="memo[content]" maxlength="5000" class="postDetailInput" placeholder="对应帖子内容" ><%= @memo.content.html_safe%></textarea>
+    <%= kindeditor_tag 'memo[content]',@memo.content,:height=>300,:editor_id=>'memo_content'%>
-    <script>
-        var ta1 = document.getElementById('memo_content')
-        autoTextarea(ta1)
-    </script>
   </div>
   <div class="mt10">
     <!--<a href="javascript:void(0);" class="AnnexBtn fl mt3">对应附件名称</a>-->

app/views/memos/show.html.erb

@@ -30,6 +30,14 @@
     $(function() {
         init_activity_KindEditor_data(<%= @memo.id%>,null,"87%");
     });
+
+    function del_confirm(){
+        if(confirm('确认删除么?')){
+            $("#del_memo_link").click();
+        }else{
+
+        }
+    }
 </script>
 <div class="postRightContainer">
   <div class="postThemeContainer">
@@ -43,24 +51,28 @@
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">
               <li><a href="<%= edit_forum_memo_path(@memo.forum,@memo)%>" class="postOptionLink">编辑</a></li>
-              <li><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" class="postOptionLink">删除</a></li>
+              <li><a href="javascript:void(0);"  class="postOptionLink" onclick="del_confirm();">删除</a></li>
+              <li style="display: none"><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" id="del_memo_link" ></a></li>
             </ul>
           </li>
         </ul>
       </div>
       <%end%>
-      <div class="postDetailTitle"><a href="javascript:void(0);" class="f14 linkGrey4 fb">主题: <%= @memo.subject%></a></div>
+      <div class="postDetailTitle fl">
-      <div class="postDetailCreater"><a href="javascript:void(0);" class="linkBlue2" target="_blank"><%= @memo.author.name%></a></div>
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">主题: <%= @memo.subject%></a>
+      </div>
+      <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
+      <div class="cl"></div>
+
+      <div class="postDetailCreater">
+        <%= link_to @memo.author.name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
-       <span id="praise_tread" style="float: right">
-    <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-  </span>
       <div class="cl"></div>
-      <div class="memo-content" >
+      <div class="memo-content" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class="mt10 fl">
+      <div class=" fl" style="width: 600px">
         <% if @memo.attachments.any?%>
             <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
             <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>

app/views/projects/destroy.html.erb

@@ -1,17 +1,19 @@
-<h3><%=l(:label_confirmation)%></h3>
+<div class="project_r_h">
+  <h2 class="project_h2"><%=l(:label_confirmation)%></h2>
+</div>
 <div class="warning">
-<p><strong><%=h @project_to_destroy %></strong><br />
+  <p><strong><h3><%=h @project_to_destroy %></h3></strong>
-<%=l(:text_project_destroy_confirmation)%>
+    <%=l(:text_project_destroy_confirmation)%>
 
-<% if @project_to_destroy.descendants.any? %>
+    <% if @project_to_destroy.descendants.any? %>
-<br /><%= l(:text_subprojects_destroy_warning,
+        <br /><%= l(:text_subprojects_destroy_warning,
-          content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))).html_safe %>
+                    content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))).html_safe %>
-<% end %>
+    <% end %>
-</p>
+  </p>
-<p>
+  <p>
     <%= form_tag(project_path(@project_to_destroy), :method => :delete) do %>
-    <label><%= check_box_tag 'confirm', 1 %> <%= l(:general_text_Yes) %></label>
+        <label><%= check_box_tag 'confirm', 1, checked = true %> <%= l(:general_text_Yes) %></label>
-    <%= submit_tag l(:button_delete) %>
+        <%= submit_tag l(:button_delete) %>
     <% end %>
-</p>
+  </p>
 </div>

app/views/repositories/show.html.erb

@@ -29,79 +29,6 @@
     </p>
   </div>
 </div>
-<div class="repos_more"><a href="#" id="showgithelp" value="show_help" onclick ="showhelpAndScrollTo('repos_git_more'); " class="c_dblue lh23">展开Git操作指南</a></div>
-<div id="repos_git_more">
-  <br>
-  <div class=" c_dark f14">
-    <p color="red">git 克隆和提交的用户名和密码为登录用户名和密码 </p>
-    <p>项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码。</p>
-    <p>通过cmd命令提示符进入代码对应文件夹的根目录，
-      如果是首次提交代码，执行如下命令：</p>
-  </div>
-  <div class="repos_explain">
-    <p>git init</p>
-
-    <p>git add *</p>
-
-    <p>git commit -m "first commit"</p>
-
-    <p>git remote add origin
-    <%= @repos_url %>
-    </p>
-
-    <p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
-
-    <p>git push -u origin master</p>
-  </div>
-  <!--repos_explain end-->
-  <div class="c_dark f14">
-    <p>已经有本地库，还没有配置远程地址，打开命令行执行如下：</p>
-  </div>
-  <div class="repos_explain">
-    <p>git remote add origin <%= @repos_url %></p>
-
-    <p>git add .</p>
-
-    <p>git commit -m "first commit"</p>
-
-    <p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
-
-    <p>git push -u origin master</p>
-  </div>
-  <!--repos_explain end-->
-  <div class="c_dark f14">
-    <p>已有远程地址，创建一个远程分支，并切换到该分支，打开命令行执行如下：</p>
-  </div>
-  <div class="repos_explain">
-    <p>git clone <%= @repos_url %></p>
-
-    <p>git push</p>
-
-    <p>git checkout -b branch_name</p>
-
-    <p>git push origin branch_name</p>
-  </div>
-  <!--repos_explain end-->
-  <div class="c_dark f14">
-    <p>从网上获取别人的开源版本库，转交到trustie网站上，打开命令行执行如下：</p>
-  </div>
-  <div class="repos_explain">
-    <p>git remote add trustie
-    <%= @repos_url %>
-    </p>
-
-    <p>git add .</p>
-
-    <p>git commit -m "first commit"</p>
-
-    <p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
-
-    <p>git push -u trustie branch:branch</p>
-
-    <p><a href="/users/646" class="c_orange">李海</a>提供</p>
-  </div>
-</div>
-<!-- 代码库显示 -->
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
     <%= render :partial => 'dir_list' %>
 <% end %>
@@ -149,10 +76,7 @@
 <% end %>
 
 <!-- added by bai -->
-<p class="fb  c_dark mt10">查看如何提交代码：
+<p class="fb mt10"><a href="http://<%=Setting.host_name %>/forums/1/memos/1232" class=" c_blue ">点击查看如何提交代码</a></p>
-  <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "c_blue") %>
-  <%= link_to('English', en_usage_path, :class => "c_blue") %>
-
 <div class="cl"></div>
 
 <% content_for :header_tags do %>

app/views/student_work/_evaluation_un_work.html.erb

@@ -26,9 +26,11 @@
     </ul>
   </li>
   <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+    <% if student_work.created_at && @homework.end_time%>
-    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+        <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-        <span class="c_red">[迟交]</span>
+        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+            <span class="c_red">[迟交]</span>
+        <% end %>
     <% end %>
   </li>
   <li class="hworkList50 <%= score_color student_work.teacher_score%>">

app/views/student_work/add_score.js.erb

@@ -2,8 +2,7 @@ $("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :parti
 $('#score_<%= @work.id%>').peSlider({range: 'min'});
 
 <% if @is_new%>
-    $("#score_list_<%= @work.id%>").find("div:last").find("ul").addClass("ping_line");
+    $("#score_list_<%= @work.id%>").prepend("<div id='work_score_<%= @score.id%>'><%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score,:is_last => @is_last_a}) %></div>");
-    $("#score_list_<%= @work.id%>").prepend("<div id='work_score_<%= @score.id%>'><%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score,:is_last => true}) %></div>");
 <% else %>
     $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score,:is_last => @is_last}) %>");
 <% end%>

app/views/tags/_tag_list.html.erb

@@ -2,8 +2,8 @@
 
 <% if @tags.size > 0 %>
     <% @tags.each do |tag| %>
-	<span class="re_tag f_l"> <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
+	<span class="re_tag f_l" style="cursor: pointer" > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
-      <a ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
+      <a title="双击可编辑" ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
       <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
       <% case object_flag %>
 	    <% when '10' %>

app/views/users/_course_attachment.html.erb

@@ -1,28 +1,29 @@
 <div class="resources mt10">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-     <!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo">
+      <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
-         TO
+        TO
-        <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.container_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+        <%= link_to activity.course.name.to_s+" | 课程资源", course_files_path(activity.course), :class => "newsBlue ml15" %>
-        <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
       </div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle break_word" >
-        <a href="javascript:void(0);" class="postGrey"><%=activity.filename.to_s(附件名称)%></a>
+        <%= link_to activity.filename, course_files_path(activity.course), :class => "postGrey" %>
       </div>
       <div class="homepagePostSubmitContainer">
-        <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
+        <div class="homepagePostDeadline mr15">
+          文件大小：
+          <%= number_to_human_size activity.filesize%>
+        </div>
+        <div class="homepagePostDeadline">上传时间：<%= format_time(activity.created_on) %></div>
       </div>
-      <div class="homepagePostIntro">（附件描述）<%=activity.description.to_s%></div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">

app/views/users/_course_create.html.erb

@@ -1,18 +1,25 @@
 <div class="resources mt10">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="50" height="50" alt="用户头像"/></a></div>
+      <%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_path(activity.tea_id), :alt => "用户头像" %>
+    </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo break_word">
-        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+        <% if activity.try(:teacher).try(:realname) == ' ' %>
-      <div class="homepagePostTitle">
+            <%= link_to activity.try(:teacher), user_path(activity.tea_id), :class => "newsBlue mr15" %>
-        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（课程创建）</a></div>
+        <% else %>
-      <div class="homepagePostSubmitContainer">
+            <%= link_to activity.try(:teacher).try(:realname), user_path(activity.tea_id), :class => "newsBlue mr15" %>
-        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <% end %>
-        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+        TO
+        <%= link_to activity.name.to_s+" | 课程", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word" >
+        <%= link_to activity.name, course_path(activity.id,:host=>Setting.host_course), :class => "postGrey" %>
+      </div>
+      <div class="homepagePostDate">
+        创建时间：<%= format_time(activity.created_at) %>
       </div>
-      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">

app/views/users/_course_homework.html.erb

@@ -1,3 +1,4 @@
+<% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
@@ -45,18 +46,29 @@
       <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
         <%= activity.description.html_safe %>
       </div>
-      <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity_id %>">
+      <%# if is_teacher%>
-        <ul>
+          <!--<div class="homepagePostSetting">
-          <li class="homepagePostSettingIcon">
+            <ul>
-            <ul class="homepagePostSettiongText">
+              <li class="homepagePostSettingIcon">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+                <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+                  <li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+                    <%#= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
+                  </li>
+                  <li>
+                    <%#= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                  </li>
+                  <li>
+                    <%#= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+                  </li>
+                  <li>
+                    <%#= homework_anonymous_comment activity %>
+                  </li>
+                </ul>
+              </li>
             </ul>
-          </li>
+          </div>
-        </ul>
+      <%# end%>-->
       </div>
-    </div>
     <div class="cl"></div>
   </div>
 </div>

app/views/users/_course_journalsformessage.html.erb

@@ -1,29 +1,125 @@
-<div class="resources mt10">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="50" height="50" alt="用户头像"/></a></div>
+      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
+    </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo break_word">
-        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
+        <% if @ctivity.try(:user).try(:realname) == ' ' %>
-      <div class="homepagePostTitle">
+            <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
-        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（留言）</a></div>
+        <% else %>
-      <div class="homepagePostSubmitContainer">
+            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
-        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
+        <% end %> TO
-        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+        <% course=Course.find(activity.jour_id) %>
+        <%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word list_style upload_img">
+        <% if activity.parent %>
+            <%= link_to activity.parent.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
+        <% else %>
+            <%= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
+        <% end %>
       </div>
-      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
+      <div class="homepagePostDate">
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+        留言时间：<%= format_time(activity.created_on) %>
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-            </ul>
-          </li>
-        </ul>
       </div>
     </div>
     <div class="cl"></div>
   </div>
+  <% count=course.journals_for_messages.where('m_parent_id IS NULL').count %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">
+        回复（<%= count %>）
+      </div>
+      <div class="homepagePostReplyBannerTime"></div>
+      <%if count>2 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% course.journals_for_messages.where('m_parent_id IS NULL').reorder("created_on desc").each do |comment| %>
+                <% replies_all_i = replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 2 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher">
+                      <% if comment.try(:user).try(:realname) == ' ' %>
+                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(comment.created_on) %>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
+                      <%= comment.notes.html_safe %></div>
+                    <% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %>
+                        <div class="recall">
+                          <div class="homepagePostReplyPortrait">
+                            <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.user_id), :alt => "用户头像" %>
+                          </div>
+                          <div class="homepagePostReplyjournal">
+                              <div class="homepagePostReplyPublisher">
+                                <% if reply.try(:user).try(:realname) == ' ' %>
+                                    <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                                <% else %>
+                                    <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                                <% end %>
+                                <%= l(:label_reply_to)%>
+                                <% if comment.try(:user).try(:realname) == ' ' %>
+                                    <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14 ml10" %>
+                                <% else %>
+                                    <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14 ml10" %>
+                                <% end %>
+                                <%= format_time reply.created_on %>
+                              </div>
+                            <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
+                              <%= reply.notes.html_safe %></div>
+                              <div class="cl"></div>
+                          </div>
+                          <div class="cl"></div>
+                        </div>
+                      <% end %>
+                    <% end %>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => activity.id},:method => "post", :remote => true) do |f|%>
+              <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
+              <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
+              <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
+              <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
+              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
 </div>

app/views/users/_course_message.html.erb

@@ -87,7 +87,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style">
+                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
                       <%= reply.content.html_safe %>
                     </div>
                   </div>

app/views/users/_course_news.html.erb

@@ -60,7 +60,8 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style"><%= comment.comments.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
+                      <%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>

app/views/users/_project_issue.html.erb

@@ -97,7 +97,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word">
+                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
                       <% if reply.details.any? %>
                           <% details_to_strings(reply.details).each do |string| %>
                               <p><%= string %></p>
@@ -133,17 +133,3 @@
 
   </div>
 </div>
-<script type="text/javascript">
-    $(function(){
-        var images=$("div#activity_description_<%= user_activity_id %>").find("img");
-        if (images.length>0) {
-            for (var i=0; i<images.length; i++){
-                var image=$(images[i]);
-                var element=$("<a></a>").attr("href",image.attr('src'));
-                image.wrap(element);
-            }
-        }
-        $('#activity_description_<%= user_activity_id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
-    });
-
-</script>

app/views/users/_project_message.html.erb

@@ -74,7 +74,8 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style"><%= reply.content.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
+                      <%= reply.content.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>

app/views/users/_show_user_homeworks.html.erb

@@ -10,6 +10,7 @@
     <% end%>
   </div>
   <%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %>
+      <input type="hidden" name="select_course" value="<%= @select_course%>">
       <div class="homeworkListForm mb10 " id="homework_list_form_show">
         <%= render :partial => 'users/show_user_homework_form', :locals => {:user_homeworks => @user_homeworks}%>
       </div>

app/views/users/_show_user_resource.html.erb

@@ -60,7 +60,7 @@
   </div>
   <div>
     <a href="javascript:void(0);" onclick="$(this).parent().parent().submit();" class="db courseSendSubmit sendSourceText">确定</a>
-    <a href="javascript:void(0);" onclick="hideModal();" class="db courseSendCancel sendSourceText">取消</a>
+    <a href="javascript:void(0);" onclick="hideResource();" class="db courseSendCancel sendSourceText">取消</a>
   </div>
   <div class="cl"></div>
   <% end %>

app/views/users/_user_activities.html.erb

@@ -37,6 +37,26 @@
 
             $(function() {
                 init_activity_KindEditor_data(<%= user_activity.id%>,null,"87%");
+                var description_images=$("div#activity_description_<%= user_activity.id %>").find("img");
+                if (description_images.length>0) {
+                    for (var i=0; i<description_images.length; i++){
+                        var image=$(description_images[i]);
+                        var element=$("<a></a>").attr("href",image.attr('src'));
+                        image.wrap(element);
+                    }
+                }
+                $('#activity_description_<%= user_activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
+
+                var reply_images=$("div#reply_content_<%= user_activity.id %>").find("img");
+                if (reply_images.length>0) {
+                    for (var i=0; i<reply_images.length; i++){
+                        var image=$(reply_images[i]);
+                        var element=$("<a></a>").attr("href",image.attr('src'));
+                        image.wrap(element);
+                    }
+                }
+                $('#reply_content_<%= user_activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
+
             });
         </script>
         <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>

app/views/users/_user_homework_form.html.erb

@@ -16,7 +16,7 @@
   <div class="cl"></div>
 
   <div class=" mt10">
-    <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%>
+    <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%>
     <div class="calendar_div fl">
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
       <%= calendar_for('homework_end_time')%>
@@ -36,8 +36,7 @@
     </div>
     <div class="cl"></div>
 
-
+    <div class="mt10 <%= defined?(select_course) ? 'none' : ''%>">
-    <div class="mt10">
       <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>
     </div>
     <p id="homework_course_id_span" class="c_red mt5"></p>

app/views/users/_user_homework_list.html.erb

@@ -58,10 +58,10 @@
                   <li class="homepagePostSettingIcon">
                     <ul class="homepagePostSettiongText">
                       <li>
-                        <%= link_to l(:button_edit),edit_homework_common_path(homework_common,:is_in_course => 0), :class => "postOptionLink"%>
+                        <%= link_to l(:button_edit),edit_homework_common_path(homework_common,:is_in_course => is_in_course), :class => "postOptionLink"%>
                       </li>
                       <li>
-                        <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                        <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => is_in_course),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                       </li>
                       <li>
                         <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true) if homework_common.homework_detail_manual.comment_status == 1%>
@@ -80,5 +80,11 @@
     </div><!----HomeWork end-->
 <% end%>
 <% if homework_commons.count == 10%>
-    <%= link_to "加载更多",user_homeworks_user_path(User.current.id,:page => page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+    <% if is_in_course == 1%>
+        <!-- 在课程内 -->
+        <%= link_to "加载更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+    <% else%>
+        <!-- 在个人主页 -->
+        <%= link_to "加载更多",user_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+    <% end%>
 <% end%>

app/views/users/_user_message_course.html.erb

@@ -0,0 +1,338 @@
+<% if ma.class == CourseMessage %>
+    <% if ma.course_message_type == "News" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
+          <li class="homepageNewsContent fl">
+            <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover =>"message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p><strong>标题：</strong><%= ma.course_message.title %></p>
+            <% unless ma.course_message.description.nil? %>
+                <div class="fl"><strong>内容：</strong></div>
+                <div class="ml36"><%= ma.course_message.description.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "Comment" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
+          <li class="homepageNewsContent fl">
+            <%= link_to  ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover =>"message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p><strong>评论对象：</strong><%= ma.course_message.commented.title %></p>
+            <% unless ma.course_message.comments.nil? %>
+                <div class="fl"><strong>评论内容：</strong></div>
+                <div class="ml60"><%= ma.course_message.comments.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程作业：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover =>"message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a></li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
+                <p>
+                  <%= User.current.lastname + User.current.firstname %>老师您好！
+                  <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：
+                </p>
+                <p>课程名称：<%= ma.course_message.course.name %>
+                  (<%= ma.course_message.course.term %>)</p>
+                <p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
+                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
+                <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
+                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
+                <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+                <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
+                <p>
+                  您可以修改作业内容、评分规则、匿评过程等，谢谢！
+                </p>
+            <% else %>
+                <p><%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
+                <p>课程名称：<%= ma.course_message.course.name %>
+                  (<%= ma.course_message.course.term %>)</p>
+                <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
+                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
+                <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+                <p>
+                  请抓紧时间提交自己的作品，谢谢！
+                </p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
+          <li class="homepageHomeworkContent fl">
+            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+                        :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
+                <p>
+                  <%= User.current.lastname + User.current.firstname %>同学您好！
+                  <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
+                </p>
+                <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;&nbsp;24点</span></p>
+                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点</span></p>
+                <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+                <p>请同学们抓紧时间提交自己的作品，谢谢！</p>
+            <% else %>
+                <p><%= User.current.lastname + User.current.firstname %>老师您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：</p>
+                <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;@nbsp;24点</span></p>
+                <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>@nbsp;@nbsp;24点</span></p>
+                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点</span></p>
+                <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+                <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
+                <p>您可以修改作业内容、评分规则、匿评过程等，谢谢！</p>
+            <% end %>
+          </div>
+          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <!--作品开启匿评 待整合：时间紧-->
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
+          </li>
+          <li class="homepageNewsContent fl">
+            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
+            </p>
+            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+            <p>
+              截止日期：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span>
+            </p>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <!--作品关闭匿评-->
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
+          <li class="homepageNewsContent fl">
+            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover =>"message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))"%>
+          </li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>关闭了匿评，作业详情如下：
+            </p>
+            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动作业匿评失败</span>
+          </li>
+          <li class="homepageNewsContent fl">
+            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
+              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败，作业详情如下：
+            </p>
+            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+
+    <% if ma.course_message_type == "Poll" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷：</span></li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
+                        :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
+                        :onmouseover =>"message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a></li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <%= ma.course_message.polls_name %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "Message" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
+          <% if ma.course_message.parent_id.nil? %>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a></li>
+              <div  style="display: none" class="message_title_red system_message_style" >
+                <p><strong>主题：</strong><%= ma.course_message.subject %></p>
+                <% unless ma.course_message.content.nil? %>
+                    <div class="fl"><strong>内容：</strong></div>
+                    <div class="ml36"><%= ma.course_message.content.html_safe %></div>
+                <% end %>
+              </div>
+          <% else %>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a></li>
+              <div  style="display: none" class="message_title_red system_message_style" >
+                <p><strong>主题：</strong><%= ma.course_message.subject %></p>
+                <% unless ma.course_message.content.nil? %>
+                    <div class="fl"><strong>内容：</strong></div>
+                    <div class="ml36"><%= ma.course_message.content.html_safe %></div>
+                <% end %>
+              </div>
+          <% end %>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "StudentWorksScore" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <% if ma.course_message.reviewer_role == 3 %>
+                <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30") %>
+            <% else %>
+                <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
+            <% end %>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <% if ma.course_message.reviewer_role == 3 %>
+                <span class="newsBlue homepageNewsPublisher">匿名用户</span>
+            <% else %>
+                <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <% end %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+                          <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %>
+                        </span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <% unless ma.content.nil? %>
+                <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
+                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a></li>
+                <div  style="display: none" class="message_title_red system_message_style" >
+                  <%= ma.content.html_safe %>
+                  <p>课程名称：<%= ma.course.name %>(<%= ma.course.term %>)</p>
+                  <p>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></p>
+                </div>
+            <% end %>
+            <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+    <% end %>
+    <% if ma.course_message_type == "JournalsForMessage" %>
+        <% if ma.course_message.jour_type == 'Course' %>
+            <% if params[:type] != 'homework' %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                  </li>
+                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">在课程中留言了：</span>
+                  </li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to ma.course_message.notes.html_safe, course_feedback_path(:id => ma.course_id),
+                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                :onmouseover => "message_titile_show($(this),event)",
+                                :onmouseout => "message_titile_hide($(this))" %></a>
+                  </li>
+                  <div style="display: none" class="message_title_red system_message_style">
+                    <%= ma.course_message.notes.html_safe %>
+                  </div>
+                  <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                </ul>
+            <% end %>
+        <% else %>
+            <ul class="homepageNewsList fl">
+              <li class="homepageNewsPortrait fl">
+                <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+              </li>
+              <li class="homepageNewsPubType fl">
+                <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname +
+                                    "#{ma.course_message.user.members.where("course_id=?", ma.course.id).first.roles.first.name=='Student'?"同学":"老师"}",
+                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
+              </li>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a>
+              </li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <div class="fl">回复内容：</div>
+                <div class="ml60"><%= ma.course_message.notes  %></div>
+                <div class="fl">您的评论：</div>
+                <div class="ml60"><%= ma.course_message.jour.comment  %></div>
+                <p>课程名称：<%= ma.course.name %>(<%= ma.course.term %>)</p>
+                <p>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></p>
+              </div>
+              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% end %>
+    <% end %>
+<% end %>

app/views/users/_user_message_forge.html.erb

@@ -0,0 +1,213 @@
+<% if ma.class == ForgeMessage %>
+    <!--申请加入项目-->
+    <% if ma.forge_message_type == "AppliedProject" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申请加入项目：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <%= ma.project %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <!--邀请加入项目-->
+    <% if ma.forge_message_type == "ProjectInvite" %>
+        <% inviter = User.find(ma.forge_message_id) %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher" %>
+            <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目</span>
+          </li>
+          <% if ma.user.member_of?(ma.project) %>
+              <li class="homepageNewsContent fl">
+          <% else %>
+              <li class="homepageHomeworkContent fl">
+          <% end %>
+          <%= link_to ma.project, project_path(ma.project),
+                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                      :onmouseover => "message_titile_show($(this),event)",
+                      :onmouseout => "message_titile_hide($(this))" %>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <%= ma.project %>
+          </div>
+          <% unless User.current.member_of?(ma.project) %>
+              <li  class="homepageHomeworkContentWarn fl">
+                <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id,  :key => ma.secret_key},
+                           :value => ma.secret_key,
+                           :class => "green_btn_cir ml10",
+                           :style => "color:#fff" %>
+              </li>
+          <% end %>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.forge_message_type == "Issue" %>
+        <% if ma.status == 1%>
+            <ul class="homepageNewsList fl">
+              <li class="homepageNewsPortrait fl">
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+              </li>
+              <li class="homepageNewsPubType fl">
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%></span>
+              </li>
+              <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a>
+              </li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
+                <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
+                    <div class="fl"><strong>描述：</strong></div>
+                    <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
+                <% end %>
+              </div>
+              <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
+              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% else %>
+            <ul class="homepageNewsList fl">
+              <li class="homepageNewsPortrait fl">
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+              </li>
+              <li class="homepageNewsPubType fl">
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
+              </li>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a>
+              </li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
+                <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
+                    <div class="fl"><strong>描述：</strong></div>
+                    <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
+                <% end %>
+              </div>
+              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% end %>
+    <% end %>
+    <% if ma.forge_message_type == "Journal" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+                            更新了问题状态：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.forge_message.journalized.subject,
+                        issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover =>"message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+          </li>
+          <div  style="display: none" class="message_title_red system_message_style" >
+            <p><strong>问题标题：</strong><%= ma.forge_message.journalized.subject %></p>
+            <div class="fl"><strong>更新内容：</strong></div>
+            <div class="ml60"><%= get_issue_des_update(ma.forge_message).html_safe  %></div>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.forge_message_type == "Message" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
+          <% if ma.forge_message.parent_id.nil? %>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
+                                                                          :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
+                                                                          :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a></li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
+                <% unless ma.forge_message.content.nil? %>
+                    <div class="fl"><strong>内容：</strong></div>
+                    <div class="ml36"><%= ma.forge_message.content.html_safe %></div>
+                <% end %>
+              </div>
+          <% else %>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
+                                                                          :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
+                                                                          :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a></li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p><strong>帖子主题：</strong><%= ma.forge_message.subject %></p>
+                <% unless ma.forge_message.content.nil? %>
+                    <div class="fl"><strong>评论内容：</strong></div>
+                    <div class="ml60"><%= ma.forge_message.content.html_safe %></div>
+                <% end %>
+              </div>
+          <% end %>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.forge_message_type == "News" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了新闻：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id},
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p><strong>标题：</strong><%= ma.forge_message.title %></p>
+            <% unless ma.forge_message.description.nil? %>
+                <div class="fl"><strong>内容：</strong></div>
+                <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.forge_message_type == "Comment" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span></li>
+          <li class="homepageNewsContent fl">
+            <%= link_to "#{ma.forge_message.commented.title}",
+                        {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p><strong>新闻标题：</strong><%= ma.forge_message.commented.title %></p>
+            <div class="fl"><strong>评论内容：</strong></div>
+            <div class="ml60"><%= ma.forge_message.comments.html_safe %></div>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+<% end %>

app/views/users/_user_message_forum.html.erb

@@ -0,0 +1,41 @@
+<% if ma.class == MemoMessage %>
+    <% if ma.memo_type == "Memo" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
+          </li>
+          <% if ma.memo.parent_id.nil? %>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a>
+              </li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p><strong>标题：</strong><%= ma.memo.subject %></p>
+                <% unless ma.memo.content.nil? %>
+                    <div class="fl"><strong>内容：</strong></div>
+                    <div class="ml36"><%= ma.memo.content.html_safe %></div>
+                <% end %>
+              </div>
+          <% else %>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a>
+              </li>
+              <div  style="display: none" class="message_title_red system_message_style">
+                <p><strong>标题：</strong><%= ma.memo.subject %></p>
+                <% unless ma.memo.content.nil? %>
+                    <div class="fl"><strong>内容：</strong></div>
+                    <div class="ml36"><%= ma.memo.content.html_safe %></div>
+                <% end %>
+              </div>
+          <% end %>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+<% end %>

app/views/users/_user_message_userfeedaback.html.erb

@@ -0,0 +1,30 @@
+<% if ma.class == UserFeedbackMessage %>
+    <% if ma.journals_for_message_type == "JournalsForMessage" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover =>"message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+          </li>
+          <div  style="display: none" class="message_title_red system_message_style" >
+            <% if ma.journals_for_message.reply_id == 0 %>
+                <%= ma.journals_for_message.notes.html_safe %>
+            <% else %>
+                <div class="fl"><strong>您的留言：</strong></div>
+                <div class="ml60"><%= JournalsForMessage.find(ma.journals_for_message.m_reply_id).notes.html_safe %></div>
+                <div class="fl"><strong>回复内容：</strong></div>
+                <div class="ml60"><%= ma.journals_for_message.notes.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
+
+        </ul>
+    <% end %>
+<% end %>

app/views/users/import_resources_to_homework.js.erb

@@ -12,5 +12,5 @@
     '<div class="cl"></div>')
 
     <% end %>
-    hideModal();
+    hideResource();
 <% end %>

app/views/users/new_user_commit_homework.html.erb

@@ -105,7 +105,10 @@
 
         <% @student_work.student_work_tests.each_with_index do |test, index| %>
           <div class="ProResultTop">
-             <p class="c_blue fl">第<%= @student_work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
+             <p class="c_blue fl">
+               第<%= @student_work.student_work_tests.count - index%>次测试
+             </p>
+            <span class="fr c_grey"><%= format_time(test.created_at).to_s%></span>
                <div class="cl"></div>
           </div>
           <% if test.status.to_i == -2 %>

app/views/users/user_homeworks.html.erb

@@ -26,4 +26,4 @@
     </div><!----HomeWork end-->
 <% end%>
 
-<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0} %>
+<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0,:is_in_course => 0} %>

app/views/users/user_homeworks.js.erb

@@ -1,2 +1,2 @@
-$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page} )%>");
+$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page,:is_in_course => 0} )%>");
 

app/views/users/user_import_resource.js.erb

@@ -3,6 +3,6 @@ showModal('ajax-modal', '730px');
 $('#ajax-modal').css('height','500px').css("width","730px");
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" +
-"<a href='javascript:void(0)' class='resourceClose' onclick='hideModal();'></a></div>");
+"<a href='javascript:void(0)' class='resourceClose' onclick='hideResource();'></a></div>");
-$('#ajax-modal').parent().css("top","30%").css("left","").css("position","fixed").css("padding-left","16px").css("padding-bottom","16px").css("padding-right","16px");
+$('#ajax-modal').parent().css("top","30%").css("left","").css("position","fixed");
 $('#ajax-modal').parent().addClass("popbox").addClass("referenceResourcesPopup");

app/views/users/user_messages.html.erb

@@ -31,698 +31,73 @@
   </ul>
 </div>
 <div class="resources mt10" id="users_setting">
-<div>
+  <div>
-<% if @message_alls.count >0 || @user_system_messages.count >0 %>
+    <% if @message_alls.count >0 || @user_system_messages.count >0 %>
-    <% if params[:type].nil? || params[:type] == "unviewed" %>
+        <% if params[:type].nil? || params[:type] == "unviewed" %>
-        <div class="newsReadSetting">
+            <div class="newsReadSetting">
-          有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读
+              有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读
-          <% unless (unviewed_message(@user) == 0 || User.current != @user) %>
+              <% unless (unviewed_message(@user) == 0 || User.current != @user) %>
-              <a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
+                  <a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
-          <% end %>
+              <% end %>
-        </div>
+            </div>
-    <% end %>
-    <%# 系统消息 %>
-    <% if params[:type] != 'system_messages' %>
-        <% @user_system_messages.each do |usm| %>
-            <ul class="homepageNewsList fl">
-              <li class="homepageNewsPortrait fl">
-                <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/logo.png", width: "30px", height: "30px", class: "mt3") %></div></a>
-              </li>
-              <li class="homepageNewsPubType fl">
-                <span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span>
-              </li>
-              <span style="color: red;float: left">【系统消息】</span><li class="homepageSystenMessageContent fl" id="content_<%= usm.id %>">
-              <li class="homepageSystenMessageContent fl">
-
-              <%= link_to usm.subject.blank? ? (usm.content.nil? ? usm.description.html_safe : usm.content.html_safe) : usm.subject, user_system_messages_path(User.current),
-                          :id => "content_link_#{usm.id}",
-                          :onmouseover =>"message_titile_show($(this),event);",
-                          :onmouseout => "message_titile_hide($(this));"
-              %>
-            </li>
-              <div style="display:none;" class="message_title_red system_message_style">
-                <% unless usm.subject.blank? %>
-                    <p><strong>标题：</strong><%= usm.subject %></p>
-                <% end %>
-                <% if (!usm.description.blank?) || (!usm.content.blank?) %>
-                    <div class="fl"><strong>内容：</strong></div><div class="ml36"><%= usm.description.nil? ? usm.content.html_safe : usm.description.html_safe %></div>
-                <% end %>
-              </div>
-              <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
-            </ul>
         <% end %>
-    <% end %>
+        <%# 系统消息 %>
-    <!--总消息列表-->
+        <% if params[:type] != 'system_messages' %>
-    <% unless @message_alls.nil? %>
+            <% @user_system_messages.each do |usm| %>
-        <% @message_alls.each do |ma| %>
+                <ul class="homepageNewsList fl">
-            <%# 课程消息 %>
+                  <li class="homepageNewsPortrait fl">
-            <% if ma.class == CourseMessage %>
+                    <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/logo.png", width: "30px", height: "30px", class: "mt3") %></div></a>
-                <% if ma.course_message_type == "News" %>
+                  </li>
-                    <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPubType fl">
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
+                    <span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
+                  </li>
-                      <li class="homepageNewsContent fl">
+                  <span style="color: red;float: left">【系统消息】</span>
-                        <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
+                  <li class="homepageSystenMessageContent fl">
-                                    :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+
-                                    :onmouseover =>"message_titile_show($(this),event)",
+                    <%= link_to usm.subject.blank? ? (usm.content.nil? ? usm.description.html_safe : usm.content.html_safe) : usm.subject, user_system_messages_path(User.current),
-                                    :onmouseout => "message_titile_hide($(this))" %></li>
+                                :id => "content_link_#{usm.id}",
-                      <div  style="display: none" class="message_title_red system_message_style">
+                                :onmouseover =>"message_titile_show($(this),event);",
-                        <p><strong>标题：</strong><%= ma.course_message.title %></p>
+                                :onmouseout => "message_titile_hide($(this));"
-                        <% unless ma.course_message.description.nil? %>
+                    %>
-                            <div class="fl"><strong>内容：</strong></div>
+                  </li>
-                            <div class="ml36"><%= ma.course_message.description.html_safe %></div>
+                  <div style="display:none;" class="message_title_red system_message_style">
-                        <% end %>
+                    <% unless usm.subject.blank? %>
-                      </div>
+                        <p><strong>标题：</strong><%= usm.subject %></p>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                    <% end %>
-                    </ul>
+                    <% if (!usm.description.blank?) || (!usm.content.blank?) %>
-                <% end %>
+                        <div class="fl"><strong>内容：</strong></div><div class="ml36"><%= usm.description.nil? ? usm.content.html_safe : usm.description.html_safe %></div>
-                <% if ma.course_message_type == "Comment" %>
+                    <% end %>
-                    <ul class="homepageNewsList fl">
+                  </div>
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
+                  <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
+                </ul>
-                      <li class="homepageNewsContent fl">
+            <% end %>
-                        <%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
+        <% end %>
-                                    :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+        <!--总消息列表-->
-                                    :onmouseover =>"message_titile_show($(this),event)",
+        <% unless @message_alls.nil? %>
-                                    :onmouseout => "message_titile_hide($(this))" %></li>
+            <% @message_alls.each do |ma| %>
-                      <div  style="display: none" class="message_title_red system_message_style">
+                <%# 课程消息 %>
-                        <p><strong>标题：</strong><%= ma.course_message.commented.title %></p>
+                <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
-                        <% unless ma.course_message.comments.nil? %>
-                            <div class="fl"><strong>内容：</strong></div>
-                            <div class="ml36"><%= ma.course_message.comments.html_safe %></div>
-                        <% end %>
-                      </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程作业：</span>
-                      </li>
-                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                                    :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                    :onmouseover =>"message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %></a></li>
-                      <div  style="display: none" class="message_title_red system_message_style">
-                        <% if User.current.allowed_to?(:as_teacher,ma.course_message) %>
-                            <p>
-                              <%= User.current.lastname + User.current.firstname %>老师您好！
-                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：
-                            </p>
-                            <p>课程名称：<%= ma.course_message.course.name %>
-                              (<%= ma.course_message.course.term %>)</p>
-                            <p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
-                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
-                            <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
-                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
-                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-                            <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
-                            <p>
-                              您可以修改作业内容、评分规则、匿评过程等，谢谢！
-                            </p>
-                        <% else %>
-                            <p><%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
-                            <p>课程名称：<%= ma.course_message.course.name %>
-                              (<%= ma.course_message.course.term %>)</p>
-                            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
-                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
-                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-                            <p>
-                              请抓紧时间提交自己的作品，谢谢！
-                            </p>
-                        <% end %>
-                      </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
-                      <li class="homepageHomeworkContent fl">
-                        <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                                    :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                    :onmouseover => "message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %>
-                      </li>
-                      <div style="display: none" class="message_title_red system_message_style">
-                        <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
-                            <p>
-                              <%= User.current.lastname + User.current.firstname %>同学您好！
-                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
-                            </p>
-
-                            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
-
-                            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-
-                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;&nbsp;24点</span></p>
-
-                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>
-                              @nbsp;@nbsp;24点</span></p>
-
-                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-
-                            <p>
-                              请同学们抓紧时间提交自己的作品，谢谢！
-                            </p>
-                        <% else %>
-                            <p><%= User.current.lastname + User.current.firstname %>您好！
-                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>
-                              老师发布的作业截止日期快到了：</p>
-
-                            <p><strong>课程名称：</strong><%= ma.course_message.course.name %>
-                              (<%= ma.course_message.course.term %>)</p>
-
-                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-
-                            <p><strong>提交截止：</strong><%= ma.course_message.end_time %>@nbsp;@nbsp;24点</p>
-
-                            <p><strong>匿评开始：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %>
-                              @nbsp;@nbsp;24点</p>
-
-                            <p><strong>匿评关闭：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %>
-                              @nbsp;@nbsp;24点</p>
-
-                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
-
-                            <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分
-                            </p>
 
-                            <p>
+                <!--项目消息-->
-                              您可以修改作业内容、评分规则、匿评过程等，谢谢！
+                <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
-                            </p>
-                        <% end %>
-                      </div>
-                      <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                  <!--作品开启匿评 待整合：时间紧-->
-                  <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
-                      <ul class="homepageNewsList fl">
-                        <li class="homepageNewsPortrait fl">
-                          <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
-                        </li>
-                        <li class="homepageNewsPubType fl">
-                          <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                                      user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                          <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
-                        </li>
-                        <li class="homepageNewsContent fl">
-                          <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                      :onmouseover => "message_titile_show($(this),event)",
-                                      :onmouseout => "message_titile_hide($(this))" %>
-                        </li>
-                        <div style="display: none" class="message_title_red system_message_style">
-                          <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评，作业详情如下：</p>
-                          <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
-                          <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                          <% unless ma.course_message.description.blank? %>
-                              <div class="fl"><strong>作业内容：</strong></div>
-                              <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                          <% end %>
-                          <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %>
-                          </p>
-                        </div>
-                        <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                      </ul>
-                  <% end %>
-                <!--作品关闭匿评-->
-                <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                      <li class="homepageNewsPubType fl">
-                        <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                                   user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
-                          <li class="homepageNewsContent fl">
-                            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))"%>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评，作业详情如下：</p>
-                            <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
-                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                            <% unless ma.course_message.description.blank? %>
-                                <div class="fl"><strong>作业内容：</strong></div>
-                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                            <% end %>
-                          </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
 
-                <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
+                <!--公共贴吧-->
-                      <ul class="homepageNewsList fl">
+                <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
-                        <li class="homepageNewsPortrait fl">
-                          <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
-                        </li>
-                        <li class="homepageNewsPubType fl">
-                          <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                                      user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                          <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动作业匿评失败</span>
-                        </li>
-                        <li class="homepageNewsContent fl">
-                          <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                      :onmouseover => "message_titile_show($(this),event)",
-                                      :onmouseout => "message_titile_hide($(this))" %>
-                        </li>
-                        <div style="display: none" class="message_title_red system_message_style">
-                          <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师启动作业匿评失败，作业详情如下：</p>
-                          <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
-                          <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                          <% unless ma.course_message.description.blank? %>
-                              <div class="fl"><strong>作业内容：</strong></div>
-                              <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                          <% end %>
-                        </div>
-                        <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                      </ul>
-                <% end %>
 
-                <% if ma.course_message_type == "Poll" %>
+                <!--用户留言-->
-                    <ul class="homepageNewsList fl">
+                <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷：</span></li>
-                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
-                                    :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
-                                    :onmouseover =>"message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %></a></li>
-                      <div  style="display: none" class="message_title_red system_message_style">
-                        <%= ma.course_message.polls_name %>
-                      </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                <% if ma.course_message_type == "Message" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
-                      <% if ma.course_message.parent_id.nil? %>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
-                                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %></a></li>
-                          <div  style="display: none" class="message_title_red system_message_style" >
-                            <p><strong>主题：</strong><%= ma.course_message.subject %></p>
-                            <% unless ma.course_message.content.nil? %>
-                                <div class="fl"><strong>内容：</strong></div>
-                                <div class="ml36"><%= ma.course_message.content.html_safe %></div>
-                            <% end %>
-                          </div>
-                      <% else %>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
-                                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %></a></li>
-                          <div  style="display: none" class="message_title_red system_message_style" >
-                            <p><strong>主题：</strong><%= ma.course_message.subject %></p>
-                            <% unless ma.course_message.content.nil? %>
-                                <div class="fl"><strong>内容：</strong></div>
-                                <div class="ml36"><%= ma.course_message.content.html_safe %></div>
-                            <% end %>
-                          </div>
-                      <% end %>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
 
-                    </ul>
-                <% end %>
-                <% if ma.course_message_type == "StudentWorksScore" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl">
-                        <% if ma.course_message.reviewer_role == 3 %>
-                            <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30") %>
-                        <% else %>
-                            <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
-                        <% end %>
-                        </li>
-                      <li class="homepageNewsPubType fl">
-                        <% if ma.course_message.reviewer_role == 3 %>
-                            <span class="newsBlue homepageNewsPublisher">匿名用户</span>
-                        <% else %>
-                            <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                        <% end %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-                          <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %>
-                        </span>
-                      </li>
-                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <% unless ma.content.nil? %>
-                            <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
-                                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %></a></li>
-                            <div  style="display: none" class="message_title_red system_message_style" >
-                              <%= ma.content.html_safe %>
-                              <p><strong>课程：</strong><%= ma.course.name %>
-                                (<%= ma.course.term %>)</p>
-                              <p><strong>作业标题：</strong><%=ma.course_message.student_work.homework_common.name %></p>
-                              <% unless ma.course_message.student_work.homework_common.description.blank? %>
-                                  <div class="fl"><strong>作业内容：</strong></div>
-                                  <div class="ml60"><%= ma.course_message.student_work.homework_common.description.html_safe %></div>
-                              <% end %>
-                            </div>
-                        <% end %>
-                        <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                        </ul>
-                <% end %>
-                <% if ma.course_message_type == "JournalsForMessage" %>
-                    <% if ma.course_message.jour_type == 'Course' %>
-                          <% if params[:type] != 'homework' %>
-                              <ul class="homepageNewsList fl">
-                                <li class="homepageNewsPortrait fl">
-                                  <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
-                                </li>
-                                <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                                  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">在课程中留言了：</span>
-                                </li>
-                                <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                                  <%= link_to ma.course_message.notes.html_safe, course_feedback_path(:id => ma.course_id),
-                                              :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                              :onmouseover => "message_titile_show($(this),event)",
-                                              :onmouseout => "message_titile_hide($(this))" %></a>
-                                </li>
-                                <div style="display: none" class="message_title_red system_message_style">
-                                  <%= ma.course_message.notes.html_safe %>
-                                </div>
-                                <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                              </ul>
-                          <% end %>
-                    <% else %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
-                          </li>
-                          <li class="homepageNewsPubType fl">
-                            <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname +
-                                "#{ma.course_message.user.members.where("course_id=?", ma.course.id).first.roles.first.name=='Student'?"同学":"老师"}",
-                                user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
-                          </li>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover => "message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %></a>
-                          </li>
-                          <div style="display: none" class="message_title_red system_message_style">
-                            <div class="fl"><strong>回复内容：</strong></div>
-                            <div class="ml60"><%= ma.course_message.notes  %></div>
-                            <div class="fl"><strong>您的作品评论：</strong></div>
-                            <div class="ml80"><%= ma.course_message.jour.comment  %></div>
-                            <p><strong>课程：</strong><%= ma.course.name %>(<%= ma.course.term %>)</p>
-                            <p><strong>作业标题：</strong><%=ma.course_message.jour.student_work.homework_common.name %></p>
-                            <% unless ma.course_message.jour.student_work.homework_common.description.blank? %>
-                                <div class="fl"><strong>作业内容：</strong></div>
-                                <div class="ml60"><%= ma.course_message.jour.student_work.homework_common.description.html_safe %></div>
-                            <% end %>
-                          </div>
-                          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                        </ul>
-                    <% end %>
-                <% end %>
-            <% end %>
-            <!--项目消息-->
-            <% if ma.class == ForgeMessage %>
-                <!--申请加入项目-->
-                <% if ma.forge_message_type == "AppliedProject" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl">
-                        <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
-                      </li>
-                      <li class="homepageNewsPubType fl">
-                        <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申请加入项目：</span>
-                      </li>
-                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                    :onmouseover => "message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %></a>
-                      </li>
-                      <div style="display: none" class="message_title_red system_message_style">
-                        <%= ma.project %>
-                      </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                <!--邀请加入项目-->
-                <% if ma.forge_message_type == "ProjectInvite" %>
-                    <% inviter = User.find(ma.forge_message_id) %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl">
-                        <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter) %></a>
-                      </li>
-                      <li class="homepageNewsPubType fl">
-                        <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目</span>
-                      </li>
-                      <% if ma.user.member_of?(ma.project) %>
-                          <li class="homepageNewsContent fl">
-                      <% else %>
-                          <li class="homepageHomeworkContent fl">
-                      <% end %>
-                        <%= link_to ma.project, project_path(ma.project),
-                                    :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                    :onmouseover => "message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %>
-                      </li>
-                      <div style="display: none" class="message_title_red system_message_style">
-                        <%= ma.project %>
-                      </div>
-                      <% unless User.current.member_of?(ma.project) %>
-                          <li  class="homepageHomeworkContentWarn fl">
-                            <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id,  :key => ma.secret_key},
-                                       :value => ma.secret_key,
-                                       :class => "green_btn_cir ml10",
-                                       :style => "color:#fff" %>
-                          </li>
-                      <% end %>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                <% if ma.forge_message_type == "Issue" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl">
-                        <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
-                      </li>
-                      <li class="homepageNewsPubType fl">
-                        <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">指派了问题给你：</span>
-                      </li>
-                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                    :onmouseover => "message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %></a>
-                      </li>
-                      <div style="display: none" class="message_title_red system_message_style">
-                        <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
-                        <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
-                            <div class="fl"><strong>描述：</strong></div>
-                            <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
-                        <% end %>
-                      </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                <% if ma.forge_message_type == "Journal" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl">
-                        <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
-                      </li>
-                      <li class="homepageNewsPubType fl">
-                        <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-                            更新了问题状态：</span>
-                      </li>
-                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.forge_message.journalized.subject,
-                                    issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                    :onmouseover =>"message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %></a>
-                      </li>
-                      <div  style="display: none" class="message_title_red system_message_style" >
-                        <p><strong>问题标题：</strong><%= ma.forge_message.journalized.subject %></p>
-                        <div class="fl"><strong>更新内容：</strong></div>
-                        <div class="ml60"><%= get_issue_des_update(ma.forge_message).html_safe  %></div>
-                      </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                <% if ma.forge_message_type == "Message" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
-                      <% if ma.forge_message.parent_id.nil? %>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
-                                        :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
-                                        :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover => "message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %></a></li>
-                          <div style="display: none" class="message_title_red system_message_style">
-                            <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
-                            <% unless ma.forge_message.content.nil? %>
-                                <div class="fl"><strong>内容：</strong></div>
-                                <div class="ml36"><%= ma.forge_message.content.html_safe %></div>
-                            <% end %>
-                          </div>
-                      <% else %>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
-                                        :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
-                                        :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover => "message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %></a></li>
-                          <div style="display: none" class="message_title_red system_message_style">
-                            <p><strong>帖子主题：</strong><%= ma.forge_message.subject %></p>
-                            <% unless ma.forge_message.content.nil? %>
-                                <div class="fl"><strong>评论内容：</strong></div>
-                                <div class="ml60"><%= ma.forge_message.content.html_safe %></div>
-                            <% end %>
-                          </div>
-                      <% end %>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                <% if ma.forge_message_type == "News" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl">
-                        <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
-                      </li>
-                      <li class="homepageNewsPubType fl">
-                        <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了新闻：</span>
-                      </li>
-                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id},
-                                    :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                    :onmouseover => "message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %></a>
-                      </li>
-                      <div style="display: none" class="message_title_red system_message_style">
-                        <p><strong>标题：</strong><%= ma.forge_message.title %></p>
-                        <% unless ma.forge_message.description.nil? %>
-                            <div class="fl"><strong>内容：</strong></div>
-                            <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
-                        <% end %>
-                      </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-                <% if ma.forge_message_type == "Comment" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span></li>
-                      <li class="homepageNewsContent fl">
-                        <%= link_to "#{ma.forge_message.comments.html_safe}",
-                                    {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                    :onmouseover => "message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %>
-                      </li>
-                      <div style="display: none" class="message_title_red system_message_style">
-                        <p><strong>新闻标题：</strong><%= ma.forge_message.commented.title %></p>
-                        <div class="fl"><strong>评论内容：</strong></div>
-                        <div class="ml60"><%= ma.forge_message.comments.html_safe %></div>
-                      </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-            <% end %>
-            <!--公共贴吧-->
-            <% if ma.class == MemoMessage %>
-                <% if ma.memo_type == "Memo" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl">
-                        <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author) %></a>
-                      </li>
-                      <li class="homepageNewsPubType fl">
-                        <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
-                      </li>
-                      <% if ma.memo.parent_id.nil? %>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %></a>
-                          </li>
-                          <div style="display: none" class="message_title_red system_message_style">
-                            <p><strong>标题：</strong><%= ma.memo.subject %></p>
-                            <% unless ma.memo.content.nil? %>
-                                <div class="fl"><strong>内容：</strong></div>
-                                <div class="ml36"><%= ma.memo.content.html_safe %></div>
-                            <% end %>
-                          </div>
-                      <% else %>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %></a>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <p><strong>标题：</strong><%= ma.memo.subject %></p>
-                            <% unless ma.memo.content.nil? %>
-                                <div class="fl"><strong>内容：</strong></div>
-                                <div class="ml36"><%= ma.memo.content.html_safe %></div>
-                            <% end %>
-                          </div>
-                      <% end %>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
-            <% end %>
-            <!--用户留言-->
-            <% if ma.class == UserFeedbackMessage %>
-                <% if ma.journals_for_message_type == "JournalsForMessage" %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl">
-                        <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %></a>
-                      </li>
-                      <li class="homepageNewsPubType fl">
-                        <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
-                      </li>
-                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                    :onmouseover =>"message_titile_show($(this),event)",
-                                    :onmouseout => "message_titile_hide($(this))" %></a>
-                      </li>
-                      <div  style="display: none" class="message_title_red system_message_style" >
-                        <% if ma.journals_for_message.reply_id == 0 %>
-                            <%= ma.journals_for_message.notes.html_safe %>
-                        <% else %>
-                            <div class="fl"><strong>您的留言：</strong></div>
-                            <div class="ml60"><%= JournalsForMessage.find(ma.journals_for_message.m_reply_id).notes.html_safe %></div>
-                            <div class="fl"><strong>回复内容：</strong></div>
-                            <div class="ml60"><%= ma.journals_for_message.notes.html_safe %></div>
-                        <% end %>
-                      </div>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
-
-                    </ul>
-                <% end %>
             <% end %>
+            <ul class="wlist" style=" border:none; padding-top: 15px;">
+              <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+            </ul>
         <% end %>
-        <ul class="wlist" style=" border:none; padding-top: 15px;">
+        <!--项目消息-->
-          <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+    <% else %>
-        </ul>
+        <div class="flash notice">您目前还没有相关消息！</div>
     <% end %>
-
+    <div class="cl"></div>
-    <!--项目消息-->
+  </div>
-<% else %>
-    <div class="flash notice">您目前还没有相关消息！</div>
-<% end %>
-<div class="cl"></div>
-</div>
 </div>
 
 <script>

app/views/users/user_select_homework.js.erb

@@ -2,7 +2,9 @@
 hideModal('#coursesChoosePopup');
 $("#homework_name").val("<%= @homework.name%>");
 $("#homework_end_time").val("<%= @homework.end_time%>");
-$("#course_id").val("<%= @homework.course_id%>");
+<% if @select_course == "0"%>
+    $("#course_id").val("<%= @homework.course_id%>");
+<% end%>
 $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true })%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
 $("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");

app/views/words/create_reply.js.erb

@@ -1,27 +1,30 @@
 <% if @save_succ %>
-  <% if !@jfm.nil? && @jfm.jour_type == 'Principal' %>
+    <% if @user_activity_id %>
-        $("#<%= @jfm.m_parent_id%>").children("div[nhname='reply_list']").prepend("<%= escape_javascript( render(:partial => 'users/user_jour_reply',:locals => {:reply=>@jfm} )) %>");
+        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
-        div_1 = $("#<%= @jfm.m_reply_id%>").children("div[nhname='div_form']");
+        init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%");
-        div_1.hide();
+    <% else %>
-        div_2 = $("#<%= @jfm.m_reply_id%>").children("div[nhname='sub_div_form']");
+        <% if !@jfm.nil? && @jfm.jour_type == 'Principal' %>
-        div_2.hide();
+            $("#<%= @jfm.m_parent_id%>").children("div[nhname='reply_list']").prepend("<%= escape_javascript( render(:partial => 'users/user_jour_reply',:locals => {:reply=>@jfm} )) %>");
-  <% else %>
+            div_1 = $("#<%= @jfm.m_reply_id%>").children("div[nhname='div_form']");
-
+            div_1.hide();
-	var pre_append = $('<%= j(
+            div_2 = $("#<%= @jfm.m_reply_id%>").children("div[nhname='sub_div_form']");
-			render :partial => "words/journal_reply_items",
+            div_2.hide();
-			 :locals => {:reply => @jfm, :journal => @jfm.parent, :m_reply_id => @jfm,:show_name => @show_name}
+        <% else %>
-		) %>').hide();
+            var pre_append = $('<%= j(
-	$('#journal_reply_ul_<%=@jfm.m_parent_id%>').append(pre_append);
+                        render :partial => "words/journal_reply_items",
-	pre_append.fadeIn(600);
+                         :locals => {:reply => @jfm, :journal => @jfm.parent, :m_reply_id => @jfm,:show_name => @show_name}
-    var textarea = $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
+                    ) %>').hide();
-    textarea.val('');
+            $('#journal_reply_ul_<%=@jfm.m_parent_id%>').append(pre_append);
-    $('#project_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
+            pre_append.fadeIn(600);
-    var textarea1 = $('#course_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
+            var textarea = $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
-    textarea1.val('');
+            textarea.val('');
-    $('#course_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
+            $('#project_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
-	setMaxLengthItem(pre_append.find('textarea')[0]);
+            var textarea1 = $('#course_respond_form_<%=@jfm.m_reply_id.to_s%> textarea');
-  <% end %>
+            textarea1.val('');
-
+            $('#course_respond_form_<%=@jfm.m_reply_id.to_s%>').hide();
+            setMaxLengthItem(pre_append.find('textarea')[0]);
+        <% end %>
+    <% end %>
 <% else %>
-	alert("<%= l(:label_feedback_fail) %>");
+    alert("<%= l(:label_feedback_fail) %>");
 <% end %>

config/locales/mailers/zh.yml

@@ -27,4 +27,5 @@ zh:
   mail_homework_endtime: "作业截止时间快到了！"
   mail_homework: "作业："
   mail_anonymous_comment_close: "作业匿评已经关闭！"
-  mail_anonymous_comment_open: "作业匿评已经开启！"
+  mail_anonymous_comment_open: "作业匿评已经开启！"
+  mail_anonymous_comment_failed: "作业匿评开启失败!"

config/routes.rb

@@ -257,9 +257,6 @@ RedmineApp::Application.routes.draw do
   match 'welcome/contest',  :via => :get
   # end longjun
 
-  #added by baiyu
-  match 'git_usage/ch_usage',  :via => :get, :as => 'ch_usage'
-  match 'git_usage/en_usage',  :via => :get, :as => 'en_usage'
   #added by nie
   match '/projects/search',  :via => [:get, :post]
   match '/users/search', :via => [:get, :post]
@@ -320,6 +317,8 @@ RedmineApp::Application.routes.draw do
   get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details'
   post '/users/:id/user_activities', :to => 'users#show', :as => "user_activities"
 
+  post '/courses/:id/course_activity', :to => 'courses#show', :as => 'course_activity'
+
   #added by young
   resources :users do
     collection do
@@ -775,6 +774,7 @@ RedmineApp::Application.routes.draw do
       post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
       delete 'join_in/join_group', :to => 'courses#unjoin_group'
       get 'copy_course'
+      match 'course_activity', :to => 'courses#course_activity',  :via => :get, :as => "course_activity"
     end
     collection do
       match 'join_private_courses', :via => [:get, :post]

db/migrate/20150925025200_alter_activities.rb

@@ -0,0 +1,53 @@
+class AlterActivities < ActiveRecord::Migration
+  def up
+    UserActivity.all.each do |activity|
+      if activity.act_type == 'JournalsForMessage'
+        if activity.act
+          unless activity.act.m_parent_id.nil?
+            parent_act = UserActivity.where("act_id = #{activity.act.m_parent_id} and act_type='JournalsForMessage' and container_type='Course'").first
+            if parent_act
+              parent_act.created_at = activity.act.parent.children.maximum("created_on")
+              parent_act.save
+              activity.destroy
+            end
+          end
+        else
+          activity.destroy
+        end
+      end
+    end
+
+      CourseActivity.all.each do |activity|
+        if activity.course_act_type == 'JournalsForMessage'
+          if activity.course_act
+            unless activity.course_act.m_parent_id.nil?
+              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.m_parent_id} and course_act_type='JournalsForMessage'").first
+              if parent_act
+                parent_act.created_at = activity.course_act.parent.children.maximum("created_on")
+                parent_act.save
+                activity.destroy
+              end
+            end
+          else
+            activity.destroy
+          end
+        elsif activity.course_act_type == 'Message'
+          if activity.course_act
+            unless activity.course_act.parent_id.nil?
+              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.parent_id} and course_act_type='Message'").first
+              if parent_act
+                parent_act.created_at = activity.course_act.parent.children.maximum("created_on")
+                parent_act.save
+                activity.destroy
+              end
+            end
+          else
+            activity.destroy
+          end
+        end
+      end
+  end
+
+  def down
+  end
+end

db/migrate/20150925060939_update_course_activities_updated_at.rb

@@ -0,0 +1,16 @@
+class UpdateCourseActivitiesUpdatedAt < ActiveRecord::Migration
+  def up
+    count = CourseActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      CourseActivity.page(i).per(30).each do |activity|
+        activity.updated_at = activity.created_at
+        activity.save
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20150928090128_add_status_to_forge_message.rb

@@ -0,0 +1,5 @@
+class AddStatusToForgeMessage < ActiveRecord::Migration
+  def change
+    add_column :forge_messages, :status, :integer
+  end
+end

db/migrate/20150930011457_alter_user_activities_news.rb

@@ -0,0 +1,18 @@
+class AlterUserActivitiesNews < ActiveRecord::Migration
+  def up
+    UserActivity.all.each do |activity|
+      if activity.act_type == 'News'
+        if activity.act
+          activity.created_at = activity.act.created_on
+          activity.updated_at = activity.act.respond_to?("updated_on") ? activity.act.updated_on : activity.act.created_on
+          activity.save
+        else
+          activity.destroy
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end

lib/tasks/homework_endtime.rake

@@ -3,16 +3,14 @@
 namespace :homework_endtime do
   desc "send a message for Job deadline"
   task :message => :environment do
-    current_day = Date.today.day
+    contrast_time = Time.now - 86400
-    homework_commons = HomeworkCommon.where("end_time >=?",Date.today)
+    homework_commons = HomeworkCommon.where("end_time >=? and end_time <=?",contrast_time, Time.now)
     homework_commons.each do |homework_common|
       if CourseMessage.where("course_message_type =? and course_message_id =? and status =?", "HomeworkCommon", homework_common.id, 1).first.nil?
-        if homework_common.end_time.day - Date.today.day < 2 && homework_common.end_time.year == Date.today.year
+        homework_common.course.student.each do |s|
-          homework_common.course.student.each do |s|
+          homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :status => true)
-            homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :status => true)
+          # 发送邮件通知
-            # 发送邮件通知
+          Mailer.homework_endtime__added(homework_common, s.student_id).deliver
-            Mailer.homework_endtime__added(homework_common, s.student_id).deliver
-          end
         end
       end
     end

lib/tasks/homework_evaluation.rake

@@ -26,12 +26,13 @@ namespace :homework_evaluation do
           end
           homework_detail_manual.update_column('comment_status', 2)
           # 匿评开启消息邮件通知，# 所有人
+          #send_message_anonymous_comment(homework_common, 2)
           course = homework_common.course
           course.members.each do |m|
             homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
           end
           # 邮件通知
-          Mailer.send_mail_anonymous_comment_close(homework_common).deliver
+          Mailer.send_mail_anonymous_comment_open(homework_common).deliver
         else
           #作业数小于2，启动失败, 只给老师发
           # status==4 发送失败
@@ -43,7 +44,7 @@ namespace :homework_evaluation do
             end
           end
           # 邮件通知
-          # Mailer.send_mail_anonymous_comment_close(homework_common).deliver
+          Mailer.send_mail_anonymous_comment_fail(homework_common).deliver
         end
       end
     end

lib/tasks/issue_due_date.rake

@@ -0,0 +1,21 @@
+#coding=utf-8
+namespace :issue_due_date do
+  desc "send a message for Issue'due_date deadline"
+  task :end_time => :environment do
+    contrast_time = Time.now - 86400
+    issues = Issue.where("due_date >=? and due_date <=?",contrast_time,Time.now)
+    issues.each do |issue|
+      if ForgeMessage.where("forge_message_type =? and forge_message_id =? and status =?", "Issue", issue.id, 1).first.nil?
+        recipients = []
+        assigner = User.find(issue.assigned_to_id)
+        recipients << issue.author
+        recipients << assigner
+        recipients.each do |r|
+          issue.forge_messages << ForgeMessage.new(:user_id => r.id, :project_id => issue.project_id, :viewed => false, :status => 1)
+          # 发送邮件通知
+          # Mailer.homework_endtime__added(homework_common, s.student_id).deliver
+        end
+      end
+    end
+  end
+end

public/assets/kindeditor/kindeditor.js

@@ -264,7 +264,7 @@ K.options = {
 	minHeight : 100,
 	minChangeSize : 50,
 	zIndex : 811213,
-	items : ['emoticons','fontname',
+	items : ['code','emoticons','fontname',
         'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
 		'formatblock', 'fontsize', '|','indent', 'outdent',
 		 '|','imagedirectupload','table',   'media', 'preview',"more"
@@ -4986,7 +4986,7 @@ KEditor.prototype = {
         htmlList.unshift('<div style="display:block" id="define"/>')
         htmlList.push('</div>')
         var htmlListFull = [];
-        var fullItems =  ['emoticons','fontname',
+        var fullItems =  ['code','emoticons','fontname',
             'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter',  'insertorderedlist', 'insertunorderedlist', '|',
             'formatblock', 'fontsize', '|', 'indent', 'outdent',
               '|','imagedirectupload','table',   'media', 'preview', "less",
@@ -5031,7 +5031,7 @@ KEditor.prototype = {
 			height : editHeight > 0 && _removeUnit(height) > self.minHeight ? editHeight : self.minHeight,
 			src : editDiv,
 			srcElement : self.srcElement,
-			designMode : self.designMode,
+			designMode : true,
 			themesPath : self.themesPath,
 			bodyClass : self.bodyClass,
 			cssPath : self.cssPath,
@@ -5063,12 +5063,12 @@ KEditor.prototype = {
 				_bindTabEvent.call(self);
 				_bindFocusEvent.call(self);
 				edit.afterChange(function(e) {
-					if (!edit.designMode) {
+//					if (!edit.designMode) {
-						return;
+//						return;
-					}
+//					}
 					self.updateState();
 					self.addBookmark();
-                    prettyPrint("",self.edit.doc.body);
+                    //prettyPrint("",self.edit.doc.body);
 					if (self.options.afterChange) {
 						self.options.afterChange.call(self);
 					}

public/assets/kindeditor/plugins/code/previewcode.css

@@ -1,79 +1,47 @@
-/* Pretty printing styles. Used with prettify.js. */
+.ke-content {
-
+    font-size: 10pt;
-/* SPAN elements with the classes below are added by prettyprint. */
+}
-.pln { color: #000 }  /* plain text */
+.ke-content pre {
-
+    font-size:9pt;
-@media screen {
+    font-family:Courier New,Arial;
-    .str { color: #080 }  /* string content */
+    border:1px solid #ddd;
-    .kwd { color: #008 }  /* a keyword */
+    border-left:5px solid #6CE26C;
-    .com { color: #800 }  /* a comment */
+    background:#f6f6f6;
-    .typ { color: #606 }  /* a type name */
+    padding:5px;
-    .lit { color: #066 }  /* a literal value */
-    /* punctuation, lisp open bracket, lisp close bracket */
-    .pun, .opn, .clo { color: #660 }
-    .tag { color: #008 }  /* a markup tag name */
-    .atn { color: #606 }  /* a markup attribute name */
-    .atv { color: #080 }  /* a markup attribute value */
-    .dec, .var { color: #606 }  /* a declaration; a variable name */
-    .fun { color: red }  /* a function name */
 }
 
-/* Use higher contrast and text-weight for printable form. */
+.ke-content code {
-@media print, projection {
+    margin: 0 2px;
-    .str { color: #060 }
+    padding: 0 5px;
-    .kwd { color: #006; font-weight: bold }
+    white-space: nowrap;
-    .com { color: #600; font-style: italic }
+    border: 1px solid #DDD;
-    .typ { color: #404; font-weight: bold }
+    background-color: #F6F6F6;
-    .lit { color: #044 }
+    border-radius: 3px;
-    .pun, .opn, .clo { color: #440 }
-    .tag { color: #006; font-weight: bold }
-    .atn { color: #404 }
-    .atv { color: #060 }
 }
 
-/* Put a border around prettyprinted code snippets. */
+.ke-content pre>code {
-pre.prettyprint { padding: 2px;
+    margin: 0;
-    border-left:1px solid #ccc;
+    padding: 0;
-    border-bottom: 1px solid #ccc;
+    white-space: pre;
-    border-right: 1px solid #ccc,
+    border: none;
-border-top: 1px solid #ccc }
+    background: transparent;
+}
 
-pre li,ol li {
+.ke-content pre code {
-    list-style-type: decimal;
+    background-color: transparent;
+    border: none;
 }
-ul li{
+
-    list-style-type: disc;
+.ke-content p {
+    /*margin: 0 0 15px 0;*/
+    /*margin-bottom:15pt;*/
+    line-height:1.5;
+    letter-spacing: 1px;
 }
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */
-li.L0,
-li.L1,
-li.L2,
-li.L3,
-li.L5,
-li.L6,
-li.L7,
-li.L8 { list-style-type: decimal }
-/* Alternate shading for lines */
-li.L1,
-li.L3,
-li.L5,
-li.L7,
-li.L9 { background: #eee }
 
-.prettyprint *{font-family:'courier new',monospace;}
+.ke-content div.ref {border:1px solid #ddd;margin:0 0 10px 0;padding:2px;font-size:9pt;background:#ffe;}
-/*.prettyprint .com { color: #93a1a1; }*/
+.ke-content div.ref h4 {margin:0;padding:1px 3px;background:#CC9966;color:#fff;font-size:9pt;font-weight:normal;}
-/*.prettyprint .lit { color: #AE81FF; }*/
+.ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}
-/*.prettyprint .pun,*/
+
-/*.prettyprint .opn,*/
+
-/*.prettyprint .clo { color: #F8F8F2; }*/
+.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
-/*.prettyprint .fun { color: #dc322f; }*/
-/*.prettyprint .str,*/
-/*.prettyprint .atv { color: #E6DB74; }*/
-/*.prettyprint .kwd,*/
-/*.prettyprint .tag { color: #F92659; }*/
-/*.prettyprint .typ,*/
-/*.prettyprint .atn,*/
-/*.prettyprint .dec,*/
-/*.prettyprint .var { color: #A6E22E; }*/
-/*.prettyprint .pln { color: #66D9EF; }*/

public/assets/kindeditor/plugins/emoticons/emoticons.js

@@ -13,7 +13,7 @@ KindEditor.plugin('emoticons', function(K) {
 		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
 		currentPageNum = 1;
 	self.clickToolbar(name, function() {
-		this.edit.focus();//如果没有这句 火狐下取不到焦点 导致_getSel()为空 报错 
+		this.edit.focus();//<EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>_getSel()Ϊ<><CEAA> <20><><EFBFBD><EFBFBD> 
 		var rows = 5, cols = 9, total = 135, startNum = 0,
 			cells = rows * cols, pages = Math.ceil(total / cells),
 			colsHalf = Math.floor(cols / 2),
@@ -55,6 +55,9 @@ KindEditor.plugin('emoticons', function(K) {
 				K(this).removeClass('ke-on');
 			});
 			cell.click(function(e) {
+                if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){
+                    self.edit.html('');
+                }
 				self.insertHtml('<img src="' + path + num + '.gif" border="0" alt="" />').hideMenu().focus();
 				e.stop();
 			});

public/javascripts/course.js

@@ -410,22 +410,6 @@ function show_bid_dead_line(year,month,day,divname)
     + "<p class='fr'>作品提交还剩：</p>");
 }
 
-//验证新建作业的名字
-function regex_homework_name()
-{
-    var name = $.trim($("#homework_name").val());
-
-    if(name=="")
-    {
-        $("#homework_name_span").text("名称不能为空");
-        return false;
-    }
-    else
-    {
-        $("#homework_name_span").text("");
-        return true;
-    }
-}
 
 //处理迟交、缺评扣分
 function check_late_penalty(id)
@@ -446,63 +430,45 @@ function check_late_penalty(id)
 }
 
 //验证匿评数量
-function regex_evaluation_num()
+//function regex_evaluation_num()
-{
+//{
-    if($("#evaluation_num").length == 0){ return true;}
+//    if($("#evaluation_num").length == 0){ return true;}
-    var evaluation_num = $.trim($("#evaluation_num").val());
+//    var evaluation_num = $.trim($("#evaluation_num").val());
-    var regex = /^\d+$/;
+//    var regex = /^\d+$/;
-    if(evaluation_num=="")
+//    if(evaluation_num=="")
-    {
+//    {
-        $("#evaluation_num_notice").html("匿评分配数量不能为空");
+//        $("#evaluation_num_notice").html("匿评分配数量不能为空");
-        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
+//        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
-        return false;
+//        return false;
-    }
+//    }
-    else if(regex.test(evaluation_num))
+//    else if(regex.test(evaluation_num))
-    {
+//    {
-        if(evaluation_num > 0)
+//        if(evaluation_num > 0)
-        {
+//        {
-            $("#evaluation_num_notice").html("每个学生将收到<span class='c_red'>&nbsp;"+ parseInt(evaluation_num) + "&nbsp;</span>份待匿评作品");
+//            $("#evaluation_num_notice").html("每个学生将收到<span class='c_red'>&nbsp;"+ parseInt(evaluation_num) + "&nbsp;</span>份待匿评作品");
-            $("#evaluation_num_notice").removeClass("c_red");
+//            $("#evaluation_num_notice").removeClass("c_red");
-            return true;
+//            return true;
-        }
+//        }
-        else
+//        else
-        {
+//        {
-            $("#evaluation_num_notice").html("匿评分配数量必须为大于0");
+//            $("#evaluation_num_notice").html("匿评分配数量必须为大于0");
-            $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
+//            $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
-            return false;
+//            return false;
-        }
+//        }
-    }
+//    }
-    else
+//    else
-    {
+//    {
-        $("#evaluation_num_notice").html("匿评分配数量只能为数字");
+//        $("#evaluation_num_notice").html("匿评分配数量只能为数字");
-        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
+//        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
-        return false;
+//        return false;
-    }
+//    }
-}
+//}
 
 //点击是否开启匿评单选框效果
 $(function(){
-    //$("#homework_common_homework_type").click(function(){
-    //    if($("#homework_common_homework_type").attr("checked") == "checked")
-    //    {
-    //        $("#evaluation_setting").slideDown();
-    //        $("#ta_proportion").removeAttr("disabled");
-    //    }
-    //    else
-    //    {
-    //        $("#evaluation_setting").slideUp();
-    //        $("#ta_proportion").attr("disabled","disabled");
-    //    }
-    //});
-
     $("#absence_penalty").change(function(){
         $("#absence_penalty_notice").html("&nbsp;"+ $("#absence_penalty").val() +"&nbsp;");
     });
-
-    //$("#ta_proportion").change(function(){
-    //    var ta_proportion = $("#ta_proportion").val();
-    //    $("#student_proportion").val((100 - parseInt(ta_proportion * 100)) + "%");
-    //});
 });
 
 //生成select
@@ -519,38 +485,144 @@ function build_selector(max_num){
     return html;
 }
 
-//第一次加载时，如果未开启匿评作业，隐藏显示匿评配置信息
+//提交匿评参数设置
-//$(function(){
+function submit_set_evaluation_attr(end_time){
-//    if($("#homework_common_homework_type").attr("id") != null && $("#homework_common_homework_type").val() != 2)
+    if(!regex_evaluation_start(end_time)){
-//    {
+        $("#evaluation_start_time").focus();
-//        if($("#homework_common_homework_type").attr("checked") == "checked")
+    }
-//        {
+    else if(!regex_evaluation_end()){
-//            $("#evaluation_setting").show();
+        $("#evaluation_end_time").focus();
-//            $("#ta_proportion").removeAttr("disabled");
+    }
-//        }
+    else if(!regex_evaluation_num()){
-//        else
+        $("#evaluation_num").focus();
-//        {
+    }
-//            $("#evaluation_setting").hide();
+    else{
-//            $("#ta_proportion").attr("disabled","disabled");
+        $('#popbox02 form').submit();
-//        }
+    }
-//    }
+}
-//});
+
+//验证匿评开启时间：大于截止时间,或者为空
+function regex_evaluation_start(end_time){
+    var evaluation_start = $.trim($("#evaluation_start_time").val());
+    if(evaluation_start == ""){
+        $("#homework_evaluation_start_time").text("开启匿评日期不能为空");
+        return false;
+    }
+    var end_time = new Date(end_time);
+    var evaluation_start_time = new Date(evaluation_start);
+    if(evaluation_start_time > end_time){
+        $("#homework_evaluation_start_time").text("");
+        return true;
+    }else{
+        $("#homework_evaluation_start_time").text("开启匿评日期必须大于截止日期");
+        return false;
+    }
+}
+
+//验证匿评结束时间：大于匿评开启时间,或者为空。当匿评开启时间为空时，匿评结束时间必须为空
+function regex_evaluation_end(){
+    var evaluation_start = $.trim($("#evaluation_start_time").val());
+    var evaluation_end = $.trim($("#evaluation_end_time").val());
+    if(evaluation_end == ""){
+        $("#homework_evaluation_end_time").text("关闭匿评日期不能为空");
+        return true;
+    }
+    var evaluation_start_time = new Date(evaluation_start);
+    var evaluation_end_time = new Date(evaluation_end);
+    if(evaluation_end_time > evaluation_start_time){
+        $("#homework_evaluation_end_time").text("");
+        return true;
+    }else{
+        $("#homework_evaluation_end_time").text("关闭匿评日期必须大于开启匿评日期");
+        return false;
+    }
+}
+
+//验证匿评数量
+function regex_evaluation_num(){
+    var evaluation_num = $.trim($("#evaluation_num").val());
+    var regex = /^\d+$/;
+    if(evaluation_num==""){
+        $("#evaluation_num_notice").text("匿评人数不能为空");
+        return false;
+    }
+    else if(regex.test(evaluation_num)){
+        if(evaluation_num > 0){
+            $("#evaluation_num_notice").html("");
+            return true;
+        }
+        else{
+            $("#evaluation_num_notice").text("匿评人数必须为大于0");
+            return false;
+        }
+    }
+    else{
+        $("#evaluation_num_notice").text("匿评人数只能为数字");
+        return false;
+    }
+}
 
 //老师提交 新建/修改 作业
-function submit_homework(id)
+function submit_homework(id){
+    if(!regex_homework_name()){
+        $("#homework_name").focus();
+    }
+    else if(!regex_homework_end_time()){
+        $("#homework_end_time").focus();
+    }
+    else if(!regex_course_id()){
+        $("#course_id").focus();
+    }
+    else{
+        homework_description_editor.sync();
+        $("#"+id).submit();
+    }
+}
+
+//验证新建作业的名字
+function regex_homework_name()
 {
-    if(!regex_homework_name())
+    var name = $.trim($("#homework_name").val());
+
+    if(name=="")
     {
-        $("#homework_name").focus();
+        $("#homework_name_span").text("名称不能为空");
+        return false;
     }
-    else if(!regex_evaluation_num())
+    else
     {
-        $("#evaluation_num").focus();
+        $("#homework_name_span").text("");
+        return true;
+    }
+}
+//验证截止时间
+function regex_homework_end_time()
+{
+    var name = $.trim($("#homework_end_time").val());
+    if(name=="")
+    {
+        $("#homework_end_time_span").text("截止时间不能为空");
+        return false;
     }
     else
     {
-        homework_description_editor.sync();
+        $("#homework_end_time_span").text("");
-        $("#"+id).submit();
+        return true;
+    }
+}
+
+//验证发送到课程
+function regex_course_id(){
+    var course_id = $("#course_id").val();
+    if(course_id == -1)
+    {
+        $("#homework_course_id_span").text("发布课程不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_course_id_span").text("");
+        return true;
     }
 }
 
@@ -661,7 +733,7 @@ $(document).ready(function () {
 // 日历选择日期后关闭
 function regexDeadLine()
 {
-    ('#ui-datepicker-div').hide;
+    ('#ui-datepicker-div').hide();
 }
 
 //新建、修改课程明码显示
@@ -672,20 +744,30 @@ $(function(){
 });
 
 //查找TAG资源
+var clickFunction = null; //单击事件函数
+var isdb = false; //是否双击
 function search_tag_attachment(url,tag_name,q,course_id,sort)
 {
     //alert("111");
-    $.get(
+    //clearTimeout(clickFunction);
-        url,
+    clickFunction = setTimeout(function() {
-        {
+        search_func()
-            tag_name: tag_name,
+    }, 500);
-            q: q,
+    function search_func(){
-            course_id:course_id
+        if(isdb!= false ) return;
-        },
+        $.get(
-        function (data) {
+            url,
+            {
+                tag_name: tag_name,
+                q: q,
+                course_id:course_id
+            },
+            function (data) {
+
+            }
+        );
+    }
 
-        }
-    );
 }
 
 // 课程讨论区
@@ -935,6 +1017,11 @@ function clickOK(path)
         }
     });
 }
+//关闭引入资源弹框
+function hideResource(){
+    $('#ajax-modal').parent().removeClass("popbox").removeClass("referenceResourcesPopup");
+    hideModal();
+}
 //查询
 function SearchByName(url,event)
 {
@@ -986,3 +1073,94 @@ function show_student_work(url){
         }
     );
 }
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+var autoTextarea2 = function (elem,elem2, extra, maxHeight) {
+    extra = extra || 0;
+    var isFirefox = !!document.getBoxObjectFor || 'mozInnerScreenX' in window,
+        isOpera = !!window.opera && !!window.opera.toString().indexOf('Opera'),
+        addEvent = function (element, type, callback) {
+            element.addEventListener ?
+                element.addEventListener(type, callback, false) :
+                element.attachEvent('on' + type, callback);
+        },
+        getFirstStyle = elem.currentStyle ? function (name) {
+            var val = elem.currentStyle[name];
+
+            if (name === 'height' && val.search(/px/i) !== 1) {
+                var rect = elem.getBoundingClientRect();
+                return rect.bottom - rect.top -
+                    parseFloat(getFirstStyle('paddingTop')) -
+                    parseFloat(getFirstStyle('paddingBottom')) + 'px';
+            };
+
+            return val;
+        } : function (name) {
+            return getComputedStyle(elem, null)[name];
+        },
+        minHeight = parseFloat(getFirstStyle('height'))
+
+    elem.style.resize = 'none';
+    elem2.style.resize = 'none';
+    var change = function () {
+        var scrollTop, height,
+            padding = 0,
+            style = elem.style,
+            style2 = elem2.style;
+
+
+        if (elem._length === elem.value.length) return;
+        elem._length = elem.value.length;
+        elem2._length = elem._length;
+        if (!isFirefox && !isOpera) {
+            padding = parseInt(getFirstStyle('paddingTop')) + parseInt(getFirstStyle('paddingBottom'));
+        };
+        scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+
+        elem.style.height = minHeight + 'px';
+        elem2.style.height = minHeight + 'px';
+        if (elem.scrollHeight > minHeight) {
+            if (maxHeight && elem.scrollHeight > maxHeight) {
+                height = maxHeight - padding;
+                style.overflowY = 'auto';
+                style2.overflowY = 'auto';
+            } else {
+                height = elem.scrollHeight - padding;
+                style.overflowY = 'hidden';
+                style2.overflowY = 'hidden';
+            };
+            style.height = height + extra + 'px';
+            style2.height = height + extra + 'px';
+            scrollTop += parseInt(style.height) - elem.currHeight;
+            document.body.scrollTop = scrollTop;
+            document.documentElement.scrollTop = scrollTop;
+            elem.currHeight = parseInt(style.height);
+        };
+        if (elem2.scrollHeight > minHeight) {
+            if (maxHeight && elem2.scrollHeight > maxHeight) {
+                height = maxHeight - padding;
+                style.overflowY = 'auto';
+                style2.overflowY = 'auto';
+            } else {
+                height = elem2.scrollHeight - padding;
+                style.overflowY = 'hidden';
+                style2.overflowY = 'hidden';
+            };
+            style.height = height + extra + 'px';
+            style2.height = height + extra + 'px';
+            scrollTop += parseInt(style2.height) - elem2.currHeight;
+            document.body.scrollTop = scrollTop;
+            document.documentElement.scrollTop = scrollTop;
+            elem2.currHeight = parseInt(style2.height);
+        };
+    };
+
+    addEvent(elem, 'propertychange', change);
+    addEvent(elem, 'input', change);
+    addEvent(elem, 'focus', change);
+    addEvent(elem2, 'propertychange', change);
+    addEvent(elem2, 'input', change);
+    addEvent(elem2, 'focus', change);
+    change();
+};

public/javascripts/homework.js

@@ -184,6 +184,14 @@ $(function(){
     $("#BluePopupBox").on('click', 'a.icon_add', function(){
         var html = bt('t:test-answer-list', null);
         $(this).parent('.mt10').after(html);
+        var inputs = document.getElementsByName("program[input][]");
+        var outputs = document.getElementsByName("program[output][]");
+        if (inputs.length == outputs.length) {
+            for (var i=0; i<inputs.length; i++) {
+                autoTextarea2(inputs[i], outputs[i]);
+                autoTextarea2(outputs[i], inputs[i]);
+            }
+        }
 
     });
     $("#BluePopupBox").on('click', 'a.icon_remove', function(){

public/javascripts/new_user.js

@@ -63,17 +63,10 @@ function submit_homework(id){
     else if(!regex_homework_end_time()){
         $("#homework_end_time").focus();
     }
-    //else if(!regex_evaluation_start()){
-    //    $("#evaluation_start_time").focus()
-    //}
-    //else if(!regex_evaluation_end()){
-    //    $("#evaluation_end_time").focus()
-    //}
     else if(!regex_course_id()){
         $("#course_id").focus();
     }
     else{
-
         homework_description_editor.sync();
         $("#"+id).submit();
     }
@@ -419,6 +412,11 @@ function clickOK(path)
         }
     });
 }
+//关闭引入资源弹框
+function hideResource(){
+    $('#ajax-modal').parent().removeClass("popbox").removeClass("referenceResourcesPopup");
+    hideModal();
+}
 /////////////////////////////////////////////////////////////////////////////////////////
 
 var autoTextarea2 = function (elem,elem2, extra, maxHeight) {

public/javascripts/project.js

@@ -96,29 +96,29 @@ function show_more_reply1(contentid, id2, id3) {
     }
 }
 //项目版本库git帮助文档显示
-function showhelpAndScrollTo(id) {
+//function showhelpAndScrollTo(id) {
-    $('#' + id).toggle();
+//    $('#' + id).toggle();
-    if(cookieget("repositories_visiable") == "true")
+//    if(cookieget("repositories_visiable") == "true")
-    {
+//    {
-        cookiesave("repositories_visiable", false,'','','');
+//        cookiesave("repositories_visiable", false,'','','');
-    }
+//    }
-    else
+//    else
-    {
+//    {
-        cookiesave("repositories_visiable", true,'','','');
+//        cookiesave("repositories_visiable", true,'','','');
-    }
+//    }
-    var information = $("#showgithelp");
+//    var information = $("#showgithelp");
-    var val = information.attr("value");
+//    var val = information.attr("value");
-    if(val=="show_help")
+//    if(val=="show_help")
-    {
+//    {
-        $("#showgithelp").text("收起Git操作指南");
+//        $("#showgithelp").text("收起Git操作指南");
-        information.attr("value", "hide_help");
+//        information.attr("value", "hide_help");
-    }
+//    }
-    else
+//    else
-    {
+//    {
-        $("#showgithelp").text("展开Git操作指南");
+//        $("#showgithelp").text("展开Git操作指南");
-        information.attr("value", "show_help");
+//        information.attr("value", "show_help");
-    }
+//    }
-}
+//}
 function showhelpAndScrollToMessage(id, id1, count) {
     $('#' + id).toggle();
     if(cookieget("repositories_visiable") == "true")