Merge branch 'szzh' into develop

app/controllers/comments_controller.rb

@@ -27,7 +27,12 @@ class CommentsController < ApplicationController
     raise Unauthorized unless @news.commentable?
 
     @comment = Comment.new
-    @project ? @comment.comments = params[:comment][:comments] : @comment.comments = params[:comment]
+    #@project ? @comment.comments = params[:comment][:comments] : @comment.comments = params[:comment]
+    if params[:user_activity_id]
+      @comment.comments = params[:comment]
+    else
+      @comment.comments = params[:comment][:comments]
+    end
     @comment.author = User.current
     if @news.comments << @comment
       if params[:asset_id]
@@ -48,7 +53,7 @@ class CommentsController < ApplicationController
       #   end
       # end
       # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
-      flash[:notice] = l(:label_comment_added)
+      #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

app/controllers/courses_controller.rb

@@ -293,10 +293,15 @@ class CoursesController < ApplicationController
           @all_members = searchTeacherAndAssistant(@course)
           @members =  @all_members
         when '2'
-          @subPage_title = l :label_student_list
-          page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-          @all_members = student_homework_score(0,page, 10,"desc")
-          @members =  @all_members
+          if @course.open_student == 1 || User.current.member_of_course?(@course)
+            @subPage_title = l :label_student_list
+            page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
+            @all_members = student_homework_score(0,page, 10,"desc")
+            @members =  @all_members
+          else
+            render_403
+            return
+          end
       end
       respond_to do |format|
         if params[:page]

app/controllers/homework_common_controller.rb

@@ -63,6 +63,7 @@ class HomeworkCommonController < ApplicationController
       end
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
+      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1
 
       homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
       if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0

app/controllers/news_controller.rb

@@ -69,20 +69,25 @@ class NewsController < ApplicationController
     elsif @course
       if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
         scope = @course ? @course.news.course_visible : News.course_visible
+        news_arr = scope.map{|news| news.id}
 
+
+        @page = params[:page] ? params[:page].to_i + 1 : 0
+        news_page = @page *10
         @news_count = scope.count
+        @is_new = params[:is_new]
         @q = params[:subject]
         if params[:subject].nil? || params[:subject].blank?
-          scope_order = scope.all(:include => [:author, :course],
-                                  :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC")
+          scope_order = scope.reorder("#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC").limit(10).offset(news_page).includes(:author,:course).all()
+              #all(:include => [:author, :course],
+                                  #:order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC").limit(10).offset(news_page)
         else
-          scope_order = scope.where("#{News.table_name}.title like '#{'%' << params[:subject].to_s << '%'}'").all(:include => [:author, :course],
-                                                                                    :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC")
+          scope_order = scope.where("#{News.table_name}.title like '#{'%' << params[:subject].to_s << '%'}'").reorder("#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC").limit(10).offset(news_page).includes(:author,:course).all()
+          #.all(:include => [:author, :course],:order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC")
         end
 
-                           # :offset => @offset,
-                           # :limit => @limit)
-        @newss = paginateHelper scope_order,10
+        @newss = scope_order
+        #@newss = paginateHelper scope_order,10
         respond_to do |format|
           format.html {
             @news = News.new
@@ -130,6 +135,7 @@ class NewsController < ApplicationController
     result = cs.show_course_news params,User.current
     @news = result[:news]
     @comments =  result[:comments]
+    @comment = Comment.new
     #@comments = @news.comments
     #@comments.reverse! if User.current.wants_comments_in_reverse_order?
     #modify by nwb
@@ -147,7 +153,22 @@ class NewsController < ApplicationController
       @news = News.new(:project => @project, :author => User.current)
     elsif @course
       @news = News.new(:course => @course, :author => User.current)
-      render :layout => 'base_courses'
+      #render :layout => 'base_courses'
+      @news.safe_attributes = params[:news]
+      @news.save_attachments(params[:attachments])
+      if @news.save
+        if params[:asset_id]
+          ids = params[:asset_id].split(',')
+          update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
+        end
+        render_attachment_warning_if_needed(@news)
+        #flash[:notice] = l(:notice_successful_create)
+        redirect_to course_news_index_url(@course)
+      else
+        redirect_to course_news_index_url(@course)
+        #layout_file =  'base_courses'
+        #render :action => 'new', :layout => layout_file
+      end
     end
   end
 
@@ -210,7 +231,7 @@ class NewsController < ApplicationController
     @news.save_attachments(params[:attachments])
     if @news.save
       render_attachment_warning_if_needed(@news)
-      flash[:notice] = l(:notice_successful_update)
+      #flash[:notice] = l(:notice_successful_update)
       redirect_to news_url(@news)
     else
       #flash[:error] = l(:notice_successful_update)

app/controllers/organizations_controller.rb

@@ -98,7 +98,7 @@ class OrganizationsController < ApplicationController
             @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
         end
       end
-      @page = params[:page]
+      @page = params[:page] || 1
       respond_to do |format|
         format.html
         format.js

app/controllers/repositories_controller.rb

@@ -31,8 +31,8 @@ class RepositoriesController < ApplicationController
   default_search_scope :changesets
 
   before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo]
-  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers, :forked]
-  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab]
+  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
+  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
   before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
   accept_rss_auth :revisions
@@ -64,6 +64,8 @@ class RepositoriesController < ApplicationController
   end
 
   def forked
+    @project = Project.find(params[:id])
+    @repository = Repository.where("project_id =? and type =?", @project.id, "Repository::Gitlab")
     # 如果当前用户已经fork过该项目，不会新fork项目，则跳至已fork的项
     unless has_forked?(@project, User.current)
       project = project_from_current_project(@project.id, User.current.id)
@@ -76,7 +78,11 @@ class RepositoriesController < ApplicationController
       else
         g = Gitlab.client
         if User.current.gid.nil?
-          g.sync_user(User.current)
+          begin
+            g.sync_user(User.current)
+          ensure
+            logger.error "Synv user failed ==>#{User.current.id}"
+          end
         end
         gproject = g.fork(@project.gpid, User.current.gid)
         if gproject

app/controllers/users_controller.rb

@@ -522,6 +522,7 @@ class UsersController < ApplicationController
         else
           homework.publish_time = params[:homework_common][:publish_time]
         end
+        homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1
         homework.homework_type = params[:homework_type].to_i || 1
         homework.late_penalty = 10
         homework.teacher_priority = 1

app/controllers/zipdown_controller.rb

@@ -1,4 +1,8 @@
-require 'zip'
+#coding=utf-8
+
+require "base64"
+require 'zip'
+
 class ZipdownController < ApplicationController
   #查找项目（课程）
   before_filter :find_project_by_bid_id, :only => [:assort]
@@ -11,7 +15,12 @@ class ZipdownController < ApplicationController
   def download
     if User.current.logged?
       begin
-        send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file])
+        if params[:base64file]
+          file = Base64.decode64(params[:base64file])
+          send_file "#{OUTPUT_FOLDER}/#{file}", :filename => filename_for_content_disposition(file), :type => detect_content_type(file)
+        else
+          send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file])
+        end
       rescue => e
         render file: 'public/no_file_found.html'
       end
@@ -107,7 +116,9 @@ class ZipdownController < ApplicationController
               bid_homework_path, OUTPUT_FOLDER)
     }
     [{files:[out_file.file_path], count: 1, index: 1,
-      real_file: out_file.file_path,  file: File.basename(out_file.file_path),
+      real_file: out_file.file_path,
+      file: File.basename(out_file.file_path),
+      base64file: Base64.encode64(File.basename(out_file.file_path)),
       size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
      }]
   end
@@ -129,7 +140,9 @@ class ZipdownController < ApplicationController
               bid_homework_path, OUTPUT_FOLDER)
     }
     [{files:[out_file.file_path], count: 1, index: 1,
-      real_file: out_file.file_path,  file: File.basename(out_file.file_path),
+      real_file: out_file.file_path,
+      file: File.basename(out_file.file_path),
+      base64file: Base64.encode64(File.basename(out_file.file_path)),
       size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
      }]
   end

app/helpers/application_helper.rb

@@ -253,8 +253,10 @@ module ApplicationHelper
         subject = truncate(subject, :length => 60)
       end
     end
-    if issue.status_id == 5
+    if issue.status_id == 3
       s = link_to text, issue_path(issue), :class => "text_line_s", :title => title
+    elsif issue.status_id == 5
+      s = link_to text, issue_path(issue), :class => "text_line_s del_line", :title => title
     else
       s = link_to text, issue_path(issue), :class => "c_blue", :title => title
     end

app/models/mailer.rb

@@ -394,7 +394,7 @@ class Mailer < ActionMailer::Base
     @issue = issue
     user = User.find_by_mail(recipients)
     @user = user
-    @token = Token.get_token_from_user(user, 'autologin')
+    # @token = Token.get_token_from_user(user, 'autologin')
     @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
 
     # edit
@@ -436,15 +436,15 @@ class Mailer < ActionMailer::Base
 
     user = User.find_by_mail(recipients)
     @user = user
-    @token = Token.get_token_from_user(user, 'autologin')
+    # @token = Token.get_token_from_user(user, 'autologin')
 
 
     # edit
-    @issue_author_url = url_for(:controller  => 'users', :action => 'show', :id => issue.author_id,  :token => @token.value)
-    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
-    @user_url = url_for(my_account_url(user,:token => @token.value))
+    @issue_author_url = url_for(:controller  => 'users', :action => 'show', :id => issue.author_id)
+    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id)
+    @user_url = url_for(my_account_url(user))
 
-    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
+    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}")
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject

app/models/user.rb

@@ -344,7 +344,8 @@ class User < Principal
     user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
     user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
     system_messages_count = SystemMessage.where("created_at >?", User.current.onclick_time.onclick_time).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count
+    at_count = AtMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count
   end
 
   # 查询指派给我的缺陷记录

app/views/blog_comments/_blog_attachments.erb

@@ -57,7 +57,7 @@
                                :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
                                :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
                                :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js', :project => container),
+                               :upload_path => uploads_path(:format => 'js'),
                                :description_placeholder => l(:label_optional_description),
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),

app/views/boards/_course_show_detail.html.erb

@@ -59,12 +59,14 @@
     <% end %>
 
     <% if topics.count == 10 %>
-        <div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>
+        <!--<div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%#= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>-->
+        <%= link_to "点击展开更多",boards_topic_path(@board, :course_id => @board.course.id ,:page => page),:id => "show_more_course_topic",:remote => "true",:class => "loadMore mt10 f_grey"%>
     <% end %>
 <% end%>
 
+<!--
 <script type="text/javascript">
     $("#show_more_course_topic").mouseover(function () {
         $("#more_topic_link").click();
     });
-</script>
+</script>-->

app/views/courses/_course_activity.html.erb

@@ -114,11 +114,13 @@
 <% 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>
+    <!--<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>-->
+    <%= link_to "点击展开更多",course_activity_path(@course.id, :type => type, :page => page),:id => "show_more_course_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end %>
 
+<!--
 <script type="text/javascript">
     $("#show_more_course_activities").mouseover(function () {
         $("#more_course_activities_link").click();
     });
-</script>
+</script>-->

app/views/exercise/_exercise_student_result.html.erb

@@ -116,8 +116,7 @@
                         √
                     <% else %>
                         ×
-                    <% end %></span><br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first %>
+                    <% end %></span>
                 </div>
                 <div class="cl"></div>
                 <div>

app/views/exercise/_exercise_teacher.html.erb

@@ -95,8 +95,6 @@
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
-                  <br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) if exercise_question.exercise_standard_answers.first%>
                 </div>
                 <div class="cl"></div>
                 <div>

app/views/forums/_file_form.html.erb

@@ -58,7 +58,7 @@
                                :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
                                :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
                                :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js', :project => project),
+                               :upload_path => uploads_path(:format => 'js'),
                                :description_placeholder => l(:label_optional_description),
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),

app/views/homework_common/index.html.erb

@@ -3,6 +3,7 @@
         $("#homework_name").val("");
         $("#homework_publish_time").val("");
         $("#homework_end_time").val("");
+        document.getElementById("anonymous_comment").checked = true;
         $("#course_id").val($("#option_select").val());
         $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true})%>");
         homework_description_editor.html("");

app/views/issues/_list.html.erb

@@ -40,14 +40,14 @@
      <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
  <% end %>
  <% if issues.count == 10%>
-     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
-     <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+     <!--<div id="show_more_issues" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>-->
+     <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
  <% end%>
  <!--<ul class="wlist">-->
    <!--<%#= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>-->
  <!--</ul>-->
- <script type="text/javascript">
+ <!--<script type="text/javascript">
      $("#show_more_issues").mouseover(function(){
          $("#more_issues_link").click();
      });
- </script>
+ </script>-->

app/views/layouts/_footer.html.erb

@@ -12,24 +12,28 @@
 
   <div class="cl"></div>
   <ul class="departments">
+    <!--li class="fl mr10">
+      <strong><%#= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%#= l(:label_hosted_by)%></a>
+    </li>
+    <li class="fl">
+      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%#= l(:label_sponsor)%></a>
+    </li-->
     <li class="fl mr10">
-      <strong><%= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%= l(:label_hosted_by)%></a>
+      <strong><%= l(:label_partners)%></strong>
     </li>
-    <li class="fl">
-      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%= l(:label_sponsor)%></a>
+    <li class="fl mr20">
+      <a href="http://eecs.pku.edu.cn" class="f_grey" target="_blank"><%#= l(:label_co_organizer_EECS)%><img src="/images/footer_logo/PekingUniversity.png" width="121" height="40" style="display: inline-block;" alt="北京大学" /></a>
     </li>
-    <li class="fl mr10">
-      <strong><%= l(:label_partners)%></strong><a href="http://eecs.pku.edu.cn" class="ml10 f_grey" target="_blank"><%= l(:label_co_organizer_EECS)%></a>
+    <li class="fl mr20">
+      <a href="http://scse.buaa.edu.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_BHU)%><img src="/images/footer_logo/BeiHang_university.png" width="173" height="40" style="display: inline-block;" alt="北京航空航天大学" /></a>
     </li>
-    <li class="fl">
-      <a href="http://scse.buaa.edu.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_BHU)%></a>
+    <li class="fl mr20">
+      <a href="http://www.iscas.ac.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_CAS)%><img src="/images/footer_logo/ISCAS_logo.png" width="91" height="40" style="display: inline-block;" alt="ISCAS" /></a>
     </li>
-    <li class="fl">
-      <a href="http://www.iscas.ac.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_CAS)%></a>
-    </li>
-    <li class="fl">
-      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%= l(:label_co_organizer_InforS)%></a>
+    <li class="fl mr20">
+      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_InforS)%><img src="/images/footer_logo/CVICSE.png" width="165" height="40" style="display: inline-block;" alt="中创软件" /></a>
     </li>
+    <li class="fl"><a href="http://www.webxmf.com/" target="_blank"><img src="/images/footer_logo/bee_logo.png" width="167" height="40" style="display: inline-block;" alt="web小蜜蜂" /></a></li>
   </ul>
   <div class="cl"></div>
   <ul class="copyright">

app/views/layouts/base_courses.html.erb

@@ -130,7 +130,7 @@
           <li><%= l(:label_class_period)%> :&nbsp;&nbsp;<span ><%= @course.class_period %> <%= l(:label_class_hour) %></span></li>
           <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= @course.time %> <%= @course.term %></span></li>
           <% if @course.school%>
-            <li><%= l(:label_course_organizers)%> :&nbsp;&nbsp;<a href="http://<%= Setting.host_course%>/?school_id=<%= @course.school.id%>" target="_blank" class="c_dblue"><%= @course.school%></a></li>
+            <li><%= l(:label_course_organizers)%> :&nbsp;&nbsp;<%= @course.school%></li>
           <% end%>
         </ul>
       </div>
@@ -154,7 +154,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%>
-          <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
+          <%= link_to( "", new_course_news_path(@course,:is_new=>1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
         </div>
         <% end %>
         <% unless show_nav?(course_file_num) %>

app/views/layouts/base_org.html.erb

@@ -43,16 +43,16 @@
         <%#= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %>
       </li>
       <% if User.current.logged? %>
-        <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
+          <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
           <span class="orgMenuArrow" id="orgArrow">
             <ul class="org_login_list" style="display:none;">
-              <li> <%= link_to "个人主页",user_path(User.current), :class => "linkGrey8", :target => "_blank" %></li>
-              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>
+              <li> <%= link_to "个人主页",user_path(User.current), :class => "menuGrey", :target => "_blank" %></li>
+              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %></li>
               <!--<li><%#= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>-->
-          </ul>
+            </ul>
           </span>
-        </li>
-        <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="linkGrey8 f14" id="orgUserName"><%= User.current %></a></li>
+          </li>
+          <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="fontGrey2 f14" id="orgUserName"><%= User.current %></a></li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
           <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
@@ -75,141 +75,136 @@
   </div>
 </div>
 <div class="cl"></div>
-  <div class="homepageContentContainer">
-    <div class="homepageContent">
-      <div class="homepageLeft">
-        <div class="homepagePortraitContainer">
-          <!--<div class="pr_info_logo fl mr10 mb5">-->
-            <!--<%#= image_tag(url_to_avatar(@organization), :width=>"60",  :height=>"60", :alt=>"组织logo") %>-->
-          <!--</div>-->
-          <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
-            <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
-            <% if User.current.logged?%>
-                <% if User.current.id == @organization.creator_id%>
-                    <div id="edit_org_file_btn" class="none">
-                      <div class="homepageEditProfile">
-                        <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
-                      </div>
+<div class="homepageContentContainer">
+  <div class="homepageContent">
+    <div class="homepageLeft">
+      <div class="homepagePortraitContainer">
+        <!--<div class="pr_info_logo fl mr10 mb5">-->
+        <!--<%#= image_tag(url_to_avatar(@organization), :width=>"60",  :height=>"60", :alt=>"组织logo") %>-->
+        <!--</div>-->
+        <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
+          <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
+          <% if User.current.logged?%>
+              <% if User.current.id == @organization.creator_id%>
+                  <div id="edit_org_file_btn" class="none">
+                    <div class="homepageEditProfile">
+                      <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
                     </div>
-                <% end %>
-            <% end%>
-          </div>
-          <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
-          <div class="orgName fl mb5 f14">
-            <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
-            <% if User.current.logged? %>
-                <% if @organization.is_public? %>
-                    <span class="img_private"><%= l(:label_public)%></span>
-                <% else %>
-                    <span class="img_private"><%= l(:label_private)%></span>
-                <% end %>
-            <% end %>
-          </div>
-
-          <% if User.current.admin_of_org?(@organization) %>
-            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+                  </div>
+              <% end %>
+          <% end%>
+        </div>
+        <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
+        <div class="orgName fl mb5 f14">
+          <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+          <% if User.current.logged? %>
+              <% if @organization.is_public? %>
+                  <span class="img_private"><%= l(:label_public)%></span>
+              <% else %>
+                  <span class="img_private"><%= l(:label_private)%></span>
+              <% end %>
           <% end %>
+        </div>
 
-          <!--<div style="clear:both;">-->
-            <!--<%#= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>-->
-            <!--<%# if @organization.is_public? %>-->
-                <!--<span class="img_private"><%#= l(:label_public)%></span>-->
-            <!--<%# else %>-->
-                <!--<span class="img_private"><%#= l(:label_private)%></span>-->
-            <!--<%# end %>-->
-          <!--</div>-->
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+        <% end %>
 
-          <div class="cl"></div>
-          <div class="f12 fontGrey3">
-            <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
-            <% if User.current.logged? %>
-                (
-                <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
-                )
-            <% end %>
-            &nbsp;|&nbsp;
-            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
-            <% if User.current.logged? %>
+        <!--<div style="clear:both;">-->
+        <!--<%#= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>-->
+        <!--<%# if @organization.is_public? %>-->
+        <!--<span class="img_private"><%#= l(:label_public)%></span>-->
+        <!--<%# else %>-->
+        <!--<span class="img_private"><%#= l(:label_private)%></span>-->
+        <!--<%# end %>-->
+        <!--</div>-->
+
+        <div class="cl"></div>
+        <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
+          <% if User.current.logged? %>
+              (
+              <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+              )
+          <% end %>
+          &nbsp;|&nbsp;
+          <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
+          <% if User.current.logged? %>
               （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
-            <% end %>
-          </div>
-        </div>
-        <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
-            <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
+          <% end %>
         </div>
       </div>
-      <div class="homepageRight" style="margin-top:<%= params[:show_homepage].nil? ? '10px':'0px' %>;">
-        <%= render_flash_messages %>
-        <%= yield %>
-        <%= call_hook :view_layouts_base_content %>
-        <div style="clear:both;"></div>
+      <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
+        <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
       </div>
     </div>
+    <div class="homepageRight" style="margin-top:<%= params[:show_homepage].nil? ? '10px':'0px' %>;">
+      <%= render_flash_messages %>
+      <%= yield %>
+      <%= call_hook :view_layouts_base_content %>
+      <div style="clear:both;"></div>
+    </div>
   </div>
+</div>
 
-    <!--页面底部-->
-    <div class="cl"></div>
-    <div id="Footer">
-      <div class="footerAboutContainer">
-        <ul class="footerAbout">
-          <li class="fl"><a href="<%= about_us_path %>"  class=" f_grey mw20" target="_blank">关于我们</a>|</li>
-          <li class="fl"><a href="<%= agreement_path %>" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
-          <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
-          <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
-        </ul>
-      </div>
-      <div class="cl"></div>
+<!--页面底部-->
+<div class="cl"></div>
+<div id="Footer">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="<%= about_us_path %>"  class=" f_grey mw20" target="_blank">关于我们</a>|</li>
+      <li class="fl"><a href="<%= agreement_path %>" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
+    </ul>
+  </div>
+  <div class="cl"></div>
 
-      <ul class="copyright mt10">
-        <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
-        <li>ICP备09019772</li>
-      </ul>
-    </div>
-    <div class="cl"></div>
-    <div id="ajax-modal" style="display:none;"></div>
+  <ul class="copyright mt10">
+    <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
+    <li>ICP备09019772</li>
+  </ul>
+</div>
+<div class="cl"></div>
+<div id="ajax-modal" style="display:none;"></div>
 
-    <div id="ajax-indicator" style="display:none;">
-      <span><%= l(:label_loading) %></span>
-    </div>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
 
-    <script type="text/javascript">
-        $("#courseMenu").mouseenter(function(){
-            $("#topnav_course_menu").show();
-        });
-        $("#courseMenu").mouseleave(function(){
-            $("#topnav_course_menu").hide();
-        });
-        $("#projectMenu").mouseenter(function(){
-            $("#topnav_project_menu").show();
-        });
-        $("#projectMenu").mouseleave(function(){
-            $("#topnav_project_menu").hide();
-        });
+<script type="text/javascript">
+    $("#courseMenu").mouseenter(function(){
+        $("#topnav_course_menu").show();
+    });
+    $("#courseMenu").mouseleave(function(){
+        $("#topnav_course_menu").hide();
+    });
+    $("#projectMenu").mouseenter(function(){
+        $("#topnav_project_menu").show();
+    });
+    $("#projectMenu").mouseleave(function(){
+        $("#topnav_project_menu").hide();
+    });
 
-  function show_homepage(id, has_homepage){
-      if (has_homepage == 1)
-      {
-          window.location.href = "/organizations/" + id + "?show_homepage=1";
-      }
-      else
-      {
-          alert("您还未设置首页！");
-      }
-  }
+    function show_homepage(id, has_homepage){
+        if (has_homepage == 1)
+        {
+            window.location.href = "/organizations/" + id + "?show_homepage=1";
+        }
+        else
+        {
+            alert("您还未设置首页！");
+        }
+    }
     $(document).ready(function(){
-        $("#orgUser,#orgSwitch").click(function(){
-            $(".org_login_list").toggle();
-            if($("#orgArrow").attr("class") == "orgMenuArrow"){
-                $("#orgArrow").attr("class","orgMenuArrow2");
-            }
-            else {
-                $("#orgArrow").attr("class","orgMenuArrow") ;
-            }
-        });
-        if($(".org_login_list").children().click){
+        $("#orgUser,#orgSwitch,#org_login_list").mouseout(function(){
             $(".org_login_list").css("display","none");
             $("#orgArrow").attr("class","orgMenuArrow");
-        };
+        });
+        $("#orgUser,#orgSwitch,#org_login_list").mouseover(function(){
+            $(".org_login_list").css("display","block");
+            $("#orgArrow").attr("class","orgMenuArrow2");
+        });
     });
 </script>
 </body>

app/views/mailer/issue_add.html.erb

@@ -6,7 +6,7 @@
     <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
     <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
     <% end %>
     <% end %>
 </div>

app/views/mailer/issue_add.text.erb

@@ -4,6 +4,6 @@
   <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
   <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
   <% end %>
 <% end %>

app/views/mailer/issue_edit.html.erb

@@ -9,7 +9,7 @@
     <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
     <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
     <% end %>
     <% end %>
 </div>

app/views/mailer/issue_edit.text.erb

@@ -9,6 +9,6 @@
   <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
   <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
   <% end %>
 <% end %>

app/views/mailer/send_for_user_activities.html.erb

@@ -16,16 +16,16 @@
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
-                  <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value),
+                  <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to course_new.author, user_activities_url(course_new.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice) %></span>
 
-                  <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
+                  <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -39,17 +39,17 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
                   <% unless course_news_comment.commented.nil? %>
-                      <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value),
+                      <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course),
                                   :class=> "wmail_column",
                                   :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <% end %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice_reply) %></span>
 
-                  <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value),
+                  <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -72,16 +72,16 @@
                       <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                       <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                      <%= link_to truncate(bid.course.name,length: 30,omission: '...'), course_url(bid.course, :token => @token.value),
+                      <%= link_to truncate(bid.course.name,length: 30,omission: '...'), course_url(bid.course),
                                   :class=> "wmail_column",
                                   :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                       <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                      <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value), :class => "wmail_name",
+                      <%= link_to bid.user, user_activities_url(bid.user), :class => "wmail_name",
                                   :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                       <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_course_homework) %></span>
 
-                      <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_url(:homework => bid.id,:token => @token.value),
+                      <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_url(:homework => bid.id),
                                   :class => 'wmail_info',
                                   :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                       %>
@@ -105,16 +105,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value),
+                  <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name",
+                  <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_send_course_journals_for_messages) %></span>
 
-                  <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value),
+                  <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -135,14 +135,14 @@
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
-                  <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id, :token => @token.value),
+                  <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to course_message.author, user_activities_url(course_message.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_send_course_messages) %></span>
-                  <%= link_to truncate(course_message.subject.html_safe,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value),
+                  <%= link_to truncate(course_message.subject.html_safe,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(course_message.created_on) %></span>
@@ -163,16 +163,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value),
+                  <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to attachment.author, user_activities_url(attachment.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_course_file_upload) %></span>
 
-                  <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value),
+                  <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -199,14 +199,14 @@
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
-                  <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value),
+                  <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to issue.author, user_activities_url(issue.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue) %></span>
-                  <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value),
+                  <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue),
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issue.created_on) %></span>
@@ -217,14 +217,14 @@
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
-                  <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value),
+                  <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
+                  <%= link_to issues_journal.user, user_activities_url(issues_journal.user), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue_update) %></span>
-                  <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue,  :token => @token.value),
+                  <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue),
                               :style => "color:#2E8DD7;float:left;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;",
                               :onmouseover =>"message_titile_show($(this),event)",
                               :onmouseout => "message_titile_hide($(this))"
@@ -251,16 +251,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value),
+                  <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to project_message.author, user_activities_url(project_message.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_send_course_messages) %></span>
 
-                  <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value),
+                  <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -283,16 +283,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
                   <% unless wikicontent.page.nil? %>
-                    <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value),
+                    <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <% end %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to wikicontent.author, user_activities_url(wikicontent.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_wiki_mail_notification) %></span>
                   <% unless wikicontent.page.nil? %>
-                    <%= link_to wikicontent.text.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_wiki_url(wikicontent.page.wiki,:token => @token.value),
+                    <%= link_to wikicontent.text.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_wiki_url(wikicontent.page.wiki),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; max-width:400px;height:23px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                    <% end %>
@@ -314,15 +314,15 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value),
+                  <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to project_new.author, user_activities_url(project_new.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_notice) %></span>
 
-                  <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value),
+                  <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(project_new.created_on) %></span>
@@ -336,16 +336,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
                   <% unless project_news_comment.commented.nil? %>
-                      <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value),
+                      <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project),
                                   :class=> "wmail_column",
                                   :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <% end %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                  <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value), :class => "wmail_name",
+                  <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:lable_project_mail_notice_reply) %></span>
 
-                  <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value),
+                  <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(project_news_comment.created_on) %></span>
@@ -366,16 +366,16 @@
                 <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                 <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                <%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value),
+                <%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project),
                             :class=> "wmail_column",
                             :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                 <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value), :class => "wmail_name",
+                <%= link_to project_attachment.author, user_activities_url(project_attachment.author), :class => "wmail_name",
                             :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                 <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_upload) %></span>
 
-                <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'), project_files_url(project_attachment.project,:token => @token.value),
+                <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'), project_files_url(project_attachment.project),
                             :class => 'wmail_info',
                             :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                 %>
@@ -398,16 +398,16 @@
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
 
-                  <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value),
+                  <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project),
                               :class=> "wmail_column",
                               :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
-                  <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value), :class => "wmail_name",
+                  <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_send_course_journals_for_messages) %></span>
 
-                  <%= link_to project_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_feedback_url(project_journal_message.project,:token => @token.value),
+                  <%= link_to project_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_feedback_url(project_journal_message.project),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -434,12 +434,12 @@
             <li  style="clear: both; list-style: none;">
               <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-              <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value),
+              <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user),
                           :class => "wmail_name",
                           :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
               <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_show_your_message) %></span>
 
-              <%= link_to user_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe,feedback_url(@user,:token => @token.value),
+              <%= link_to user_journal_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe,feedback_url(@user),
                           :class => 'wmail_info',
                           :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
               %>
@@ -466,12 +466,12 @@
                 <li  style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-                  <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value),
+                  <%= link_to forum.creator, user_activities_url(forum.creator),
                               :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_forum_new) %></span>
 
-                  <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value),
+                  <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -492,7 +492,7 @@
                 <li  style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-                  <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value),
+                  <%= link_to memo.author, user_activities_url(memo.author),
                               :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply)  %></span>
@@ -516,7 +516,7 @@
       <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
           <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
       <% else %>
-          <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+          <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
       <% end %>
   <% end %>
 </div>

app/views/mailer/send_for_user_activities.text.erb

@@ -6,11 +6,11 @@
         <%= l(:label_course_news) %>
         <% @course_news.each do |course_new|%>
 
-            ▪[<%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value)%> ]
+            ▪[<%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course)%> ]
 
-            <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value) %>
+            <%= link_to course_new.author, user_activities_url(course_new.author) %>
             <%= l(:label_project_notice) %>
-            <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value) %>
+            <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new) %>
             <%= format_time(course_new.created_on) %>
         <% end %>
     <% end %>
@@ -19,12 +19,12 @@
         <%= l(:label_course_news) %>
         <% @course_news_comments.each do |course_news_comment|%>
             ▪[ <% unless course_news_comment.commented.nil? %>
-                <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value) %>
+                <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course) %>
             <% end %>
             ]
-            <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value) %>
+            <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author) %>
             <%= l(:label_project_notice_reply) %>
-            <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value) %>
+            <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented) %>
             <%= format_time(course_news_comment.created_on) %>
         <% end %>
     <% end %>
@@ -33,10 +33,10 @@
         <%= l(:label_homework_overview) %>
         <% unless @bids.first.nil?%>
             <% @bids.each do |bid| %>
-                ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course, :token => @token.value) %>]
-                <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value) %>
+                ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course) %>]
+                <%= link_to bid.user, user_activities_url(bid.user) %>
                 <%= l(:label_course_homework) %>
-                <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value) %>
+                <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id) %>
                 <%= format_time(bid.created_at) %>
             <% end %>
         <% end %>
@@ -46,10 +46,10 @@
     <% unless @course_journal_messages.first.nil? %>
         <%= l(:view_course_journals_for_messages) %>
         <% @course_journal_messages.each do |course_journal_message|%>
-            [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value) %>]
-            <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value) %>
+            [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course) %>]
+            <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user) %>
             <%= l(:label_send_course_journals_for_messages) %>
-            <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %>
+            <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course) %>
             <%= format_time(course_journal_message.created_on) %>
         <% end %>
     <% end %>
@@ -57,10 +57,10 @@
     <% unless @course_messages.first.nil? %>
         <%= l(:view_borad_course) %>
         <% @course_messages.each do |course_message|%>
-            ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course, :token => @token.value)%>]
-            <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course)%>]
+            <%= link_to course_message.author, user_activities_url(course_message.author) %>
             <%= l(:label_send_course_messages) %>
-            <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value) %>
+            <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id) %>
             <%= format_time(course_message.created_on) %>
         <% end %>
     <% end %>
@@ -68,10 +68,10 @@
     <% unless @attachments.first.nil? %>
         <%= l(:label_course_mail_files) %>
         <% @attachments.each do |attachment|%>
-            ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value) %>]
-            <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course) %>]
+            <%= link_to attachment.author, user_activities_url(attachment.author) %>
             <%= l(:label_course_file_upload) %>
-            <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value) %>
+            <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course) %>
             <%= format_time(attachment.created_on) %>
         <% end %>
         <!--课件下载  end-->
@@ -86,10 +86,10 @@
     <% unless @issues.first.nil? %>
         <%= l(:label_issue_tracking) %>
         <% @issues.each do |issue|%>
-            ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value) %>]
-            <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project) %>]
+            <%= link_to issue.author, user_activities_url(issue.author) %>
             <%= l(:label_project_issue) %>
-            <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
+            <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue) %>
             <%= format_time(issue.created_on) %>
         <% end %>
         <!--问题跟踪 end-->
@@ -99,13 +99,13 @@
     <% unless @issues_journals.first.nil? %>
         <%= l(:label_issue_tracking) %>
         <% @issues_journals.each do |issues_journal| %>
-            ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value) %>]
-            <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value) %>
+            ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project) %>]
+            <%= link_to issues_journal.user, user_activities_url(issues_journal.user) %>
             <%= l(:label_project_issue_update) %>
             <% if issues_journal.notes.nil? %>
-                <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
+                <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue) %>
             <% else %>
-                <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value) %>
+                <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue) %>
             <% end %>
             <%= format_time(issues_journal.created_on) %>
         <% end %>
@@ -115,10 +115,10 @@
     <% unless @project_messages.first.nil? %>
         <%= l(:project_moule_boards_show) %>
         <% @project_messages.each do |project_message|%>
-            ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value) %>]
-            <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project) %>]
+            <%= link_to project_message.author, user_activities_url(project_message.author) %>
             <%= l(:label_send_course_messages) %>
-            <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value) %>
+            <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id) %>
             <%= format_time(project_message.created_on) %>
         <% end %>
         <!--项目论坛 end-->
@@ -129,13 +129,13 @@
         <%= l(:label_wiki) %>
         <% @wiki_contents.each do |wikicontent|%>
             ▪[<% unless wikicontent.page.nil? %>
-                <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value) %>
+                <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project) %>
             <% end %>
             ]
-            <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value) %>
+            <%= link_to wikicontent.author, user_activities_url(wikicontent.author) %>
             <%= l(:label_wiki_mail_notification) %>
             <% unless wikicontent.page.nil? %>
-                <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value) %>
+                <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki) %>
             <% end %>
             <%= format_time(wikicontent.updated_on) %>
         <% end %>
@@ -145,10 +145,10 @@
     <% unless @project_news.first.nil? %>
         <%= l(:label_project_news) %>
         <% @project_news.each do |project_new|%>
-            ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value) %> ]
-            <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project) %> ]
+            <%= link_to project_new.author, user_activities_url(project_new.author) %>
             <%= l(:label_project_mail_notice) %>
-            <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %>
+            <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new) %>
             <%= format_time(project_new.created_on) %>
         <% end %>
     <% end %>
@@ -158,11 +158,11 @@
         <%= l(:label_project_news) %>
         <% @project_news_comments.each do |project_news_comment|%>
             ▪[ <% unless project_news_comment.commented.nil? %>
-                <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value) %>
+                <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project) %>
             <% end %>]
-            <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value) %>
+            <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author) %>
             <%= l(:lable_project_mail_notice_reply) %>
-            <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value) %>
+            <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented) %>
             <%= format_time(project_news_comment.created_on) %>
         <% end %>
         <!-- 项目新闻回复end -->
@@ -172,10 +172,10 @@
     <% unless @project_attachments.first.nil? %>
         <%= l(:label_project_mail_attachments) %>
          <% @project_attachments.each do |project_attachment|%>
-              ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value) %>]
-              <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value) %>
+              ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project) %>]
+              <%= link_to project_attachment.author, user_activities_url(project_attachment.author) %>
               <%= l(:label_project_mail_upload) %>
-              <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project,:token => @token.value) %>
+              <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project) %>
               <%= format_time(project_attachment.created_on) %>
           <% end %> <!-- 项目上传资源  end-->
     <% end %>
@@ -184,10 +184,10 @@
     <% unless @project_journal_messages.first.nil? %>
         <%= l(:label_project_mail_feedback) %>
         <% @project_journal_messages.each do |project_journal_message|%>
-            ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value) %> ]
-            <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value) %>
+            ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project) %> ]
+            <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user) %>
             <%= l(:label_send_course_journals_for_messages) %>
-            <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project,:token => @token.value) %>
+            <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project) %>
             <%= format_time(project_journal_message.created_on) %>
         <% end %>
         <!--项目留言 end-->
@@ -202,9 +202,9 @@
     <%= l(:label_user_message) %>
     (<%= @user_journal_messages.count %>)
     <% @user_journal_messages.each do |user_journal_message|%>
-        ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value)%>
+        ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user)%>
         <%= l(:label_show_your_message) %>
-        <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %>
+        <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user) %>
         <%= format_time(user_journal_message.created_on) %>
     <% end %>
 <% end %>
@@ -214,9 +214,9 @@
     <% unless @forums.first.nil? %>
         <%= l(:label_user_forum) %>
         <% @forums.each do |forum|%>
-            ▪<%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
+            ▪<%= link_to forum.creator, user_activities_url(forum.creator) %>
             <%= l(:label_forum_new) %>
-            <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %>
+            <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum) %>
             <%= format_time(forum.created_at) %>
         <% end %>
         <!-- 新建贴吧 end-->
@@ -224,7 +224,7 @@
     <% unless @memos.first.nil? %>
         <%= l(:label_user_message_forum) %>
         <% @memos.each do |memo|%>
-            ▪<%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
+            ▪<%= link_to memo.author, user_activities_url(memo.author)%>
             <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
             <%= link_to truncate(memo.subject.html_safe,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%>
             <%= format_time(memo.created_at) %>
@@ -238,6 +238,6 @@
     <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
         <%= l(mail_option) %>
     <% else %>
-        <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+        <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
     <% end %>
 <% end %>

app/views/memos/edit.html.erb

@@ -21,10 +21,7 @@
           $.ajax({
               url:' /forums/'+'<%= @memo.forum_id.to_s %>'+'/memos/<%= @memo.id.to_s%>',
               type:'put',
-              data:{
-                'memo[subject]':$("#memo_subject").val(),
-                 'memo[content]':$("#memo_content").val()
-              },
+              data:$("#edit_memo").serialize(),
               success:function(data){
 
               },

app/views/my/account.html.erb

@@ -18,8 +18,8 @@
           <li>登录名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li>邮箱&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li>身份&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">姓(First Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">名(Last Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">姓(Last Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">名(First Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_2="true" style="display:none;">组织名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">性别&nbsp;:&nbsp;</li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">工作单位&nbsp;:&nbsp;</li>

app/views/news/_course_news.html.erb

@@ -1,42 +1,34 @@
-<%
-   btn_tips = l(:label_news_notice)
-   label_tips = l(:label_course_news)
-%>
-<script>
-  function remote_search(){
-    $("#news_query_form").submit();
-  }
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+    function reset_news(){
+        $("#news_title").val("");
+        $("#title_notice_span").text("");
+        $("#description_notice_span").text("");
+        document.getElementById("news_sticky").checked=false;
+        $("#news_attachments").html("<%= escape_javascript(render :partial => 'attachments/new_form', :locals => {:container => News.new})%>");
+        news_description_editor.html("");
+        $("#news_editor").toggle();
+    }
+    <% if @is_new%>
+    $(function(){
+        $("#news_title").focus();
+    });
+    <%end%>
 </script>
-<div class="project_r_h">
-  <h2 class="project_h2"><%= label_tips %></h2>
-</div>
-<div class="talk_top">
-  <div class="fl">
-      <p class="fl">
-        <%= l(:label_total_news) %>
-        <span><%= @news_count %></span>
-        <%= l(:label_course_news_count) %>
-      </p>
-      <% if @course && User.current.allowed_to?(:manage_news, @course) %>
-          <%= link_to(btn_tips,new_course_news_path(@course),:class => 'problem_new_btn fl c_dorange')%>
-          <div class="cl"></div>
-
-      <% end %>
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      课程通知
+    </div>
   </div>
-  <div class="problem_search fr" >
-    <%= form_tag({:controller => 'news', :action => 'index', :course_id => @course }, :method => :get,:id=>"news_query_form", :class => 'query_form') do %>
-    <input class="problem_search_input fl" id="v_subject" placeholder="通知主题" type="text" name="subject" value="<%= @q%>" onkeypress="" onkeydown="">
-    <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_search();" >搜索</a>
-    <% end %>
-  </div><!--problem_search end-->
-  <div class="cl"></div>
-</div>
-
-<div id="news_list">
-  <%= render :partial => 'course_news_list', :locals=>{ :newss=>@newss,:obj_pages=>@obj_pages, :obj_count=>@obj_count} %>
-</div>
-<% content_for :header_tags do %>
-  <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
-<% html_title(l(:label_course_news)) -%>
+  <% if @course && User.current.allowed_to?(:manage_news, @course) %>
+      <%= labelled_form_for @news, :url =>{:controller=>'news',:action => 'new',  :course_id => @course.id},
+                            :html => {:nhname=>'form',:multipart => true, :id => 'news-form'} do |f| %>
+          <%= render :partial => 'course_news_new', :locals => {:f => f, :news => @news, :edit_mode => false, :course => @course} %>
+      <% end %>
+  <% end %>
+  <%= render :partial=> 'course_news_detail',:locals =>{:newss => @newss, :page => 0} %>
+</div>

app/views/news/_course_news_detail.html.erb

@@ -0,0 +1,56 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
+<% if newss%>
+    <% newss.each do |news| %>
+        <script>
+            function expand_reply(container, btnid) {
+                var target = $(container);
+                var btn = $(btnid);
+                if (btn.data('init') == '0') {
+                    btn.data('init', 1);
+                    btn.html('收起回复');
+                    target.show();
+                } else {
+                    btn.data('init', 0);
+                    btn.html('展开更多');
+                    target.hide();
+                    target.eq(0).show();
+                    target.eq(1).show();
+                    target.eq(2).show();
+                }
+            }
+
+            function expand_reply_input(id) {
+                $(id).toggle();
+            }
+
+            $(function () {
+                init_activity_KindEditor_data(<%= news.id%>, null, "87%");
+                showNormalImage('activity_description_<%= news.id %>');
+            });
+        </script>
+        <% if news %>
+            <%= render :partial => 'users/course_news', :locals => {:activity => news, :user_activity_id => news.id} %>
+        <% end %>
+    <% end %>
+
+    <% if newss.count == 10 %>
+        <%= link_to "点击展开更多",news_index_path(:course_id => @course.id ,:page => page),:id => "show_more_course_news",:remote => "true",:class => "loadMore mt10 f_grey"%>
+    <% end %>
+<% end%>
+

app/views/news/_course_news_new.html.erb

@@ -0,0 +1,60 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true, prettify: false) %>
+<% end %>
+
+<div class="resources mt10">
+  <div id="new_course_news">
+    <div class="homepagePostBrief c_grey">
+      <div>
+        <input  type="text" name="news[title]" id="news_title" class="InputBox  w713" maxlength="60" onfocus="$('#news_editor').show()" onkeyup="regexTitle();" placeholder="发布通知，请先输入通知标题" value="<%= news.title%>" >
+        <p id="title_notice_span"></p>
+      </div>
+      <div id="news_editor" style="display: none;">
+        <div class="mt10">
+          <%= f.check_box :sticky, :value => edit_mode ? news.sticky : 0 %>
+          <%= label_tag 'news_sticky', l(:label_board_sticky) %>
+          <div class="cl"></div>
+        </div>
+        <div class="mt10">
+          <div id="news_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :description, :editor_id => 'news_description_editor',
+                           :owner_id => news.nil? ? 0: news.id,
+                           :owner_type => OwnerTypeHelper::NEWS,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'news_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 },
+                           at_id: news.id, at_type: news.class.to_s
+          %>
+          <div class="cl"></div>
+          <p id="description_notice_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="news_attachments">
+            <%= render :partial => 'attachments/form_course', :locals => {:container => news, :isReply => false} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <%if !edit_mode %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submitNews();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <a href="javascript:void(0);" class="fr mr10 mt3" onclick="reset_news();">取消</a>
+          <% else %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submitNews();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <%= link_to "取消",news_path(news), :class => "fr mr10 mt3"%>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>

app/views/news/_course_show.html.erb

@@ -2,85 +2,172 @@
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <% end %>
 
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_course_news) %></h2>
-</div>
-<div class="problem_main">
-  <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
-  <div class="problem_txt fl mt5 list_style">
-    <h4 class="r_txt_tit mb5">
-      <%=h @news.title %>
-    </h4>
-    <% if @news.sticky == 1%>
-        <span class="sticky_btn_cir ml10 fl">置顶</span>
-    <% end%>
-    <%= link_to(l(:button_edit),
-                edit_news_path(@news),
-                :class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
-    <%= delete_link(news_path(@news),:class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
-    <div class="cl"></div>
-    <div class="mb5 upload_img">
-      <%= @news.description.html_safe %>
-      <br />
-      <%= l(:label_create_time) %> ：  <%= format_time(@news.created_on) %>
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<script>
+    function expand_reply(container,btnid){
+        var target = $(container).children();
+        var btn = $(btnid);
+        if(btn.data('init')=='0'){
+            btn.data('init',1);
+            btn.html('收起回复');
+            target.show();
+        }else{
+            btn.data('init',0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+    $(function() {
+        showNormalImage('message_description_<%= @news.id %>');
+    });
+</script>
+
+<div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @news.id%>').show();" onmouseout="$('#message_setting_<%= @news.id%>').hide();">
+  <div class="postThemeContainer">
+    <div class="postDetailPortrait">
+      <%= link_to image_tag(url_to_avatar(@news.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@news.author) %>
     </div>
-    <%= link_to_attachments_course @news %>
-    <!--<a href="#" class=" link_file">附件：爱覅俄方if.zip(27.5kB)</a> -->
+    <div class="postThemeWrap">
+      <% if User.current.allowed_to?(:manage_news, @course)%>
+          <div class="homepagePostSetting" id="message_setting_<%= @news.id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:action => 'edit', :id => @news},
+                                :class => 'postOptionLink'
+                        ) if User.current.allowed_to?(:manage_news, @course) %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                news_path(@news),
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if User.current.allowed_to?(:manage_news, @course) %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <%end%>
+      <div class="postDetailTitle fl">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">通知: <%= @news.title%></a>
+      </div>
+      <div class="cl"></div>
+
+      <div class="postDetailCreater">
+        <% if @news.try(:author).try(:realname) == ' ' %>
+            <%= link_to @news.try(:author), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% else %>
+            <%= link_to @news.try(:author).try(:realname), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% end %>
+      </div>
+      <div class="postDetailDate mb5"><%= format_time( @news.created_on)%></div>
+      <div class="cl"></div>
+      <div class="memo-content upload_img break_word" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+        <%= @news.description.html_safe%>
+      </div>
+      <div class="cl"></div>
+      <div class=" fl" style="width: 600px">
+        <%= link_to_attachments_course @news, :author => false %>
+      </div>
+    </div>
+    <div class="cl"></div>
   </div>
   <div class="cl"></div>
-</div>
-
-  <% if @news.commentable? %>
-      <div class="msg_box fl">
-        <h4><%= l(:label_comment_add) %></h4>
-        <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %>
-          <div class="box"  id="news_comment">
-            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-            <%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>
-          </div>
-          <p id="add_reply_news"></p>
-         <p class="mt10">
-            <a href="javascript:void(0)" class="grey_btn fr ml10" onclick="KindEditor.instances[0].html('');">
-              <%= l(:label_cancel_with_space) %>
-            </a>
-            <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
-              <%= l(:label_comment_with_space) %>
-            </a>
-          </p>
-      <% end %>
-      </div>
-  <% end %>
-<div class="cl"></div>
-  <% comments = @comments.reverse %>
-  <% comments.each do |comment| %>
-      <% next if comment.new_record? %>
-      <div class="ping_C mb10">
-        <div><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author), :class => "problem_pic fl"%></div>
-        <div class="ping_discon">
-          <div class="ping_distop upload_img break_word list_style">
-            <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %>
-            <span class="c_grey fr">
-                <%= format_time(comment.created_on) %>
-            </span>
-            <div class="cl"></div>
-            <p><%= comment.comments.html_safe %></p>
-            </div>
-            <div class="ping_disfoot">
-              <%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
-                     :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
-          </div>
-
+  <div class="homepagePostReply">
+    <% unless @comments.empty? %>
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（<%=@comments.count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+        </div>
+        <div class="" id="reply_div_<%=@news.id %>">
+          <% @comments.each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <div class="homepagePostReplyPublisher">
+                    <% if reply.try(:author).try(:realname) == ' ' %>
+                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% else %>
+                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% end %>
+                  </div>
+                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                    <%= reply.comments.html_safe%>
+                  </div>
+                  <div style="margin-top: -7px; margin-bottom: 5px">
+                    <%= format_time(reply.created_on) %>
+                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                      <%= link_to_if_authorized_course(
+                                  l(:button_delete),
+                                  {:controller => 'comments',
+                                  :action => 'destroy', :id => @news,
+                                  :comment_id => reply},
+                                  :method => :delete,
+                                  :class => 'fr newsGrey',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id%>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
         </div>
-        <div class="cl"></div>
-      </div>
-  <% end if @comments.any? %>
 
-
-
-<!--problem_main end-->
-  <% content_for :header_tags do %>
-      <%= stylesheet_link_tag 'scm' %>
-  <% end %>
-
-
-<% html_title @news.title -%>
+    <% end %>
+    <div class="cl"></div>
+    <% if @news.commentable? %>
+        <div class="talkWrapMsg" nhname="about_talk_reply">
+          <em class="talkWrapArrow"></em>
+          <div class="cl"></div>
+          <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
+            <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
+                <div class="box"  id="news_comment">
+                  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+                  <%= f.kindeditor :comments, :editor_id => 'comment_editor',
+                                   :owner_id => @comment.nil? ? 0: @comment.id,
+                                   :owner_type => OwnerTypeHelper::COMMENT,
+                                   :width => '99%',
+                                   :height => 100,
+                                   :minHeight=>100,
+                                   :input_html => { :id => 'comment_content',
+                                                    :class => 'talk_text fl',
+                                                    :maxlength => 5000 }%>
+                </div>
+                <p id="add_reply_news"></p>
+                <p class="mt10">
+                  <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
+                    <%= l(:label_cancel_with_space) %>
+                  </a>
+                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                    <%= l(:label_comment_with_space) %>
+                  </a>
+                </p>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>

app/views/news/edit.html.erb

@@ -1,14 +1,23 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <% end %>
-
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_course_news) %></h2>
-</div>
-<div id="edit-news">
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+        $("#news_title").focus();
+    });
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      编辑通知
+    </div>
+  </div>
   <%= labelled_form_for :news, @news, :url => news_path(@news),
                         :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
-      <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
+  <%#= labelled_form_for :news, :url =>{:controller=>'news',:action => 'new',  :course_id => @course.id},
+                        :html => {:nhname=>'form',:multipart => true, :id => 'news-form'} do |f| %>
+      <%= render :partial => 'course_news_new', :locals => {:f => f, :news => @news, :edit_mode => true, :course => @course} %>
   <% end %>
-  <div id="preview" class="wiki"></div>
 </div>

app/views/news/index.js.erb

@@ -1 +1,5 @@
-$("#news_list").html("<%= escape_javascript(render :partial => 'course_news_list', :locals=>{ :newss=>@newss,:obj_pages=>@obj_pages, :obj_count=>@obj_count})%>");
+<% if @project %>
+    $("#news_list").html("<%= escape_javascript(render :partial => 'course_news_list', :locals=>{ :newss=>@newss,:obj_pages=>@obj_pages, :obj_count=>@obj_count})%>");
+<% else %>
+    $("#show_more_course_news").replaceWith("<%= escape_javascript( render :partial =>  'course_news_detail', :locals =>{:newss => @newss, :page => @page} )%>");
+<% end %>

app/views/organizations/_org_activities.html.erb

@@ -56,10 +56,11 @@
 <% end %>
 
 <% if org_act_count == 10 %>
-    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>
-    <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+    <!--<div id="show_more_activities" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "", organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>-->
+    <%= link_to "点击展开更多",organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>
 
+<!--
 <script>
     $(function(){
         $("#show_more_activities").mouseover(function(){
@@ -67,4 +68,4 @@
         })
     })
 
-</script>
+</script>-->

app/views/projects/_project_activities.html.erb

@@ -92,11 +92,13 @@
 <% end %>
 
 <% if forge_acts.count == 10 %>
-    <div id="show_more_forge_activities" class="loadMore mt10 f_grey">展开更多<%= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %></div>
+    <!--<div id="show_more_forge_activities" class="loadMore mt10 f_grey">点击展开更多<%#= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %></div>-->
+    <%= link_to "点击展开更多",project_path(@project.id, :type => type, :page => page),:id => "show_more_forge_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end %>
 
+<!--
 <script type="text/javascript">
     $("#show_more_forge_activities").mouseover(function () {
         $("#more_forge_activities_link").click();
     });
-</script>
+</script>-->

app/views/repositories/show.html.erb

@@ -41,7 +41,7 @@
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
             <% else %>
-                 <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
+                 <span class="fl"><div class="fb fontGrey3 rep_mail_name mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>

app/views/student_work/_work_information.html.erb

@@ -20,9 +20,9 @@
     <div class="cl"></div>
     <div class="ni_btn mt10">
       <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
-        确&nbsp;&nbsp;定
+        确&nbsp;定
       </a>
-      <%= link_to("重试", retry_work_student_work_path(@student_work.id),:class => "tijiao",:style =>"margin-bottom: 15px;margin-top:15px;",:remote => true)%>
+      <%= link_to("重 试", retry_work_student_work_path(@student_work.id),:class => "tijiao",:style =>"margin-bottom: 15px;margin-top:15px;",:remote => true)%>
     </div>
   </div>
 </div>

app/views/student_work/index.html.erb

@@ -135,7 +135,11 @@
                 <% else %>
                     <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
                 <% end %>
-                <span class="green_homework_btn_cir ml5">作品提交中</span>
+                <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")%>
+                    <span class="green_homework_btn_cir ml5">作品提交中</span>
+                <% elsif Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") %>
+                    <span class="red_homework_btn_cir ml5">作品补交中</span>
+                <% end %>
             <% elsif @homework.homework_detail_manual.comment_status == 2%>
                 <% if @homework.anonymous_comment == 0%>
                     <span class="green_homework_btn_cir ml5">匿评中</span>

app/views/users/_course_homework.html.erb

@@ -1,271 +1,278 @@
-<% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait">
-      <%= 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 break_word mt-4">
-        <% if activity.try(:user).try(:realname) == ' ' %>
-            <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% end %> TO <!--+"(课程名称)" -->
-        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
-      </div>
-      <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
-        <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
-      </div>
-      <% if activity.homework_detail_manual%>
-          <% if activity.homework_detail_manual.comment_status == 1%>
-              <% if activity.anonymous_comment == 0%>
-                  <span class="grey_homework_btn_cir ml5">未开启匿评</span>
-              <% else %>
-                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
-              <% end %>
-              <% if Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")%>
-                  <span class="green_homework_btn_cir ml5">作品提交中</span>
-              <% elsif Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") %>
-                  <span class="red_homework_btn_cir ml5">作品补交中</span>
-              <% end %>
-          <% elsif activity.homework_detail_manual.comment_status == 2%>
-              <% if activity.anonymous_comment == 0%>
-                  <span class="green_homework_btn_cir ml5">匿评中</span>
-              <% else %>
-                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
-              <% end %>
-              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
-          <% elsif activity.homework_detail_manual.comment_status == 3%>
-              <% if activity.anonymous_comment == 0%>
-                  <span class="grey_homework_btn_cir ml5">匿评已结束</span>
-              <% else %>
-                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
-              <% end %>
-              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
-          <% end%>
-      <% end%>
-      <div class="cl"></div>
-      <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
-          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
-      <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%>
-          <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
-      <% end %>
-      <div class="homepagePostSubmitContainer">
-        <% if activity.homework_type == 3 && !is_teacher && activity.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(activity.course)%>
-            <% projects = cur_user_projects_for_homework activity %>
-            <% works = cur_user_works_for_homework activity %>
-            <% if works.nil? && projects.nil? %>
-                <div class="homepagePostSubmit">
-                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %>
-                  <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
-                </div>
-            <% elsif works.nil? %>
-                <div class="homepagePostSubmit">
-                  <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %>
-                </div>
-            <% end %>
-        <% end %>
-        <div class="homepagePostSubmit">
-          <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
-          <%= user_for_homework_common activity,is_teacher %>
-        </div>
-
-        <% if activity.homework_type == 2 && is_teacher%>
-            <div class="homepagePostSubmit">
-              <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: activity.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
-            </div>
-        <% end %>
-        <% if activity.homework_type == 2%>
-            <div class="homepagePostDeadline mr15">
-              语言：
-              <%= activity.language_name%>
-            </div>
-        <% end %>
-        <% if activity.homework_type == 3 && activity.homework_detail_group%>
-            <div class="homepagePostDeadline mr15">
-              分组人数：<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人
-            </div>
-        <% end %>
-        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
-      </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
-      <div class="cl"></div>
-      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
-      <div class="cl"></div>
-
-      <div class="mt10">
-        <div class="homepagePostDeadline">
-          迟交扣分：<%= activity.late_penalty%>分
-        </div>
-        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=user_activity_id %>">
-          匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00
-        </div>
-      </div>
-      <div class="cl"></div>
-      <div>
-        <div class="homepagePostDeadline">
-          缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
-        </div>
-        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
-          匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
-        </div>
-      </div>
-      <div class="cl"></div>
-      <div>
-        <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
-        <div class="cl"></div>
-      </div>
-      <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
-      <div class="mt10">
-        <% projects = activity.student_work_projects.where("is_leader = 1") %>
-        <div class="fl mr5 fontGrey3">
-          已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
-        </div>
-        <% projects.each do |pro| %>
-            <% project = Project.find pro.project_id %>
-            <script type="text/javascript">
-                $(document).ready(function(){
-                    $("#project_img_<%=project.id %>").mouseover(function(){
-                        $("#relatePInfo_<%=project.id %>").css("display","block");
-                    }).mouseout(function(){
-                        $("#relatePInfo_<%=project.id %>").css("display","none");
-                    })
-                });
-            </script>
-            <div class="mr20 mb10 fl">
-              <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
-                  <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %>
-              <% else %>
-                  <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %>
-              <% end %>
-              <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
-                项目名称：<%=project.name %><br />
-                创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
-                <% time=project.updated_on %>
-                <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
-                更新时间：<%=time_from_now time %>
-              </div>
-            </div>
-        <% end %>
-      </div>
-      <% end %>
-      <div class="cl"></div>
-      <% if is_teacher%>
-          <% comment_status = activity.homework_detail_manual.comment_status %>
-          <div class="homepagePostSetting">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li>
-                    <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity), :class => "postOptionLink"%>
-                  </li>
-                  <li>
-                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
-                  </li>
-                  <li>
-                    <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true) %>
-                  </li>
-                  <% if activity.anonymous_comment == 0 %>
-                      <li>
-                        <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
-                      </li>
-                      <li>
-                        <%= homework_anonymous_comment activity,-1,user_activity_id,course_activity %>
-                      </li>
-                  <% end %>
-                  <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
-                      <li>
-                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
-                      </li>
-                  <% end %>
-                </ul>
-              </li>
-            </ul>
-          </div>
-      <% end%>
-      </div>
-    <div class="cl"></div>
-  </div>
-
-  <% count=activity.journals_for_messages.count %>
-  <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount">
-        回复（<%= count %>）
-      </div>
-      <div class="homepagePostReplyBannerTime"></div>
-      <%if count>3 %>
-          <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>
-            <% activity.journals_for_messages.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();" style="display:<%= replies_all_i > 3 ? '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 id="message_edit_<%=comment.id %>" style="display: none" class="fr">
-                          <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                              <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity},
-                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>
-                          <% end %>
-                      </div>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
-                  </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 => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
-              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-              <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></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>
+<% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= 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 break_word mt-4">
+        <% if activity.try(:user).try(:realname) == ' ' %>
+            <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+        <% end %> TO <!--+"(课程名称)" -->
+        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
+      </div>
+      <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
+        <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
+      </div>
+      <% if activity.homework_detail_manual%>
+          <% if activity.homework_detail_manual.comment_status == 1%>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="grey_homework_btn_cir ml5">未开启匿评</span>
+              <% else %>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+              <% end %>
+              <% if Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")%>
+                  <span class="green_homework_btn_cir ml5">作品提交中</span>
+              <% elsif Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") %>
+                  <span class="red_homework_btn_cir ml5">作品补交中</span>
+              <% end %>
+          <% elsif activity.homework_detail_manual.comment_status == 2%>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="green_homework_btn_cir ml5">匿评中</span>
+              <% else %>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+              <% end %>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+          <% elsif activity.homework_detail_manual.comment_status == 3%>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="grey_homework_btn_cir ml5">匿评已结束</span>
+              <% else %>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+              <% end %>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+          <% end%>
+      <% end%>
+      <div class="cl"></div>
+      <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
+          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+      <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%>
+          <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
+      <% end %>
+      <div class="homepagePostSubmitContainer">
+        <% if activity.homework_type == 3 && !is_teacher && activity.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(activity.course)%>
+            <% projects = cur_user_projects_for_homework activity %>
+            <% works = cur_user_works_for_homework activity %>
+            <% if works.nil? && projects.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %>
+                  <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
+                </div>
+            <% elsif works.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %>
+                </div>
+            <% end %>
+        <% end %>
+        <div class="homepagePostSubmit">
+          <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
+          <%= user_for_homework_common activity,is_teacher %>
+        </div>
+
+        <% if activity.homework_type == 2 && is_teacher%>
+            <div class="homepagePostSubmit">
+              <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: activity.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
+            </div>
+        <% end %>
+        <% if activity.homework_type == 2%>
+            <div class="homepagePostDeadline mr15">
+              语言：
+              <%= activity.language_name%>
+            </div>
+        <% end %>
+        <% if activity.homework_type == 3 && activity.homework_detail_group%>
+            <div class="homepagePostDeadline mr15">
+              分组人数：<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人
+            </div>
+        <% end %>
+        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
+      </div>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <%= activity.description.html_safe %>
+        </div>
+      </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+
+      <div class="mt10">
+        <div class="homepagePostDeadline">
+          迟交扣分：<%= activity.late_penalty%>分
+        </div>
+        <% if activity.anonymous_comment == 0%>
+            <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=user_activity_id %>">
+              匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00
+            </div>
+        <% end %>
+      </div>
+      <div class="cl"></div>
+      <div>
+        <div class="homepagePostDeadline">
+          缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
+        </div>
+        <% if activity.anonymous_comment == 0%>
+            <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
+              匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
+            </div>
+        <% end %>
+      </div>
+      <div class="cl"></div>
+      <div>
+        <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
+        <div class="cl"></div>
+      </div>
+      <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
+      <div class="mt10">
+        <% projects = activity.student_work_projects.where("is_leader = 1") %>
+        <div class="mb10 mr5 fontGrey3">
+          已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
+        </div>
+        <% projects.each do |pro| %>
+            <% project = Project.find pro.project_id %>
+            <script type="text/javascript">
+                $(document).ready(function(){
+                    $("#project_img_<%=project.id %>_<%=activity.id %>").mouseover(function(){
+                        $("#relatePInfo_<%=project.id %>_<%=activity.id %>").css("display","block");
+                    }).mouseout(function(){
+                        $("#relatePInfo_<%=project.id %>_<%=activity.id %>").css("display","none");
+                    });
+                });
+            </script>
+
+          <div class="mr20 mb10 fl w80" style="text-align: center;">
+            <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
+                <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %>
+            <% else %>
+                <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
+            <% end %>
+            <% time=project.updated_on %>
+            <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
+            <p><span class="captainName"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
+            <p><%=time_from_now time %></p>
+            <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
+              项目名称：<%=project.name %><br />
+              创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
+              更新时间：<%=time_from_now time %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+      <% end %>
+      <div class="cl"></div>
+      <% if is_teacher%>
+          <% comment_status = activity.homework_detail_manual.comment_status %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity), :class => "postOptionLink"%>
+                  </li>
+                  <li>
+                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                  </li>
+                  <li>
+                    <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true) %>
+                  </li>
+                  <% if activity.anonymous_comment == 0 %>
+                      <li>
+                        <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+                      </li>
+                      <li>
+                        <%= homework_anonymous_comment activity,-1,user_activity_id,course_activity %>
+                      </li>
+                  <% end %>
+                  <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
+                      <li>
+                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% end %>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <% end%>
+      </div>
+    <div class="cl"></div>
+  </div>
+
+  <% count=activity.journals_for_messages.count %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount">
+        回复（<%= count %>）
+      </div>
+      <div class="homepagePostReplyBannerTime"></div>
+      <%if count>3 %>
+          <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>
+            <% activity.journals_for_messages.reorder("created_on desc").each do |comment| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= comment.id %>');
+                    });
+                </script>
+                <% replies_all_i = replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();" style="display:<%= replies_all_i > 3 ? '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 id="message_edit_<%=comment.id %>" style="display: none" class="fr">
+                          <% if User.current.admin? ||is_teacher || comment.user == User.current%>
+                              <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity},
+                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>
+                          <% end %>
+                      </div>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                      <%= comment.notes.html_safe %></div>
+                  </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 => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
+              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+              <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></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/_user_activities.html.erb

@@ -109,12 +109,15 @@
 <% end %>
 
 <% if user_activities.count == 10%>
-    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
-    <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<!--
+    <div id="show_more_activities" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
+-->
+    <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>
 
+<!--
 <script type="text/javascript">
   $("#show_more_activities").mouseover(function(){
       $("#more_activities_link").click();
   });
-</script>
+</script>-->

app/views/users/_user_homework_detail.html.erb

@@ -107,18 +107,22 @@
         <div class="homepagePostDeadline">
           迟交扣分：<%= homework_common.late_penalty%>分
         </div>
-        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=homework_common.id %>">
-          匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00
-        </div>
+        <% if homework_common.anonymous_comment == 0%>
+            <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=homework_common.id %>">
+              匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00
+            </div>
+        <% end %>
       </div>
       <div class="cl"></div>
       <div>
         <div class="homepagePostDeadline">
           缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
         </div>
-        <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=homework_common.id %>">
-          匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
-        </div>
+        <% if homework_common.anonymous_comment == 0%>
+            <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=homework_common.id %>">
+              匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
+            </div>
+        <% end %>
       </div>
       <div class="cl"></div>
       <div>
@@ -135,24 +139,26 @@
                 <% project = Project.find pro.project_id %>
                 <script type="text/javascript">
                     $(document).ready(function(){
-                        $("#project_img_<%=project.id %>").mouseover(function(){
-                            $("#relatePInfo_<%=project.id %>").css("display","block");
+                        $("#project_img_<%=project.id %>_<%=homework_common.id %>").mouseover(function(){
+                            $("#relatePInfo_<%=project.id %>_<%=homework_common.id %>").css("display","block");
                         }).mouseout(function(){
-                            $("#relatePInfo_<%=project.id %>").css("display","none");
-                        })
+                            $("#relatePInfo_<%=project.id %>_<%=homework_common.id %>").css("display","none");
+                        });
                     });
                 </script>
-                <div class="mr20 mb10 fl">
+                <div class="mr20 mb10 fl w80" style="text-align: center;">
                   <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
-                      <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %>
+                      <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %>
                   <% else %>
-                      <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %>
+                      <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %>
                   <% end %>
-                  <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
+                  <% time=project.updated_on %>
+                  <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
+                  <p><span class="captainName"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
+                  <p><%=time_from_now time %></p>
+                  <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
                     项目名称：<%=project.name %><br />
                     创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
-                    <% time=project.updated_on %>
-                    <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                     更新时间：<%=time_from_now time %>
                   </div>
                 </div>

app/views/users/_user_homework_form.html.erb

@@ -4,11 +4,23 @@
     <%= javascript_include_tag 'homework','baiduTemplate' %>
     <script type="text/javascript">
       $(function(){
+        if($.trim($("#anonymous_comment").val()) == 1) {
+            $("#anonymous_comment").attr('checked',false);
+        } else {
+            $("#anonymous_comment").attr('checked',true);
+        }
         $("#BluePopupBox a.BlueCirBtn").click();
         <% if edit_mode && homework.is_group_homework? %>
             $("#GroupPopupBox a.group_btn").click();
         <% end %>
       });
+      function checked_val() {
+          if ($("#anonymous_comment").is(":checked")) {
+              $("#anonymous_comment").val(0);
+          } else {
+              $("#anonymous_comment").val(1);
+          }
+      }
     </script>
 <% end %>
 
@@ -39,6 +51,12 @@
         <%= calendar_for('homework_publish_time')%>
       <% end %>
     </div>
+    <% if !edit_mode || edit_mode && homework.homework_detail_manual.comment_status < 2 %>
+        <div class="fl f14 ml10" style="margin-top: 4px;">
+          <input type="checkbox" name="homework_common[anonymous_comment]" checked="checked" value="<%=edit_mode ? homework.anonymous_comment : 0 %>" id="anonymous_comment"/>
+          <span class="f14 c_grey mr10">启用匿评</span>
+        </div>
+    <% end %>
   </div>
   <div class="cl"></div>
   <p id="homework_end_time_span" class="c_red mt5"></p>
@@ -68,12 +86,12 @@
 
     <div class="mt5">
       <% if edit_mode %>
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common_<%= homework.id%>');">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="checked_val();submit_homework('edit_homework_common_<%= homework.id%>');">确定</a>
           <span class="fr mr10 mt3">或</span>
           <%#= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
           <a href="javascript:void(0);" class="fr mr10 mt3" onclick="cancel_edit();">取消</a>
     <% else %>
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="checked_val();submit_homework('new_homework_common');">发送</a>
           <span class="fr mr10 mt3">或</span>
           <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
       <% end %>

app/views/words/_new_respond_course.html.erb

@@ -1,9 +1,9 @@
-<%= form_tag(words_create_reply_path, :remote => true,:id=>"form_#{journal.id}") do %>
+<%= form_tag(words_create_reply_path, :remote => true) do %>
     <%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
                       :style => "resize: none;overflow: hidden;",:rows => 4,
                       :placeholder => l(:label_feedback_respond_content)#,
 
-                      #:maxlength => 250
+        #:maxlength => 250
     %>
     <p nhname="contentmsg"></p>
     <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
@@ -13,20 +13,6 @@
 
     <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
     <%= submit_tag l(:button_feedback_respond), :name => nil ,
-                   :class => "reply_btn" ,:onclick=>"form_sub_#{ journal.id}($(this),event)"%>
+                   :class => "reply_btn"%>
     <input nhname="cancel_btn" type="button" style="display:none;"/>
-<% end %>
-<script>
-  var flag_<%= journal.id %> = false;
-  function form_sub_<%= journal.id%>(dom,event){
-      if(flag_<%= journal.id %> == true){
-          //dom.attr('disabled','disabled');
-          return;
-      }else{
-          //dom.removeAttr('disabled');
-      }
-      flag_<%= journal.id %> = true;
-      $("#form_<%= journal.id%>").submit();
-      event.preventDefault();
-  }
-</script>
+<% end %>

config/configuration.yml.example

@@ -23,7 +23,7 @@
 #   email_delivery:
 #     delivery_method: :smtp
 #     smtp_settings:
-#       address: "localhost"
+#       address: smtp.163.com
 #       port: 25
 #
 # ==== SMTP server at example.com using LOGIN authentication and checking HELO for foo.com
@@ -32,12 +32,12 @@
 #   email_delivery:
 #     delivery_method: :smtp
 #     smtp_settings:
-#       address: "example.com"
-#       port: 25
+#       address: smtp.gmail.com
+#       port: 587
 #       authentication: :login
 #       domain: 'foo.com'
-#       user_name: 'myaccount'
-#       password: 'password'
+#       user_name: senluowanxiangt@gmail.com
+#       password: 1913TXBja
 #
 # ==== SMTP server at example.com using PLAIN authentication
 #
@@ -45,12 +45,12 @@
 #   email_delivery:
 #     delivery_method: :smtp
 #     smtp_settings:
-#       address: "example.com"
-#       port: 25
+#       address: smtp.gmail.com
+#       port: 587
 #       authentication: :plain
 #       domain: 'example.com'
-#       user_name: 'myaccount'
-#       password: 'password'
+#       user_name: senluowanxiangt@gmail.com
+#       password: 1913TXBja
 #
 # ==== SMTP server at using TLS (GMail)
 #
@@ -62,12 +62,12 @@
 #     delivery_method: :smtp
 #     smtp_settings:
 #       enable_starttls_auto: true
-#       address: "smtp.gmail.com"
+#       address: smtp.gmail.com
 #       port: 587
 #       domain: "smtp.gmail.com" # 'your.domain.com' for GoogleApps
 #       authentication: :plain
-#       user_name: "your_email@gmail.com"
-#       password: "your_password"
+#       user_name: senluowanxiangt@gmail.com
+#       password: 1913TXBja
 #
 #
 # === More configuration options
@@ -78,18 +78,17 @@
 # http://wiki.rubyonrails.org/rails/pages/HowToSendEmailsWithActionMailer
 
 
-# default configuration options for all environments
+
 default:
-  # Outgoing emails configuration (see examples above)
   email_delivery:
     delivery_method: :smtp
     smtp_settings:
-      address: smtp.example.net
-      port: 25
-      domain: example.net
-      authentication: :login
-      user_name: "redmine@example.net"
-      password: "redmine"
+          address: mail.trustie.net
+          port: 25
+          domain: mail.trustie.net
+          authentication: :login
+          user_name: "mail@trustie.net"
+          password: "loong2010"
 
   # Absolute path to the directory where attachments are stored.
   # The default is the 'files' directory in your Redmine instance.
@@ -104,7 +103,7 @@ default:
   # autologin_cookie_name: the name of the cookie (default: autologin)
   # autologin_cookie_path: the cookie path (default: /)
   # autologin_cookie_secure: true sets the cookie secure flag (default: false)
-  autologin_cookie_name:
+  autologin_cookie_name: "autologin_trustie"
   autologin_cookie_path:
   autologin_cookie_secure:
 
@@ -170,7 +169,7 @@ default:
 
   # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to
   # the ImageMagick's `convert` binary. Used to generate attachment thumbnails.
-  #imagemagick_convert_command:
+  imagemagick_convert_command: '/home/pdl/redmine-2.3.2-0/common/bin/convert'
 
   # Configuration of RMagcik font.
   #
@@ -196,11 +195,41 @@ default:
 
   # Maximum number of simultaneous AJAX uploads
   #max_concurrent_ajax_uploads: 2
+  #pic_types: "bmp,jpeg,jpg,png,gif"
+
+  repository_root_path: '/tmp/htdocs'
+  judge_server: 'http://judge.trustie.net/'
+
+  # Git's url
+  gitlab_address: 'http://gitfast.trustie.net'
 
 # specific configuration options for production environment
 # that overrides the default ones
 production:
+  # CJK support
+  rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
+  judge_server: 'http://192.168.80.21:8080/'
+  repository_root_path: '/home/pdl/redmine-2.3.2-0/apache2/htdocs'
+  cookie_domain: ".trustie.net"
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+      address: mail.trustie.net
+      port: 25
+      domain: mail.trustie.net
+      authentication: :login
+      user_name: "mail@trustie.net"
+      password: "loong2010"
 
 # specific configuration options for development environment
 # that overrides the default ones
 development:
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+      address: mail.trustie.net
+      port: 25
+      domain: mail.trustie.net
+      authentication: :login
+      user_name: "mail@trustie.net"
+      password: "loong2010"

config/locales/zh.yml

@@ -703,6 +703,7 @@ zh:
   label_search_by_login: 登录名
   label_search_by_name: 名字
   label_search_by_email: 邮箱
+  label_search_by_occupation: 单位
   label_result_plural: 结果
   label_all_words: 所有单词
   label_wiki: Wiki

config/routes.rb

@@ -438,6 +438,7 @@ RedmineApp::Application.routes.draw do
 
   post '/courses/:id/course_activity', :to => 'courses#show', :as => 'course_activity'
   get '/boards/:id/boards_topic', :to =>'boards#show', :as => 'boards_topic'
+  match 'courses/:course_id/news/index', :to => 'news#index', :via => [:get, :post], :as => 'new_course_news'
 
   #added by young
   resources :users do

db/migrate/20151224090313_delete_journals_message.rb

@@ -0,0 +1,17 @@
+class DeleteJournalsMessage < ActiveRecord::Migration
+  def up
+    count = JournalsForMessage.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do
+        JournalsForMessage.page(i).per(30).each do |message|
+          if !message.m_parent_id.nil? and message.parent.nil?
+            message.destroy
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151218110033) do
+ActiveRecord::Schema.define(:version => 20151224090313) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1569,7 +1569,6 @@ ActiveRecord::Schema.define(:version => 20151218110033) do
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
-  add_index "student_works", ["homework_common_id"], :name => "index"
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
     t.integer  "student_work_id"

public/assets/kindeditor/at/jquery.atwho.css

@@ -9,7 +9,7 @@
     border: 1px solid #DDD;
     border-radius: 3px;
     box-shadow: 0 0 5px rgba(0,0,0,0.1);
-    min-width: 120px;
+    min-width: 200px;
     max-height: 200px;
     overflow: auto;
     z-index: 11110 !important;

public/javascripts/application.js

@@ -870,7 +870,10 @@ function redo() {
     window.location.reload()
 }
 
-function encodeHomeworkUrl(url){
+function encodeHomeworkUrl(url, is_base64){
+  if(typeof is_base64 === 'boolean' && is_base64){
+    return '/zipdown/download?base64file='+url;
+  }
   var file = encodeURI(url).replace(/\+/g, '%2B');
   return '/zipdown/download?file='+file;
 }
@@ -891,7 +894,10 @@ $(function(){
             }
 
             if(res.length==1){
-                location.href = encodeHomeworkUrl(res[0].file);return;
+              if(res[0].base64file){
+                location.href = encodeHomeworkUrl(res[0].base64file, true);return;
+              }
+              location.href = encodeHomeworkUrl(res[0].file);return;
             }
 
             document.getElementById('light').style.display='block';
@@ -904,8 +910,12 @@ $(function(){
                 } else {
                     des = '第'+res[i].index+'个学生的作品下载';
                 }
-                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].file) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
 
+              if(res[i].base64file){
+                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].base64file, true) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
+              } else {
+                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].file) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
+              }
             }
         }
     });
@@ -921,7 +931,10 @@ $(function(){
             else
             {
                 if(res.length==1){
-                    location.href = encodeHomeworkUrl(res[0].file);return;
+                  if(res[0].base64file){
+                    location.href = encodeHomeworkUrl(res[0].base64file, true);return;
+                  }
+                  location.href = encodeHomeworkUrl(res[0].file);return;
                 }
                 document.getElementById('light').style.display='block';
                 $container = $('#light .upload_box_ul');
@@ -933,7 +946,12 @@ $(function(){
                     } else {
                         des = '第'+res[i].index+'个学生的作品下载';
                     }
+
+                  if(res[i].base64file){
+                    $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].base64file, true) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
+                  } else {
                     $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].file) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
+                  }
 
                 }
             }
@@ -973,3 +991,14 @@ function showNormalImage(id) {
     }
 
 }
+
+$(function(){
+  //at 加链接
+  $("span.at").hover(function(){
+    $(this).css('cursor', 'pointer');
+  });
+  $("span.at").live('click', function(){
+    var userId = $(this).attr('data-user-id');
+    $(window.location).attr('href', '/users/'+userId);
+  });
+});

public/stylesheets/courses.css

@@ -1209,7 +1209,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
 .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
-.relatePInfo {position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
+.relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
 
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}

public/stylesheets/org.css

@@ -67,7 +67,8 @@ a.linkGrey8:hover {color:#585858;}
 .orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;}
 .orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
-.org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
+.org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px;
+                   position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
 #orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
 
 .orgListStatus {width:55px; float:left;}
@@ -85,4 +86,6 @@ a.linkGrey8:hover {color:#585858;}
 .re_con_top span{ color:#999999; font-weight:bold;}
 ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 
-.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;
+                background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+.org_login_list a {color:#269ac9;}

public/stylesheets/public.css

@@ -581,7 +581,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
-.homepagePostAssignTo {float:left; font-size:14px; color:#15bccf; height:30px; line-height:30px; vertical-align:middle;}
+.homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}
 .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px;}
 .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
 .postAttSize {color:#888888; font-size:12px; margin-left: 5px;}
@@ -916,4 +916,5 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r
 .list_style ul li{list-style-type: disc;margin-left: 20px;}
 
 /* @功能 定义 */
-span.at {color:#269ac9;}
+span.at {color:#269ac9;}
+.del_line{text-decoration:line-through !important;}

public/stylesheets/repository.css

@@ -286,4 +286,5 @@ li.commit .commit-row-info .committed_ago {
 }
 .rep_history_grey{
     color: #7F7F7F;
-}
+}
+.rep_mail_name{max-width: 150px; overflow: hidden; text-overflow: ellipsis;}