Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/comments_controller.rb

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

app/controllers/homework_common_controller.rb

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

app/controllers/messages_controller.rb

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

app/controllers/student_work_controller.rb

@@ -173,6 +173,16 @@ class StudentWorkController < ApplicationController
       end
 
       if student_work.save
+        course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
+        if course_activity
+          course_activity.updated_at = Time.now
+          course_activity.save
+        end
+        user_activity = UserActivity.where("act_type='HomeworkCommon' and act_id =#{@homework.id}").first
+        if user_activity
+          user_activity.updated_at = Time.now
+          user_activity.save
+        end
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)

app/controllers/users_controller.rb

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

app/controllers/words_controller.rb

@@ -55,12 +55,16 @@ class WordsController < ApplicationController
     @jfm = add_reply_adapter options
     @save_succ = true if @jfm.errors.empty?
     if @save_succ
-    course_activity = CourseActivity.where("course_act_type='JournalsForMessage' and course_act_id =#{parent_id}").first
-    course_activity.updated_at = Time.now
-    course_activity.save
-    user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first
-    user_activity.updated_at = Time.now
-    user_activity.save
+      course_activity = CourseActivity.where("course_act_type='JournalsForMessage' and course_act_id =#{parent_id}").first
+      if course_activity
+        course_activity.updated_at = Time.now
+        course_activity.save
+      end
+      user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first
+      if user_activity
+        user_activity.updated_at = Time.now
+        user_activity.save
+      end
     end
     respond_to do |format|
       # format.html {

app/models/course_message.rb

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

app/models/forge_message.rb

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

app/models/mailer.rb

@@ -51,9 +51,9 @@ class Mailer < ActionMailer::Base
   def send_mail_anonymous_comment_open(homework_common)
     course = homework_common.course
     recipients ||= []
-    course.student.each do |student|
-      user = User.find(student.student_id)
-      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+    course.members.each do |member|
+      user = User.find(member.user_id)
+      # @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
       @token = Token.get_token_from_user(user, 'autologin')
       @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
       @anonymous_comment_close_name = homework_common.name
@@ -62,16 +62,16 @@ class Mailer < ActionMailer::Base
       recipients << user.mail
     end
     mail :to => recipients,
-         :subject => @subject
+         :subject => "[#{l(:mail_homework)}#{homework_common.name}] #{l(:mail_anonymous_comment_open)}"
   end
 
   # 作业匿评关闭
   def send_mail_anonymous_comment_close(homework_common)
     course = homework_common.course
     recipients ||= []
-    course.student.each do |student|
-      user = User.find(student.student_id)
-      @subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_open)}"
+    course.members.each do |member|
+      user = User.find(member.user_id)
+      #@subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_open)}"
       @token = Token.get_token_from_user(user, 'autologin')
       @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
       @anonymous_comment_close_name = homework_common.name
@@ -80,7 +80,28 @@ class Mailer < ActionMailer::Base
       recipients << user.mail
     end
     mail :to => recipients,
-         :subject => @subject
+         :subject => "[#{l(:mail_homework)}#{homework_common.name}]  #{l(:mail_anonymous_comment_open)}"
+  end
+
+  # 匿评失败给老师发送邮件通知
+  def send_mail_anonymous_comment_fail(homework_common)
+    course = homework_common.course
+    recipients ||= []
+    # 只给该课程的老师发送邮件提醒
+    course.members.each do |member|
+      if m.user.allowed_to?(:as_teacher,course)
+        user = User.find(member.user_id)
+        #@subject = "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
+        @token = Token.get_token_from_user(user, 'autologin')
+        @anonymous_comment_fail_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+        @anonymous_comment_fail_name = homework_common.name
+        @author = homework_common.user
+        #收件人邮箱
+        recipients << user.mail
+      end
+    end
+    mail :to => recipients,
+         :subject => "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
   end
 
   # author: alan
@@ -247,6 +268,7 @@ class Mailer < ActionMailer::Base
 
     has_content = [@issues,@issues_journals,@course_messages,@project_messages,@course_news,@course_news_comments,@project_news,@project_news_comments,@project_attachments,
                    @course_journal_messages,@user_journal_messages,@project_journal_messages,@forums,@memos,@attachments,@bids,@wiki_contents].any? {|o| !o.empty?}
+
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
     mail :to => user.mail,:subject => subject if has_content
@@ -263,7 +285,7 @@ class Mailer < ActionMailer::Base
     #收件人邮箱
     recipient = user.mail
     mail :to => recipient,
-         :subject => "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+         :subject => @subject
   end
 
   # 公共讨论区发帖、回帖添加邮件发送信息

app/views/courses/show.html.erb

@@ -1,7 +1,6 @@
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
         $("#Container").css("width","1000px");
     });
 </script>

app/views/forums/show.html.erb

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

app/views/homework_common/index.html.erb

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

app/views/homework_common/index.js.erb

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

app/views/layouts/base_courses.html.erb

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

app/views/layouts/base_forums.html.erb

@@ -143,6 +143,9 @@
     <div class="cl"></div>
     <div class="homepageContentContainer">
       <div class="homepageContent">
+        <div class="postRouteContainer mb10">
+          »&nbsp;<a href="<%= forums_path%>" class="postRouteLink">贴吧</a>&nbsp;»&nbsp;<a href="<%= forum_path(@forum)%>" title="<%=@forum.name %>" class="postRouteLink"><%= truncate(@forum.name,:lenght=>32)%></a>&nbsp;<%if @memo %> »&nbsp;<font class="fontGrey2"><%= @memo.subject%></font><% end %>
+        </div>
         <div class="homepageLeft">
           <div class="postDetailContainer">
             <div class="fl mr10 pr"> <%= link_to image_tag(url_to_avatar(@forum.creator),:width=>75,:height => 75,:alt=>'贴吧图像' ),user_path( @forum.creator) %>

app/views/mailer/send_for_user_activities.html.erb

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

app/views/mailer/send_mail_anonymous_comment_close.text.erb

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

app/views/mailer/send_mail_anonymous_comment_fail.html.erb

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

app/views/memos/_praise_tread.html.erb

@@ -2,7 +2,7 @@
    <% if User.current.logged? %>
     <% if horizontal %>
         <!-- 横排 -->
-        <div id="praise_tread_<%= obj.id %>" style="float:right;">
+        <div id="praise_tread_<%= obj.id %>" style="float:right; " >
           <% @is_valuate = is_praise_or_tread(obj,user_id)%>
           <% if @is_valuate.size > 0 %> <!-- 评价过   1代表赞 0代表踩 -->
               <% @flag = @is_valuate.first.praise_or_tread %>

app/views/memos/edit.html.erb

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

app/views/memos/show.html.erb

@@ -58,14 +58,16 @@
         </ul>
       </div>
       <%end%>
-      <div class="postDetailTitle"><a href="javascript:void(0);" class="f14 linkGrey4 fb" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;">主题: <%= @memo.subject%></a></div>
+      <div class="postDetailTitle">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;">主题: <%= @memo.subject%></a>
+        <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
+        <div class="cl"></div>
+      </div>
+
       <div class="postDetailCreater"><a href="javascript:void(0);" class="linkBlue2" target="_blank"><%= @memo.author.name%></a></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
-       <span id="praise_tread" style="float: right">
-    <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-  </span>
       <div class="cl"></div>
-      <div class="memo-content" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;margin-bottom: 0px !important;" >
+      <div class="memo-content" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>

app/views/repositories/show.html.erb

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

app/views/users/_course_homework.html.erb

@@ -46,28 +46,28 @@
       <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
         <%= activity.description.html_safe %>
       </div>
-      <% if is_teacher%>
-          <div class="homepagePostSetting">
+      <%# if is_teacher%>
+          <!--<div class="homepagePostSetting">
             <ul>
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
+                    <%#= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
                   </li>
                   <li>
-                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                    <%#= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                   </li>
                   <li>
-                    <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+                    <%#= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
                   </li>
                   <li>
-                    <%= homework_anonymous_comment activity %>
+                    <%#= homework_anonymous_comment activity %>
                   </li>
                 </ul>
               </li>
             </ul>
           </div>
-      <% end%>
+      <%# end%>-->
       </div>
     <div class="cl"></div>
   </div>

app/views/users/_course_journalsformessage.html.erb

@@ -62,7 +62,8 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img"><%= comment.notes.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
+                      <%= comment.notes.html_safe %></div>
                     <% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %>
                         <div class="recall">
                           <div class="homepagePostReplyPortrait">
@@ -83,7 +84,8 @@
                                 <% end %>
                                 <%= format_time reply.created_on %>
                               </div>
-                              <div class="homepagePostReplyContent break_word list_style upload_img"><%= reply.notes.html_safe %></div>
+                            <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
+                              <%= reply.notes.html_safe %></div>
                               <div class="cl"></div>
                           </div>
                           <div class="cl"></div>