Merge branch 'szzh' into develop

app/controllers/comments_controller.rb

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

app/controllers/courses_controller.rb

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

app/controllers/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

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

app/controllers/student_work_controller.rb

@@ -173,6 +173,12 @@ class StudentWorkController < ApplicationController
       end
 
       if student_work.save
+        course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
+        course_activity.updated_at = Time.now
+        course_activity.save
+        user_activity = UserActivity.where("act_type='HomeworkCommon' and act_id =#{@homework.id}").first
+        user_activity.updated_at = Time.now
+        user_activity.save
         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

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

app/helpers/journals_helper.rb

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

app/models/course_message.rb

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

app/models/forge_message.rb

@@ -1,14 +1,7 @@
 class ForgeMessage < ActiveRecord::Base
-  # 公共表中活动类型,命名规则:TYPE_OF_{类名}_ACT
-  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/journals_for_message.rb

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

app/models/mailer.rb

@@ -51,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/models/message.rb

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

app/views/courses/_course_activity.html.erb

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

app/views/courses/show.html.erb

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

app/views/courses/show.js.erb

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

app/views/courses/show_old.html.erb

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

app/views/forums/_forum_list.html.erb

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

app/views/forums/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

@@ -21,7 +21,7 @@
         function edit_desc(){
             if(<%=@forum.creator.id == User.current.id%>) {
                 desc = $("#forum_desc_span").html();
-                $("#forum_desc_span").html("<textarea id='forum_desc_input' onblur='change_forum_desc();' class='homepageSignatureTextarea'>" + desc + "</textarea>");
+                $("#forum_desc_span").html("<textarea id='forum_desc_input' onblur='change_forum_desc();'  style='width: 200px;height: 80px; max-width: 207px; max-height: 80px; border: 1px solid #d9d9d9;outline: none;margin: 0px 0px 12px 0px;'>" + desc + "</textarea>");
                 $("#forum_desc_input").focus();
             }
         }
@@ -149,15 +149,14 @@
               <!--<div class="homepageEditProfile"><a href="javascript:void(0);" class="homepageEditProfileIcon"></a></div>-->
             </div>
             <div class="fl">
-              <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;"><%= @forum.name%></div>
+              <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;"><%= @forum.name%></div>
               <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= @forum.creator.name%></a></div>
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
             </div>
             <div class="cl"></div>
-            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description%></span>
+            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description.html_safe%></span>
               <%if @forum.creator.id == User.current.id%>
                   <a href="javascript:void(0);" onclick="edit_desc();">
-                  <!--<img src="<%#= Rails.root%>/images/signature_edit.png" width="12" height="12" />-->
                   <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
                   </a>
                <%end%>

app/views/layouts/base_users_new.html.erb

@@ -14,7 +14,7 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new',prettify,'users', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','prettify','users', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= javascript_include_tag "avatars",'prettify'%>

app/views/layouts/new_base_user.html.erb

@@ -25,7 +25,7 @@
       <%= render :partial => 'layouts/unlogin_header' %>
   <% end%>
 </div>
-
+<div class="cl"></div>
 <div class="homepageContentContainer">
   <!--div class="homepageRightBannerImg"></div-->
   <div class="cl"></div>