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 = homework.course
-     course.student.each do |st|
+     course.members.each do |m|
-       @homework.course_messages << CourseMessage.new(:user_id => st.student_id, :course_id => course.id, :viewed => false, :status => m_status)
+       @homework.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => m_status)
      end
   end
   #提示

app/controllers/messages_controller.rb

@@ -162,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{
+      format.js {
-        @save_succ = true if @jfm.errors.empty?
+        @user_activity_id = params[:user_activity_id] if
+        @activity = JournalsForMessage.find(parent_id)
       }
     end
+
   end
   
   def destroy

app/helpers/journals_helper.rb

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

app/models/course_message.rb

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

app/models/forge_message.rb

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

app/models/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|
+    course.members.each do |member|
-      user = User.find(student.student_id)
+      user = User.find(member.user_id)
-      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      # @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_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|
+    course.members.each do |member|
-      user = User.find(student.student_id)
+      user = User.find(member.user_id)
-      @subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_open)}"
+      #@subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_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(){
-      function nh_new_notify_count_show(){
+        $("#RSide").removeAttr("id");
-          var new_notify_count = $("#new_notify_count").html();
+        $("#Container").css("width","1000px");
-          if(new_notify_count>0){
+    });
-              $("#new_notify_count").parent('span').show();
-          }else{
-              $("#new_notify_count").parent('span').hide();
-          }
-      }
-      $("div[nhname='container']").each(function(){
-          var container = $(this);
-          var btn = $("a[nhname='nh_act_link']",container);
-          if(btn.data('notify-id')>0){
-              btn.attr('target','_blank');
-              btn.click(function(){
-                  var flag = $("span[nhname='nh_act_flag']",container);
-                  if(flag!=undefined){
-                      var url = $(this).data('href');
-                      $.ajax({url:url,dataType:'text',success:function(data){
-                          if(data == 'true'){
-                              flag.remove();
-                              $("#new_notify_count").html($("#new_notify_count").html()-1);
-                              nh_new_notify_count_show();
-                          }
-                      }});
-                  }
-                  return true;
-              });
-          }
-      });
-      $("label[nhname='nh_act_link_all']").click(function(){
-          var url = $(this).data('href');
-          $.ajax({url:url,dataType:'text',success:function(data){
-              if(data == 'true'){
-                  $("span[nhname='nh_act_flag']").remove();
-                  $("#new_notify_count").html('0');
-                  nh_new_notify_count_show();
-              }
-          }});
-      });
-      nh_new_notify_count_show();
-  });
 </script>
+
+<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
+<div class="homepageRight mt0 ml10">
+<div class="homepageRightBanner">
+  <div class="NewsBannerName">课程动态</div>
+  <ul class="resourcesSelect">
+    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+      <ul class="homepagePostType">
+        <li>
+          <ul class="homepagePostTypeHomework fl">
+            <li><%= link_to "全部动态", {:controller => "courses", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%></li>
+            <li><%= link_to "作业动态", {:controller => "courses", :action => "show", :type => "homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%></li>
+            <li><%= link_to "通知动态", {:controller => "courses", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey"%></li>
+            <li><%= link_to "资源库动态", {:controller => "courses", :action => "show", :type => "attachment"}, :class => "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>-->
+                <a href="<%=  forum_path(forum) %>" class="f16 linkBlue" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%=forum.name.gsub(/(\r\n)/,'<br/>').html_safe %></a>
-                <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %>
+                <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
-              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;"><%= textAreailizable forum.description%></div>
+              <div class="postDes" 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>
+      <%= kindeditor_tag 'memo[content]','',:height=>300,:editor_id=>'memo_content'%>
-      <script>
-          var textarea = document.getElementById('memo_content');
-          autoTextarea(textarea);
-      </script>
     </div>
     <div class="mt10">
       <!--<a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>-->

app/views/homework_common/index.html.erb

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

app/views/homework_common/index.js.erb

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

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

app/views/mailer/send_for_user_activities.html.erb

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

app/views/mailer/send_mail_anonymous_comment_close.text.erb

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

app/views/mailer/send_mail_anonymous_comment_fail.html.erb

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

app/views/memos/_attachments_links.html.erb

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

app/views/memos/edit.html.erb

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

app/views/memos/show.html.erb

@@ -30,6 +30,14 @@
     $(function() {
         init_activity_KindEditor_data(<%= @memo.id%>,null,"87%");
     });
+
+    function del_confirm(){
+        if(confirm('确认删除么?')){
+            $("#del_link").click();
+        }else{
+
+        }
+    }
 </script>
 <div class="postRightContainer">
   <div class="postThemeContainer">
@@ -43,24 +51,25 @@
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">
               <li><a href="<%= edit_forum_memo_path(@memo.forum,@memo)%>" class="postOptionLink">编辑</a></li>
-              <li><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" class="postOptionLink">删除</a></li>
+              <li><a href="javascript:void(0);"  class="postOptionLink" onclick="del_confirm();">删除</a></li>
+              <li style="display: none"><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" id="del_link" ></a></li>
             </ul>
           </li>
         </ul>
       </div>
       <%end%>
-      <div class="postDetailTitle"><a href="javascript:void(0);" class="f14 linkGrey4 fb">主题: <%= @memo.subject%></a></div>
+      <div class="postDetailTitle"><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="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" >
+      <div class="memo-content" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class="mt10 fl">
+      <div class=" fl" style="width: 600px">
         <% if @memo.attachments.any?%>
             <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
             <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>

app/views/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_attachment.html.erb

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

app/views/users/_course_create.html.erb

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

app/views/users/_course_homework.html.erb

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

app/views/users/_course_journalsformessage.html.erb

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

app/views/users/_course_message.html.erb

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

app/views/users/_course_news.html.erb

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

app/views/users/_project_issue.html.erb

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

app/views/users/_project_message.html.erb

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

app/views/users/_show_user_resource.html.erb

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

app/views/users/_user_activities.html.erb

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

app/views/users/_user_homework_form.html.erb

@@ -36,8 +36,7 @@
     </div>
     <div class="cl"></div>
 
-
+    <div class="mt10 <%= defined?(select_course) ? 'none' : ''%>">
-    <div class="mt10">
       <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>
     </div>
     <p id="homework_course_id_span" class="c_red mt5"></p>

app/views/users/_user_homework_list.html.erb

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

app/views/users/_user_message_course.html.erb

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

app/views/users/_user_message_forge.html.erb

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

app/views/users/_user_message_forum.html.erb

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

app/views/users/_user_message_userfeedaback.html.erb

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

app/views/users/import_resources_to_homework.js.erb

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

app/views/users/user_homeworks.html.erb

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

app/views/users/user_homeworks.js.erb

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

app/views/users/user_import_resource.js.erb

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

app/views/users/user_messages.html.erb

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

app/views/words/create_reply.js.erb

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

config/locales/mailers/zh.yml

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

config/routes.rb

@@ -320,6 +320,8 @@ RedmineApp::Application.routes.draw do
   get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details'
   post '/users/:id/user_activities', :to => 'users#show', :as => "user_activities"
 
+  post '/courses/:id/course_activity', :to => 'courses#show', :as => 'course_activity'
+
   #added by young
   resources :users do
     collection do
@@ -775,6 +777,7 @@ RedmineApp::Application.routes.draw do
       post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
       delete 'join_in/join_group', :to => 'courses#unjoin_group'
       get 'copy_course'
+      match 'course_activity', :to => 'courses#course_activity',  :via => :get, :as => "course_activity"
     end
     collection do
       match 'join_private_courses', :via => [:get, :post]

db/migrate/20150925025200_alter_activities.rb

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

db/migrate/20150925060939_update_course_activities_updated_at.rb

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

db/migrate/20150928090128_add_status_to_forge_message.rb

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

lib/tasks/homework_endtime.rake

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

lib/tasks/homework_evaluation.rake

@@ -26,6 +26,7 @@ namespace :homework_evaluation do
           end
           homework_detail_manual.update_column('comment_status', 2)
           # 匿评开启消息邮件通知，# 所有人
+          #send_message_anonymous_comment(homework_common, 2)
           course = homework_common.course
           course.members.each do |m|
             homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
@@ -43,7 +44,7 @@ namespace :homework_evaluation do
             end
           end
           # 邮件通知
-          # Mailer.send_mail_anonymous_comment_close(homework_common).deliver
+          Mailer.send_mail_anonymous_comment_fail(homework_common).deliver
         end
       end
     end
@@ -64,10 +65,7 @@ namespace :homework_evaluation do
         end
         homework_detail_manual.update_column('comment_status', 3)
         # 匿评关闭消息通知 给所有人发
-        course = homework_common.course
+        send_message_anonymous_comment(homework_common, 3)
-        course.members.each do |m|
-          homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 3)
-        end
         # 邮件通知
         Mailer.send_mail_anonymous_comment_close(homework_common).deliver
       end

lib/tasks/issue_due_date.rake

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

public/javascripts/course.js

@@ -935,6 +935,11 @@ function clickOK(path)
         }
     });
 }
+//关闭引入资源弹框
+function hideResource(){
+    $('#ajax-modal').parent().removeClass("popbox").removeClass("referenceResourcesPopup");
+    hideModal();
+}
 //查询
 function SearchByName(url,event)
 {
@@ -986,3 +991,94 @@ function show_student_work(url){
         }
     );
 }
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+var autoTextarea2 = function (elem,elem2, extra, maxHeight) {
+    extra = extra || 0;
+    var isFirefox = !!document.getBoxObjectFor || 'mozInnerScreenX' in window,
+        isOpera = !!window.opera && !!window.opera.toString().indexOf('Opera'),
+        addEvent = function (element, type, callback) {
+            element.addEventListener ?
+                element.addEventListener(type, callback, false) :
+                element.attachEvent('on' + type, callback);
+        },
+        getFirstStyle = elem.currentStyle ? function (name) {
+            var val = elem.currentStyle[name];
+
+            if (name === 'height' && val.search(/px/i) !== 1) {
+                var rect = elem.getBoundingClientRect();
+                return rect.bottom - rect.top -
+                    parseFloat(getFirstStyle('paddingTop')) -
+                    parseFloat(getFirstStyle('paddingBottom')) + 'px';
+            };
+
+            return val;
+        } : function (name) {
+            return getComputedStyle(elem, null)[name];
+        },
+        minHeight = parseFloat(getFirstStyle('height'))
+
+    elem.style.resize = 'none';
+    elem2.style.resize = 'none';
+    var change = function () {
+        var scrollTop, height,
+            padding = 0,
+            style = elem.style,
+            style2 = elem2.style;
+
+
+        if (elem._length === elem.value.length) return;
+        elem._length = elem.value.length;
+        elem2._length = elem._length;
+        if (!isFirefox && !isOpera) {
+            padding = parseInt(getFirstStyle('paddingTop')) + parseInt(getFirstStyle('paddingBottom'));
+        };
+        scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+
+        elem.style.height = minHeight + 'px';
+        elem2.style.height = minHeight + 'px';
+        if (elem.scrollHeight > minHeight) {
+            if (maxHeight && elem.scrollHeight > maxHeight) {
+                height = maxHeight - padding;
+                style.overflowY = 'auto';
+                style2.overflowY = 'auto';
+            } else {
+                height = elem.scrollHeight - padding;
+                style.overflowY = 'hidden';
+                style2.overflowY = 'hidden';
+            };
+            style.height = height + extra + 'px';
+            style2.height = height + extra + 'px';
+            scrollTop += parseInt(style.height) - elem.currHeight;
+            document.body.scrollTop = scrollTop;
+            document.documentElement.scrollTop = scrollTop;
+            elem.currHeight = parseInt(style.height);
+        };
+        if (elem2.scrollHeight > minHeight) {
+            if (maxHeight && elem2.scrollHeight > maxHeight) {
+                height = maxHeight - padding;
+                style.overflowY = 'auto';
+                style2.overflowY = 'auto';
+            } else {
+                height = elem2.scrollHeight - padding;
+                style.overflowY = 'hidden';
+                style2.overflowY = 'hidden';
+            };
+            style.height = height + extra + 'px';
+            style2.height = height + extra + 'px';
+            scrollTop += parseInt(style2.height) - elem2.currHeight;
+            document.body.scrollTop = scrollTop;
+            document.documentElement.scrollTop = scrollTop;
+            elem2.currHeight = parseInt(style2.height);
+        };
+    };
+
+    addEvent(elem, 'propertychange', change);
+    addEvent(elem, 'input', change);
+    addEvent(elem, 'focus', change);
+    addEvent(elem2, 'propertychange', change);
+    addEvent(elem2, 'input', change);
+    addEvent(elem2, 'focus', change);
+    change();
+};

public/javascripts/homework.js

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

public/javascripts/new_user.js

@@ -419,6 +419,11 @@ function clickOK(path)
         }
     });
 }
+//关闭引入资源弹框
+function hideResource(){
+    $('#ajax-modal').parent().removeClass("popbox").removeClass("referenceResourcesPopup");
+    hideModal();
+}
 /////////////////////////////////////////////////////////////////////////////////////////
 
 var autoTextarea2 = function (elem,elem2, extra, maxHeight) {

public/javascripts/project.js

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

public/stylesheets/course_group.css

@@ -13,6 +13,7 @@ a:hover{ }
 .b_dblue{ background:#55a1b9; cursor:pointer;}
 .f_b{ font-weight: bold;}
 .c_blue{ color:#64bdd9;}
+a.c_blue{ color:#269ac9;}
 .c_grey{ color:#999999;}
 .c_grey02{ color:#666666;}
 .f_14{ font-size:14px;}

public/stylesheets/courses.css

@@ -84,6 +84,111 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .ml100{margin-left: 100px;}
 .mt16{margin-top: 16px;}
 
+/*课程右侧动态 new_user.css*/
+.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
+.homepageRight {width:750px; float:left; margin-top:10px; margin-bottom:10px;}
+.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}
+.homepagePostType {width:90px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-80px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
+.homepagePostTypeHomework {width:90px;}
+.homepagePostTypeProject {width:80px;}
+a.homepagePostTypeAssignment {background:url(../images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;}
+a.homepagePostTypeNotice {background:url(../images/homepage_icon.png) -87px -280px no-repeat; padding-left:23px;}
+a.homepagePostTypeForum {background:url(../images/homepage_icon.png) -10px -310px no-repeat; padding-left:23px;}
+a.homepagePostTypeQuiz {background:url(../images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
+a.homepagePostTypeQuestion {background:url(../images/homepage_icon.png) -10px -273px no-repeat; padding-left:23px;}
+a.homepagePostTypeMine {background:url(../images/homepage_icon.png) -187px -277px no-repeat; padding-left:23px;}
+a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -189px -308px no-repeat; padding-left:23px;}
+a.postTypeGrey {color:#888888;}
+a.postTypeGrey:hover {color:#269ac9;}
+.homepagePostBrief {width:710px; margin:0px auto; position:relative;}
+.homepagePostPortrait {float:left; width:42px;}
+.homepagePostDes {float:left; width:645px; margin-left:15px;}
+.homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;}
+.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;}
+.homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
+.homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
+.homepagePostSubmit:hover {background-color:#d8d8d8;}
+.homepagePostIntro {font-size:14px; color:#484848;}
+.homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
+.homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
+.homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
+.homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
+.borderBottomNone {border-bottom:none !important;}
+.topBorder {border-top: 1px solid #e4e4e4;}
+div.minHeight48{min-height: 48px;}
+.homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:20px;}
+.homepagePostReplyBannerTime{width:85px; display:inline-block;}
+.homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;}
+.homepagePostReplyInputContainer {width:630px; float:left;}
+.homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;}
+.homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;}
+.homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#269ac9;}
+.homepagePostReplySubmit:hover {background-color:#329cbd;}
+a.postReplySubmit {color:#ffffff; display:block;}
+.homepagePostReplyCancel {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#888888; background-color:#cecece; margin-left:8px;}
+.homepagePostReplyCancel:hover {background-color:#717171;}
+a.postReplyCancel {color:#888888; display:block;}
+a.postReplyCancel:hover {color:#ffffff;}
+.homepagePostReplyInputContainer2 {width:595px; margin:0px auto;}
+.homepagePostReplyInput2 {width:588px; height:45px; max-width:588px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:0px auto 10px auto;}
+.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:60px;}
+.homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
+.homepagePostSetting ul li:hover ul {display:block;}
+.homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
+.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
+.homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
+a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
+a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
+.homepagePostReplyPortrait {float:left; width:33px;}
+.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
+.homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
+.homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
+.homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.homepagePostProjectState {width:52px; 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:#269ac9;}
+.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; margin-right:25px;}
+.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;}
+a.postGrey {color:#484848;}
+a.postGrey:hover {color:#000000;}
+a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;}
+a:hover.gz_btn{ color:#ff5722;}
+.loadMore {font-size:14px;width:748px; text-align:center; display:block; border:1px solid #dddddd; background-color:#ffffff; float:right;padding:5px 0; letter-spacing: 1px;}
+a.f_grey {color:#666666;}
+a.f_grey:hover {color:#000000;}
+.resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;}
+.resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
+.resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
+.resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
+.nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
+.more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
+.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}
+.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
+a.homepageWhite {color:#ffffff;}
+a.homepageWhite:hover {color:#a1ebff}
+a.newsGrey {color:#4b4b4b;}
+a.newsGrey:hover {color:#000000;}
+a.newsRed {color:red;}
+a.newsRed:hover {color:#888888;}
+a.replyGrey {color:#888888; display:inline-block;}
+a.replyGrey:hover {color:#4b4b4b;}
+a.replyGrey1 {color:#888888;}
+a.replyGrey1:hover {color:#4b4b4b;}
+a.newsBlue {color:#269ac9;}
+a.newsBlue:hover {color:#297fb8;}
+a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
+a.menuGrey {color:#808080;}
+a.menuGrey:hover {color:#fe7d68;}
+.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
+#navSearchAlert {display:none;}
+.homepagePostReplyjournal{margin-left: 15px; float: left;}
 
 /*邮件邀请*/
 .box_main{ width:345px; margin:0 auto;}
@@ -158,6 +263,7 @@ a:hover.grey_btn{ background:#717171; color:#fff;}
 .b_dblue{ background:#55a1b9; cursor:pointer;}
 .f_b{ font-weight: bold;}
 .c_blue{ color:#64bdd9;}
+a.c_blue{ color:#269ac9;}
 .c_grey{ color:#999999;}
 a.c_grey{ color:#999999;}
 .c_grey02{ color:#666666;}
@@ -261,7 +367,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .recall_head a{ display:block; width:30px; height:30px; border:1px solid #CCC; padding:1px;}
 .recall_head a:hover{border:1px solid #15bccf;}
 .recall_con{ float:left;color:#777777; width:520px; margin-left:10px;word-break: break-all;word-wrap: break-word; }
-.recall_con a{ color:#15bccf; }
+.recall_con a{ color:#269ac9; }
 .ping_list{ margin-top:15px;}
 .ping_ttl{height:18px;}
 .ping_ctt{height:auto;padding:6px;clear:both;}
@@ -785,54 +891,109 @@ a:hover.about_me{ color:#0781b4;}
 
 
 /*20150820课程作业 LB*/
-.HomeWork {width:708px; background-color:#ffffff; padding:10px 20px 20px 20px; border:1px solid #dddddd;}
+.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;}
 .RightBanner {width:708px; height:34px;  border-bottom:1px solid #e9e9e9;}
 select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
-a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #15bccf; color:#15bccf;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
-a:hover.BlueCirBtn{ background:#15bccf; color:#fff;}
+a:hover.BlueCirBtn{ background:#269ac9; color:#fff;}
 .W440{ width:440px;}
 .W120{ width:110px;}
 .W700{ width:700px;max-width: 700px;min-width: 700px;}
 .w708{width: 708px;}
-a.AnnexBtn{  background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+.w712{width:712px;max-width:712px;min-width: 712px;}
-a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#15bccf;}
+.w720{width:721px;}
+.w709{width: 709px;}
+.w701{width: 701px;}
+a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;}
 a.FilesBtn{  background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
-a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#15bccf;}
+a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#269ac9;}
-a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #15bccf; color:#15bccf;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
-a:hover.BlueCirBtnMini{ background:#15bccf; color:#fff;}
+a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 a.DropBtn{background: url(../images/homepage_icon2.png) -125px -339px no-repeat; width:85px; height:20px; display:block;  color:#888888; font-size:14px;}
 a:hover.DropBtn{background: url(../images/homepage_icon2.png) -125px -370px no-repeat;}
 .DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;}
+/*20150820课程作业 LB*/
+.HomeWork {width:708px; background-color:#ffffff; padding:20px; border:1px solid #dddddd;}
+.RightBanner {font-size:16px; width:733px;  color:#4b4b4b; padding:10px 0 0 15px; margin-bottom:10px; background:#fff; border:1px solid #dddddd;height:34px;}
+select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
+a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#fff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.BlueCirBtn{ background:#3598db; color:#fff;}
+.W440{ width:440px;}
+.W120{ width:110px;}
+.W700{ width:700px;}
+/*a.AnnexBtn{  background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/
+/*a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}*/
+a.FilesBtn{  background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:38px; height:20px; display:block; padding-left:20px; color:#888888;}
+a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#3598db;}
+a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;}
+a.ProBtn{background: url(../images/homepage_icon.png) -86px -396px no-repeat; width:30px; height:20px; display:block; padding-left:20px; color:#888888;}
+a:hover.ProBtn{background: url(../images/homepage_icon.png) -86px -426px no-repeat; color:#3598db;}
+
+a.DropBtn{background: url(../images/homepage_icon.png) -125px -339px no-repeat; width:85px; height:20px; display:block;  color:#888888; font-size:14px;}
+a:hover.DropBtn{background: url(../images/homepage_icon.png) -125px -370px no-repeat;}
+.DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;}
 /*20150820编程作业 LB*/
 .W320{ width:320px;}
-.icon_add{ background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
+.icon_add{ background:url(../images/course/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
-a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
+a:hover.icon_add{background:url(../images/course/icons.png) -20px -310px no-repeat;}
-.icon_remove{background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
+.icon_remove{background:url(../images/course/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
-a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
+a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-repeat;}
 /*20150820提交作业 LB*/
 .HomeWorkBox{ background:#f6f6f6; padding:10px; margin:10px 0;}
 .c_grey{ color:#888888;}
-.c_dark_grey{color:#a9a9a9 !important;}
 .HomeWorkP{ width:690px; font-size:14px;}
+.HomeWorkP p{background-color: transparent !important;}
+.HomeWorkP div{background-color: transparent !important;}
 .H150{ height:150px;}
 .ProResult{width:748px; background-color:#fff;  border:1px solid #dddddd;border-bottom:none; }
 .ProResultTop{ height:38px; line-height:38px; border-bottom:1px solid #dddddd; background:#f2f2f2; padding:0 10px;}
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
+.m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}
 .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; }
 .SearchIcon:hover{background:url(../images/homepage_icon2.png) 676px -419px no-repeat; }
-a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
+a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
-a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
 a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 .ProResultUl span { display:block; float:left;}
 .ProResultUl li{  line-height:35px;  border-bottom:1px solid #dddddd; }
 .DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}
-.mb50{margin-bottom: 50px;}
+
+a.UsersEditBtn{ display:block; width:55px; height:20px; border:1px solid #6d6d6d; color:#fff; background:#888888 url(../images/homepage_icon.png) -11px -35px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.UsersEditBtn{ color:#484848;  background:#888888 url(../images/homepage_icon.png) -11px -74px no-repeat;}
+a.UsersAttBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -9px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.UsersAttBtn{border:1px solid #888888; }
+a.UsersApBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.UsersApBtn{border:1px solid #888888; }
+/*20150906编程作业设置弹框 LB*/
+.C_lgrey{ color:#a5a5a5;}
+.C_Blue{ color:#3598db;}
+a.C_Blue{ color:#3598db;}
+a:hover.C_Blue{ color:#297fb8;}
+.BluePopupBox{  padding:20px; background:#fff; width:707px;}
+/*.BluePopupBox:hover{ border:3px solid #297fb8; }*/
+a.CloseBtn{background:url(../images/CloseBtn.png) 0px 0px no-repeat; width:13px; height:13px; display:block; float:right;}
+a:hover.CloseBtn{background:url(../images/CloseBtn.png) 0px -24px no-repeat; }
+.BluePopuph2{ font-size:16px; font-weight:bold; color:#3598db; }
+.ProBoxResult{width:706px; background-color:#fff;  border:1px solid #dddddd;border-bottom:none; max-height:300px; overflow:auto; }
+.W108{ width:108px;}
+.HomeWorkCon{ width:706px;}
+/*20150906导入作业弹框 LB*/
+.ImportBox{ width:708px; max-height:300px;overflow:auto;}
+.ImportBox li{ margin-bottom:10px;}
+.WorkTitle{ max-width:660px; font-size:14px; font-weight:bold; color:#484848;}
+.W520{ width:680px;}
+.ImportSearchIcon{background:url(../images/homepage_icon.png) 656px -393px no-repeat; }
+.ImportSearchIcon:hover{background:url(../images/homepage_icon.png) 656px -419px no-repeat; }
+.calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;}
+.calendar_div{border: 1px solid #d9d9d9;}
 
 /* 课程主页 */
 .rside_nav{ background:#eaebec; padding:10px 10px;}
@@ -874,6 +1035,8 @@ a:hover.c_grey{ color:#333;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .last_time{width:auto; text-align:right; margin-right:70px;}
 .link_file_box{ width:360px;}
-a.postOptionLink{float: right;color: #64bdd9;display: block;padding: 1px 5px;border: 1px solid #64bdd9;width: initial;}
+/*a.postOptionLink{float: right;color: #64bdd9;display: block;padding: 1px 5px;border: 1px solid #64bdd9;width: initial;}*/
-a:hover.postOptionLink {color: #fff;background: #64bdd9;}
+/*a:hover.postOptionLink {color: #fff;background: #64bdd9;}*/
+a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
+a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
 

public/stylesheets/header.css

@@ -1,117 +1,119 @@
-/*新个人主页框架css*/
+/*新个人主页框架css*/
-.navContainer {width:100%; background-color:#269ac9;}
+.navContainer {width:100%; background-color:#269ac9;}
-.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
+.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
-.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
+.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
-.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
+.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
-.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
+.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
-.navHomepageMenu:hover {background-color:#297fb8;}
+.navHomepageMenu:hover {background-color:#297fb8;}
-.navHomepageSearchBoxcontainer {margin-top:11px; }
+.navHomepageSearchBoxcontainer {margin-top:11px; }
-.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
+.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
-.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;}
+.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;}
-.homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
+.homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
-a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
+a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
-#navSearchAlert {display:none;}
+#navSearchAlert {display:none;}
-.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;}
+.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;}
-.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:35px; display:block;}
+.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:35px; display:block;}
-.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
+.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
-.navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
+.navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
-.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
+.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
-/*.navHomepageProfile ul li ul {display:none;}
+/*.navHomepageProfile ul li ul {display:none;}
-.navHomepageProfile ul li:hover ul {display:block;}*/
+.navHomepageProfile ul li:hover ul {display:block;}*/
-.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
+.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
-.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
+.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
-.homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
+.homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
-.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
+.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
-.homepagePortraitImage:hover {border:1px solid #15bccf;}
+.homepagePortraitImage:hover {border:1px solid #15bccf;}
-.homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
+.homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
-.homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
+.homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
-.homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
+.homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
-.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
+.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
-.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;}
+.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;}
-.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
+.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
-.homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
+.homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
-.homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
+.homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
-.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
+.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
-.homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
+.homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
-.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
+.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
-.homepageImageNumber {font-size:12px; color:#484848;}
+.homepageImageNumber {font-size:12px; color:#484848;}
-a.homepageImageNumber:hover {color:#15bccf;}
+a.homepageImageNumber:hover {color:#15bccf;}
-.homepageImageText {font-size:12px; color:#888888;}
+.homepageImageText {font-size:12px; color:#888888;}
-.homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;}
+.homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;}
-.homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
+.homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
-.homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
+.homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
-.homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
+.homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
-.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
+.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
-.homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
+.homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
-a.coursesLineGrey {color:#808080; display:block;}
+a.coursesLineGrey {color:#808080; display:block;}
-a.coursesLineGrey:hover {color:#ffffff;}
+a.coursesLineGrey:hover {color:#ffffff;}
-.homepageLeftMenuMore {height:18px;}
+.homepageLeftMenuMore {height:18px;}
-.homepageLeftMenuMore:hover {background-color:#b3e0ee;}
+.homepageLeftMenuMore:hover {background-color:#b3e0ee;}
-.homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
+.homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
-.homepageMenuSetting {display:inline-block; margin-right: 17px; margin-top: 18px;}
+.homepageMenuSetting {display:inline-block; margin-right: 17px; margin-top: 18px;}
-a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
+a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
-.homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
+.homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
-.homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
+.homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
-.homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
+.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
-.NewsBannerName {font-size:16px; color:#4b4b4b; display:block;  width:150px; float:left; margin-top:4px;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}.newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
-.newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
+.newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
-.newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
+.homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
-.homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
+.homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
-.homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
+.homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
-.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
+.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
-.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
+a.homepageWhite {color:#ffffff;}
-a.homepageWhite {color:#ffffff !important;}
+a.homepageWhite:hover {color:#a1ebff}
-a.homepageWhite:hover {color:#a1ebff !important;}
+a.newsGrey {color:#4b4b4b;}
-a.newsGrey {color:#4b4b4b;}
+a.newsGrey:hover {color:#000000;}
-a.newsGrey:hover {color:#000000;}
+a.newsRed {color:red;}
-a.replyGrey {color:#888888; display:inline-block;}
+a.newsRed:hovor {color:#888888;}
-a.replyGrey:hover {color:#4b4b4b;}
+a.replyGrey {color:#888888; display:inline-block;}
-a.replyGrey1 {color:#888888;}
+a.replyGrey:hover {color:#4b4b4b;}
-a.replyGrey1:hover {color:#4b4b4b;}
+a.replyGrey1 {color:#888888;}
-a.newsBlue {color:#15bccf;}
+a.replyGrey1:hover {color:#4b4b4b;}
-a.newsBlue:hover {color:#0781b4;}
+a.newsBlue {color:#269ac9;}
-a.menuGrey {color:#808080 !important;}
+a.newsBlue:hover {color:#297fb8;}
-a.menuGrey:hover {color:#fe7d68 !important;}
+a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
-.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
+a.menuGrey {color:#808080;}
-#navSearchAlert {display:none;}
+a.menuGrey:hover {color:#fe7d68;}
-.none{display: none;}
+.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
-.db {display:block !important;}
+#navSearchAlert {display:none;}
-
+.none{display: none;}
-/*myctrip*/
+.db {display:block !important;}
-.userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
+
-a.topnav_login_a{color:#fff; display:inline-block;}
+/*myctrip*/
-a.topnav_login_a:hover {color:#a1ebff;}
+.userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
-a.topnav_login_mes{color:#fff; width:10px;height:20px; padding-left:15px; background: url(../images/item.png) -84px -145px no-repeat; display:inline-block; vertical-align:top;}
+a.topnav_login_a{color:#fff; display:inline-block;}
-a.topnav_login_mes:hover {color:#a1ebff;}
+a.topnav_login_a:hover {color:#a1ebff;}
-a.topnav_login_box{ color:#fff; font-size:14px; font-weight:bold; width:90px; display:inline-block;}
+a.topnav_login_mes{color:#fff; width:10px;height:20px; padding-left:15px; background: url(../images/item.png) -84px -145px no-repeat; display:inline-block; vertical-align:top;}
-.menuArrow {background:url(../images/item.png) -20px -40px no-repeat;}
+a.topnav_login_mes:hover {color:#a1ebff;}
-li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
+a.topnav_login_box{ color:#fff; font-size:14px; font-weight:bold; width:90px; display:inline-block;}
-a.topnav_login_box:hover {color:#a1ebff;}
+.menuArrow {background:url(../images/item.png) -20px -40px no-repeat;}
-.navRow1 {margin:0; padding:0;}
+li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
-.navRow2 {margin:0; padding:0;}
+a.topnav_login_box:hover {color:#a1ebff;}
-.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px; font-size: 12px;}
+.navRow1 {margin:0; padding:0;}
-.topnav_login_list a{color:#269ac9;}
+.navRow2 {margin:0; padding:0;}
-.topnav_login_list li{ }
+.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px; font-size: 12px;}
-.portraitRadius {border-radius: 3px;}
+.topnav_login_list a{color:#269ac9;}
-
+.topnav_login_list li{ }
-/*底部*/
+.portraitRadius {border-radius: 3px;}
-#Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
+
-.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
+/*底部*/
-.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px;}
+#Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
-.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
+.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;}
+.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px;}
-.copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
+.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
-a.f_grey {color:#666666 !important;}
+.departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;}
-a.f_grey:hover {color:#000000 !important;}
+.copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
-.mr30 {margin-right: 30px;}
+a.f_grey {color:#666666 !important;}
-
+a.f_grey:hover {color:#000000 !important;}
-
+.mr30 {margin-right: 30px;}
-/*注册登陆页面*/
+
-#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+
-#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+/*注册登陆页面*/
-#loginSignButton:hover {background-color:#297fb8;}
+#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
-#loginInButton:hover {background-color:#297fb8;}
+#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+#loginSignButton:hover {background-color:#297fb8;}
+#loginInButton:hover {background-color:#297fb8;}

public/stylesheets/new_user.css

@@ -318,16 +318,12 @@ a:hover.search_btn{ background: #0fa9bb;}
 
 /*资源库*/
 .resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
-/*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/
 .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
 .bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
 .resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;}
 .resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
 .resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
 .resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
-/*.resourcesIcon {margin-top:15px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}*/
-/*.resourcesIcon:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/
-/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
 a.resourcesGrey {font-size:12px; color:#888888;}
 a.resourcesGrey:hover {font-size:12px; color:#269ac9;}
 .resourcesBanner ul li:hover ul.resourcesType {display:block;}
@@ -339,21 +335,13 @@ a.uploadText {color:#ffffff; font-size:14px;}
 .resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;}
 .searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}
 .searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
-/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
 .resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}
-/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
 .resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;}
-/*.resourcesListName {width:175px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
 .resourcesListName {width:340px; height:40px; line-height:40px; text-align:left;}
 .resourcesListSize {width:85px; height:40px; line-height:40px; text-align:center;}
 .resourcesListType {width:85px; height:40px; line-height:40px; text-align:center;}
 .resourcesListUploader {width:85px; height:40px; line-height:40px; text-align:center;}
 .resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
-/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
 a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}
 a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
@@ -362,7 +350,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
 .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
 .resourcesSelectSend {float:right;}
-/*.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}*/
 .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #269ac9; border-radius:5px; float:right;}
 a.sendButtonBlue {color:#269ac9;}
 a.sendButtonBlue:hover {color:#ffffff;}
@@ -460,7 +447,7 @@ input.sendSourceText:hover {background-color:#297fb8;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden;}
-.popbox{/* 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{position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
 .uploadText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
@@ -553,7 +540,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsPubType {width:230px; font-size:12px; color:#888888; display: block;}
 .homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;}
 .homepageNewsContent {width:355px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
-.homepageSystenMessageContent {width:291px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; }
+.homepageSystenMessageContent {width:281px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContent {width:235px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 
@@ -643,6 +630,7 @@ a.postGrey {color:#484848;}
 a.postGrey:hover {color:#000000;}
 a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;}
 a:hover.gz_btn{ color:#ff5722;}
+.homepagePostReplyjournal{margin-left: 15px; float: left;}
 
 /*课程主页css*/
 .homepageCoursesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-65px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
@@ -701,7 +689,7 @@ ul.list_watch{
 .w450{width: 450px;}
 
 /*引用资源库弹窗*/
-.referenceResourcesPopup {width:710px; height:500px !important; border:3px solid #269ac9 !important; padding-left:20px; padding-right:20px; padding-bottom:35px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
+.referenceResourcesPopup {width:710px; height:500px !important; border:3px solid #269ac9 !important; padding-left:16px !important; padding-right:16px !important; padding-bottom:16px !important; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
 .referenceText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight:bold;}
 .referenceSearchBox {border:1px solid #e6e6e6; width:235px; height:32px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchReferencePopup {border:none; outline:none; background-color:#ffffff; width:190px; height:32px; padding-left:10px; display:inline-block; float:left;}
@@ -761,7 +749,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;}
 .postDetailWrap {width:580px; float:left;}
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
-.postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;white-space:nowrap;text-overflow:ellipsis;}
+.postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}

public/stylesheets/project.css

@@ -168,6 +168,7 @@ a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px s
 a:hover.problem_pic{border:1px solid #64bdd9;}
 .issues_icon{ background:url(../images/public_icon.png) 0 -342px no-repeat; width:16px; height:21px;}
 .problem_txt{ width:600px; margin-left:10px; color:#777777;  }
+.problem_txt img {max-width:100%;}
 .pro_txt_w{width:610px;}
 a.problem_name{ color:#ff5722;max-width: 80px;
     overflow: hidden;
@@ -220,6 +221,7 @@ a:hover.talk_btn{ background:#2a9dc1;}
 /****讨论区内页***/
 .mt0{ margin-top:0px;}
 .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;}
+.talk_info img {max-width:100%;}
 a.talk_edit{ color:#426e9a; margin-right:5px;}
 a:hover.talk_edit{ color:#ff5722;}
 .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;}
@@ -245,6 +247,7 @@ a:hover.grey_btn{ background:#717171; color:#fff;}
 .b_dblue{ background:#55a1b9; cursor:pointer;}
 .f_b{ font-weight: bold;}
 .c_blue{ color:#64bdd9;}
+a.c_blue{ color:#269ac9;}
 a.c_dblue{ color: #3ca5c6;}
 a:hover.c_dblue{ color: #0781b4;}
 .c_grey{ color:#999999;}
@@ -875,4 +878,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 
 /*version*/
 .time_tracter{color: #64BDD9;padding:  5px;}
+.wiki {width: 510px;}
+.wiki img {max-width:100%;}
 

public/stylesheets/public.css

@@ -152,7 +152,7 @@ a.c_orange{color:#ff5722;}
 a:hover.c_orange{color: #d33503;}
 a.c_lorange{color:#ff9900;}
 a:hover.c_lorange{color:#fff;}
-a.c_blue{ color:#15bccf;}
+a.c_blue{ color:#269ac9;}
 a.c_eblue{color: #3784D3}
 a.c_setting_blue{color: #0781B4}
 a.c_dblue{ color:#09658c;}
@@ -391,83 +391,6 @@ a:hover.search_btn{ background: #0fa9bb;}
 #LSide{ width:240px;   }
 #RSide{ width:670px;  margin-left:10px;  background:#fff; padding:10px; margin-bottom:10px;}
 
-
-/*资源库*/
-.resources {width:728px; background-color:#ffffff; padding:10px 10px 20px 10px; border:1px solid #dddddd;}
-.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
-.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
-.resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;}
-.resourcesSelected {width:25px; height:20px; position:relative; background:url(../images/resource_icon_list.png) 0px 0px no-repeat;}
-.resourcesSelected:hover { background:url(../images/resource_icon_list.png) 0px -25px no-repeat;}
-.resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
-.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
-a.resourcesTypeAll {background:url(../images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
-a.resourcesTypeAtt {background:url(../images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
-a.resourcesGrey {font-size:12px; color:#888888;}
-a.resourcesGrey:hover {font-size:12px; color:#269ac9;}
-.resourcesBanner ul li:hover ul.resourcesType {display:block;}
-ul li:hover ul {display:block;}
-.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#269ac9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
-.resourcesUploadBox:hover {background-color:#297fb8;}
-a.uploadBoxIcon {background:url(../images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:81px; height:30px; padding-left:22px; font-size:14px; color:#ffffff;}
-.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;}
-.searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}
-.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(../images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
-.resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}
-.resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;}
-.resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
-.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}
-.resourcesListName {width:160px; height:40px; line-height:40px; text-align:left;}
-.resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
-.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:180px; height:40px; line-height:40px; text-align:center;}
-.resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
-.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;}
-.resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
-.resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
-.resourcesSelectSend {float:right;}
-.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #269ac9; border-radius:5px; float:right;}
-a.sendButtonBlue {color:#269ac9;}
-a.sendButtonBlue:hover {color:#ffffff;}
-.resourcesSelectSendButton:hover {background-color:#297fb8;}
-a.resourcesBlack {font-size:12px; color:#4c4c4c;}
-a.resourcesBlack:hover {font-size:12px; color:#000000;}
-.dropdown-menu {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    z-index: 1000;
-    display: none;
-    float: left;
-    min-width: 80px;
-    padding: 5px 0;
-    margin: 2px 0 0;
-    font-size: 12px;
-    text-align: left;
-    background-color: #fff;
-    -webkit-background-clip: padding-box;
-    background-clip: padding-box;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-    box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-}
-.dropdown-menu > li > a {
-    display: block;
-    padding: 3px 20px;
-    clear: both;
-    font-weight: normal;
-    line-height: 1.5;
-    color:#616060;
-    white-space: nowrap;
-}
-.dropdown-menu > li > a:hover{
-    color: #ffffff;
-    text-decoration: none;
-    background-color: #64bdd9;
-    outline:none;
-}
-
 /*发送资源弹窗*/
 /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
 .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
@@ -563,8 +486,8 @@ a.coursesLineGrey:hover {color:#ffffff;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
-.homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
+.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
-.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left; margin-top:4px;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}
 .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
 .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
 .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
@@ -577,10 +500,15 @@ a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
 a.newsGrey {color:#4b4b4b;}
 a.newsGrey:hover {color:#000000;}
+a.newsRed {color:red;}
+a.newsRed:hover {color:#888888;}
 a.replyGrey {color:#888888; display:inline-block;}
 a.replyGrey:hover {color:#4b4b4b;}
+a.replyGrey1 {color:#888888;}
+a.replyGrey1:hover {color:#4b4b4b;}
 a.newsBlue {color:#269ac9;}
 a.newsBlue:hover {color:#297fb8;}
+a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
 a.menuGrey {color:#808080;}
 a.menuGrey:hover {color:#fe7d68;}
 
@@ -601,12 +529,12 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostDes {float:left; width:600px; margin-left:20px;}
 .homepagePostTo {font-size:14px; color:#484848; margin-bottom:8px;}
 .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:10px; font-weight:bold;}
-.homepagePostSubmitContainer {height:30px; margin-bottom:10px;}
+.homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
-.homepagePostSubmit {font-size:14px; color:#888888; width:80px; height:30px; text-align:center; vertical-align:middle; line-height:30px; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px;}
+.homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
 .homepagePostIntro {font-size:14px; color:#484848;}
-.homepagePostDeadline {font-size:12px; color:#888888; float:left; height:30px; line-height:30px; vertical-align:middle;}
+.homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
-.homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
+.homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
 .borderBottomNone {border-bottom:none !important;}
 .topBorder {border-top: 1px solid #e4e4e4;}
@@ -643,6 +571,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .postAttSize {color:#888888; font-size:12px;}
 a.postGrey {color:#484848;}
 a.postGrey:hover {color:#000000;}
+.homepagePostReplyjournal{margin-left: 15px; float: left;}
 
 /*课程主页css*/
 .homepageCoursesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-65px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
@@ -677,29 +606,30 @@ a.loginChooseTab {color:#484848; height:30px; display:block;}
 .loginSignRow {height:60px; min-height:60px;}
 
 /*课程选择弹窗*/
-.coursesChoosePopup {width:530px; height:auto; border:3px solid #269ac9; padding-left:20px; padding-bottom:35px; background-color:#ffffff; position:absolute; top:0; left:0; z-index:1000;}
+.coursesChoosePopup {width:530px; height:auto;  padding-left:20px; padding-bottom:35px; background-color:#ffffff;}
 .coursesSearchBox {border:1px solid #e6e6e6; width:515px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchCoursesPopup {border:none; outline:none; background-color:#ffffff; width:470px; height:25px; padding-left:10px; display:inline-block; float:left;}
 .searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon.png) -180px -273px no-repeat; display:inline-block; float:left;}
 .searchIconPopup:hover {background:url(../images/homepage_icon.png) -180px -314px no-repeat;}
 
 /*导入作业弹窗*/
-.homeworkPublish {width:260px; height:15px; line-height:15px;}
+.homeworkPublish {width:500px; height:15px; line-height:15px;}
 .homeworkPublishTime {font-size:12px; color:#b1b1b1; margin-left:22px; margin-bottom:8px;}
+.homeworkListForm{height: 160px;width: 550px;overflow: scroll;overflow-x: hidden;}
+.w450{width: 450px;}
 
 /*引用资源库弹窗*/
-.referenceResourcesPopup {width:710px; height:auto; border:3px solid #269ac9; padding-left:20px; padding-right:20px; padding-bottom:35px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
+.popbox{position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
+.referenceResourcesPopup {width:710px; height:500px !important; border:3px solid #269ac9 !important; padding-left:16px !important; padding-right:16px !important; padding-bottom:16px !important; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
 .referenceText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight:bold;}
 .referenceSearchBox {border:1px solid #e6e6e6; width:235px; height:32px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchReferencePopup {border:none; outline:none; background-color:#ffffff; width:190px; height:32px; padding-left:10px; display:inline-block; float:left;}
-.referenceSearchIcon{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon.png) -170px -135px no-repeat; display:inline-block; float:left;}
+.referenceSearchIcon{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon.png) -180px -270px no-repeat; display:inline-block; float:left;}
-.referenceSearchIcon:hover {background:url(../images/homepage_icon.png) -170px -190px no-repeat;}
+.referenceSearchIcon:hover {background:url(../images/homepage_icon.png) -180px -311px no-repeat;}
-.referenceResourceType {font-size:14px; width:355px; height:34px; line-height:34px; vertical-align:middle; background-color:#f6f6f6; margin-top:15px;}
+.referenceResourceType {font-size:14px; width:475px; height:34px; line-height:34px; vertical-align:middle; background-color:#f6f6f6; margin-top:15px;}
 .referenceTypeActive {background-color:#269ac9; color:#ffffff !important;}
 a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 
-
-
 /*底部*/
 #Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
@@ -865,7 +795,7 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 
 /*文本左对齐*/
 .tl{text-align: left;}
-img,embed{max-width: 100%;}
+.embed img,embed{max-width: 100%;}
 .attachments {clear: both;}
 .is_public_checkbox{margin-left: 15px;margin-right: 10px;}
 .author_name{color: #3ca5c6 !important;}
@@ -882,34 +812,45 @@ img,embed{max-width: 100%;}
 /*a.f_grey:hover {color:#000000;}*/
 
 /*资源库*/
-.resources {width:730px; background-color:#ffffff; padding:10px;}
+.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
 .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
 .bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
-.resourcesSelect {width:40px; height:40px; float:right; position:relative;}
+.resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;}
-.resourcesSelected {width:25px; height:20px;}
+.resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
-.resourcesIcon {margin-top:15px; display:block; position:relative; background:url(../images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}
+.resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
-.resourcesIcon:hover { background:url(../images/resource_icon_list.png) 0px -25px no-repeat;}
+.resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
-.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}
 a.resourcesGrey {font-size:12px; color:#888888;}
-a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
+a.resourcesGrey:hover {font-size:12px; color:#269ac9;}
 .resourcesBanner ul li:hover ul.resourcesType {display:block;}
 .resourcesSelected:hover ul {display:block;}
-.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
+.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#269ac9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
-.uploadIcon {background:url(../images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}
+.resourcesUploadBox:hover {background-color:#297fb8;}
+.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}
 a.uploadText {color:#ffffff; font-size:14px;}
-.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:right; background-color:#ffffff;}
+.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;}
 .searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}
-.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(../images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
+.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
-.resourcesSearchBanner {height:34px; margin-bottom:10px;}
+.resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}
-.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}
+.resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;}
-.resourcesListName {width:175px; height:40px; line-height:40px; text-align:center;}
+.resourcesListName {width:340px; height:40px; line-height:40px; text-align:left;}
-.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}
+.resourcesListSize {width:85px; height:40px; line-height:40px; text-align:center;}
-.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
+.resourcesListType {width:85px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}
+.resourcesListUploader {width:85px; height:40px; line-height:40px; text-align:center;}
-.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}
+.resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
-.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}
+a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}
-a.resourcesBlack {font-size:12px; color:#4c4c4c;}
 a.resourcesBlack:hover {font-size:12px; color:#000000;}
+.resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
+.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}
+.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;}
+.resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
+.resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
+.resourcesSelectSend {float:right;}
+.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #269ac9; border-radius:5px; float:right;}
+a.sendButtonBlue {color:#269ac9;}
+a.sendButtonBlue:hover {color:#ffffff;}
+.resourcesSelectSendButton:hover {background-color:#297fb8;}
+.db {display:block !important;}
+
 .dropdown-menu {
     position: absolute;
     top: 100%;
@@ -945,6 +886,10 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
     background-color: #64bdd9;
     outline:none;
 }
+a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
+a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
+a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-repeat; padding-left:23px;}
+.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
 
 .AgreementBox{margin: 20px 0; color: #666666; font-size: 14px; line-height: 1.9;}
 .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}

public/stylesheets/public_new.css

@@ -112,7 +112,7 @@ a.c_orange{color:#ff5722;}
 a:hover.c_orange{color: #d33503;}
 a.c_lorange{color:#ff9900;}
 a:hover.c_lorange{color:#fff;}
-a.c_blue{ color:#15bccf;}
+a.c_blue{ color:#269ac9;}
 a.c_dblue{ color:#09658c;}
 a:hover.c_dblue{ color:#15bccf;}
 a.c_white{ color:#fff;}
@@ -533,9 +533,8 @@ a.sendButtonBlue:hover {color:#ffffff;}
     background-color: #64bdd9;
     outline:none;
 }
-.homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
+.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
-.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left; margin-top:4px;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
-a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
 a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
 .resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
 .resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
@@ -733,10 +732,17 @@ a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
 a.newsGrey {color:#4b4b4b;}
 a.newsGrey:hover {color:#000000;}
-a.newsBlue {color:#15bccf;}
+a.newsRed {color:red;}
-a.newsBlue:hover {color:#0781b4;}
+a.newsRed:hovor {color:#888888;}
-a.newsBlack {color:#4b4b4b; font-size:12px;}
+a.replyGrey {color:#888888; display:inline-block;}
-a.newsBlack:hover {color:#0781b4;}
+a.replyGrey:hover {color:#4b4b4b;}
+a.replyGrey1 {color:#888888;}
+a.replyGrey1:hover {color:#4b4b4b;}
+a.newsBlue {color:#269ac9;}
+a.newsBlue:hover {color:#297fb8;}
+a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
+a.menuGrey {color:#808080;}
+a.menuGrey:hover {color:#fe7d68;}
 a.resourcesGrey {font-size:12px; color:#888888;}
 a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
 .portraitRadius {border-radius: 3px;}