Merge branch 'develop' into yuanke

Conflicts:
	public/stylesheets/new_user.css

app/assets/javascripts/syllabuses.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/syllabuses.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the syllabuses controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/admin_controller.rb

@@ -67,12 +67,15 @@ class AdminController < ApplicationController
   def excellent_all_courses
     name = params[:name]
     @order = ""
-    if params[:order] == 'asc'
-      courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) asc, c.id desc")
+    @sort = ""
+    if params[:sort] && (params[:order]  == 'act')
+      courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) #{params[:sort]}, c.id desc")
       @order = params[:order]
-    elsif params[:order] == 'desc'
-      courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) DESC, c.id desc")
+      @sort = params[:sort]
+    elsif params[:sort] && (params[:order]  == 'time')
+      courses = Course.find_by_sql("SELECT * FROM courses WHERE name like '%#{name}%' ORDER BY time #{params[:sort]},id desc")
       @order = params[:order]
+      @sort = params[:sort]
     else
       courses = Course.like(name).order('created_at desc')
     end
@@ -99,6 +102,22 @@ class AdminController < ApplicationController
     end
   end
 
+  #取消精品
+  def cancel_excellent_course
+    @course = Course.find params[:id]
+    unless @course.nil?
+      if @course.is_excellent == 1 || @course.excellent_option == 1
+        @course.update_column('is_excellent', 0)
+        @course.update_column('excellent_option', 0)
+      end
+    end
+    respond_to do |format|
+      format.html{
+        redirect_to excellent_courses_url
+      }
+    end
+  end
+
  #管理员界面课程资源列表
   def course_resource_list
 

app/controllers/exercise_controller.rb

@@ -49,6 +49,11 @@ class ExerciseController < ApplicationController
       return
     end
     @exercise = Exercise.find params[:id]
+    @exercise.course_messages.each do |message|
+      if User.current.id == message.user_id && message.viewed == 0
+        message.update_attributes(:viewed => true) if message.viewed == 0
+      end
+    end
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     exercise_end = @exercise.end_time > Time.now
     if @exercise.time == -1

app/controllers/org_subfields_controller.rb

@@ -14,10 +14,9 @@ class OrgSubfieldsController < ApplicationController
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
       end
-      #默认类型为帖子
-      @subfield.update_attributes(:field_type => params[:field_type]||"Post")
+      @subfield.update_attributes(:field_type => params[:field_type])
       # admin配置的类型
-      update_status_by_type(@subfield, params[:field_type]||"Post")
+      update_status_by_type(@subfield, params[:field_type])
     else
       @res = false
     end

app/controllers/student_work_controller.rb

@@ -1096,7 +1096,8 @@ class StudentWorkController < ApplicationController
       all_student_ids = "(" + pro.members.map{|member| member.user_id}.join(",") + ")"
     end
     all_students = User.where("id in #{all_student_ids}")
-    @commit_student_ids = @homework.student_work_projects.map{|student| student.user_id}
+    student_work_id = @homework.student_work_projects.where("user_id=?",User.current.id).empty? ? -1 : @homework.student_work_projects.where("user_id=?",User.current.id).first.student_work_id
+    @commit_student_ids = @homework.student_work_projects.where("student_work_id != #{student_work_id}").map{|student| student.user_id}
     @users = searchstudent_by_name all_students,name
     respond_to do |format|
       format.js
@@ -1115,6 +1116,20 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  def get_user_infor
+    req = Hash.new(false)
+    user = User.where("id = #{params[:user_id].to_i}").first
+    if user
+      req[:id] = user.id
+      req[:name] = user.show_name
+      req[:student_id] = user.user_extensions.student_id
+      req[:valid] = true
+    else
+      req[:valid] = false
+    end
+    render :json => req
+  end
+
   private
   def searchstudent_by_name  users, name
     mems = []

app/controllers/syllabuses_controller.rb

@@ -0,0 +1,23 @@
+class SyllabusesController < ApplicationController
+
+  before_filter :is_logged, :only => [:index, :show]
+  before_filter :find_syllabus, :only => [:show]
+  def index
+    user = User.current
+    @syllabuses = user.syllabuses
+  end
+
+  def show
+    @courses = @syllabus.courses
+
+  end
+
+  private
+  def find_syllabus
+    @syllabus = Syllabus.find params[:id]
+  end
+
+  def is_logged
+    redirect_to signin_path unless User.current.logged?
+  end
+end

app/controllers/users_controller.rb

@@ -130,8 +130,11 @@ class UsersController < ApplicationController
     onclick_time = User.current.onclick_time.onclick_time
     messages.each do |message_all|
       # 未读的消息存放在数组
-      if (message_all.message_type != "SystemMessage"&& !message_all.message.nil? && message_all.message.viewed == 0) || (message_all.message_type == "SystemMessage"&& !message_all.message.nil? && message_all.message.created_at > onclick_time)
-        @message_alls << message_all.message
+      mess = message_all.message
+      if (message_all.message_type != "SystemMessage"&& !mess.nil? && (mess.viewed == 0 || !mess.viewed)) || (message_all.message_type == "SystemMessage"&& !mess.nil? && mess.created_at > onclick_time)
+        unless (message_all.message_type == 'CourseMessage' && mess && mess.course.is_delete == 1)
+          @message_alls << mess
+        end
         break if @message_alls.length == 5
       end
     end
@@ -154,33 +157,41 @@ class UsersController < ApplicationController
       update_message_viewed(@user)
     end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
+    courses = @user.courses.where("is_delete = 1")
+    course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
     case params[:type]
       when nil
         # 系统消息为管理员发送，我的消息中包含有系统消息
         @message_alls = []
         messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user.id, "SystemMessage", "SystemMessage").includes(:message).order("created_at desc")
         messages.each do |message_all|
-          @message_alls << message_all.message
+          mess = message_all.message
+          unless (message_all.message_type == 'CourseMessage' && mess && mess.course.is_delete == 1)
+            @message_alls << mess
+          end
         end
       when 'unviewed'
         @message_alls = []
-        messages = MessageAll.where("user_id =?", @user.id).includes(:message).order("created_at desc")
+        messages = MessageAll.where("message_alls.user_id =?", @user.id).includes(:message).order("created_at desc")
         messages.each do |message_all|
           # 在点击或者刷新消息列表后未读的消息存放在数组
-          if message_all.message_type != "SystemMessage"&& !message_all.message.nil? && message_all.message.viewed == 0
-            @message_alls << message_all.message
+          mess = message_all.message
+          if message_all.message_type != "SystemMessage"&& !mess.nil? && (mess.viewed == 0 || !mess.viewed)
+            unless (message_all.message_type == 'CourseMessage' && mess && mess.course.is_delete == 1)
+              @message_alls << mess
+            end
           end
         end
       #课程相关消息
       when 'homework'
-        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','StudentWork','Exercise') and user_id =?",  @user.id).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','StudentWork','Exercise') and user_id =? and course_id NOT IN #{course_ids}",  @user.id).order("created_at desc")
       when 'course_message'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user.id).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =? and course_id NOT IN #{course_ids}", "Message", @user.id).order("created_at desc")
       when 'course_news'
         # 课程通知包含发布的通知和回复的通知
-        @message_alls = CourseMessage.where("course_message_type in ('News', 'Comment') and user_id =?", @user.id).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('News', 'Comment') and user_id =? and course_id NOT IN #{course_ids}", @user.id).order("created_at desc")
       when 'poll'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user.id).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =? and course_id NOT IN #{course_ids}", "Poll", @user.id).order("created_at desc")
       #项目相关消息
       when 'issue'
         @message_alls = ForgeMessage.where("forge_message_type in ('Issue', 'Journal') and user_id =?" , @user.id).order("created_at desc")

app/helpers/syllabuses_helper.rb

@@ -0,0 +1,2 @@
+module SyllabusesHelper
+end

app/helpers/users_helper.rb

@@ -147,7 +147,9 @@ module UsersHelper
 
   # 统计未读消息数
   def unviewed_message(user)
-    course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
+    courses = user.courses.where("is_delete = 1")
+    course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
+    course_count = CourseMessage.where("user_id =? and viewed =? and course_id not in #{course_ids}", user, 0).count
     forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
     org_count = OrgMessage.where("user_id =? and viewed =?", user, 0).count
     user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count

app/models/course.rb

@@ -24,6 +24,7 @@ class Course < ActiveRecord::Base
   #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
   belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
+  belongs_to :syllabus
   # has_many :bid
   has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
   has_many :memberships, :class_name => 'Member'

app/models/syllabus.rb

@@ -0,0 +1,5 @@
+class Syllabus < ActiveRecord::Base
+  belongs_to :user
+  has_many :courses
+  attr_accessible :description, :title
+end

app/models/user.rb

@@ -90,6 +90,7 @@ class User < Principal
   has_many :homework_users
   has_many :homework_attaches, :through => :homework_users
   has_many :homework_evaluations
+  has_many :syllabuses, :dependent => :destroy
   #问卷相关关关系
   has_many :poll_users, :dependent => :destroy
   has_many :poll_votes, :dependent => :destroy

app/views/admin/_course_detail_tr.html.erb

@@ -27,6 +27,9 @@
   <td class="center">
     <%= course.course_activities.count%>
   </td>
+  <td class="center">
+    <%= course.time %>
+  </td>
   <td class="buttons">
     <%= link_to( course.is_excellent == 1 || course.excellent_option == 1 ? "取消精品" : "设为精品", { :controller => 'admin', :action => 'set_excellent_course', :id => course.id },:remote=>true, :class => 'icon-del') %>
   </td>

app/views/admin/excellent_all_courses.html.erb

@@ -45,11 +45,14 @@
       <th style="width: 25px;">
         资源数
       </th>
-      <th style="width: 50px;">
+      <th style="width: 30px;">
         帖子数
       </th>
-      <th style="width: 50px;" class = "<%= @order == 'desc' ? 'st_up' : (@order == 'asc' ? 'st_down' : '') %>">
-        <%=link_to '动态数', excellent_all_courses_path(:order=> @order == "desc" ? 'asc' : 'desc') %>
+      <th style="width: 30px;" class = "<%= @order == 'act' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%=link_to '动态数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'act') %>
+      </th>
+      <th style="width: 40px;" class = "<%= @order == 'time' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%=link_to '开课学期', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'time') %>
       </th>
       <th style="width: 40px;">
       </tr>

app/views/admin/excellent_courses.html.erb

@@ -2,7 +2,7 @@
 <h3>
   <%=l(:label_excellent_courses_list)%>
 </h3>
-<%= render 'tab_excellent_courses' %>
+<%= render 'admin/tab_excellent_courses' %>
 
 <h3>
   <%=l(:label_excellent_courses_list)%>
@@ -33,12 +33,14 @@
       <th style="width: 25px;">
         资源数
       </th>
-      <th style="width: 70px;">
+      <th style="width: 50px;">
         帖子数
       </th>
-      <th style="width: 70px;">
+      <th style="width: 50px;">
         动态数
       </th>
+      <th style="width: 40px;">
+    </tr>
     </tr>
     </thead>
     <tbody>
@@ -74,6 +76,9 @@
           <td class="center">
             <%= course.course_activities.count%>
           </td>
+          <td class="buttons">
+            <%= link_to( course.is_excellent == 1 || course.excellent_option == 1 ? "取消精品" : "设为精品", { :controller => 'admin', :action => 'cancel_excellent_course', :id => course.id }, :class => 'icon-del') %>
+          </td>
         </tr>
     <% end %>
     </tbody>

app/views/admin/leave_messages.html.erb

@@ -59,12 +59,12 @@
           <td class="center">
             <%= format_date(journal.created_on) %>
           </td>
-          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=journal.notes %>'>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=strip_html(journal.notes) %>'>
             <%case journal.jour_type %>
             <% when 'Principal' %>
-                <%= link_to(journal.notes.html_safe, feedback_path(journal.jour_id)) %>
+                <%= link_to(strip_html(journal.notes), feedback_path(journal.jour_id)) %>
             <% when 'Course' %>
-                <%= link_to(journal.notes.html_safe, course_feedback_path(journal.jour_id)) %>
+                <%= link_to(strip_html(journal.notes), course_feedback_path(journal.jour_id)) %>
             <% end %>
           </td>
           <td class="center">

app/views/courses/show.html.erb

@@ -1,3 +1,4 @@
+<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");

app/views/exercise/_exercise.html.erb

@@ -63,4 +63,11 @@
         <%#end%>
     <% end%>
     <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>
+    <% if exercise.show_result == 1 %>
+        <% if exercise.end_time <= Time.now %>
+            <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%></li>
+        <% else %>
+            <li class="pollsbtn fr mr10 pollsbtn_grey" title="截止时间未到，暂不能查看统计结果">统计结果</li>
+        <%end%>
+    <% end %>
 <% end%>

app/views/exercise/_exercise_student_result.html.erb

@@ -20,7 +20,13 @@
       <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
       <div class="cl"></div>
     </div>
-    <div class="mb5">得分：<span class="c_red"><%=exercise_user.score %>分</span></div>
+    <div>
+        <div class="fl mb5">得分：<span class="c_red"><%=exercise_user.score %>分</span></div>
+        <% if User.current.admin? || User.current.allowed_to?(:as_teacher,exercise.course) || (exercise.exercise_status == 3 && exercise.show_result == 1) %>
+            <%= link_to '返回统计列表>>',student_exercise_list_exercise_path(exercise.id,:course_id => exercise.course.id) , :class => "fr linkBlue" %>
+        <% end %>
+    </div>
+    <div class="cl"></div>
     <% mc_question_list = exercise.exercise_questions.where("question_type=1") %>
     <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %>
     <% single_question_list = exercise.exercise_questions.where("question_type=3") %>

app/views/forums/create.js.erb

@@ -1,7 +1,6 @@
 <%if @save_flag%>
-//$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
-//$('#reorder_time').click();
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
+$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
+$('#reorder_time').click();
 <%else%>
 $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
 <%end %>

app/views/layouts/_logined_header.html.erb

@@ -84,9 +84,9 @@
         <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %></div>
     <% end %>
       <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
-    <!--<div class="shadowbox_news undis" id="user_messages_list">
-      <%#=render :partial => 'layouts/message_loading' %>
-    </div>-->
+    <div class="shadowbox_news undis" id="user_messages_list">
+      <%=render :partial => 'layouts/message_loading' %>
+    </div>
   </div>
 </div>
 
@@ -98,15 +98,15 @@
         $("#navHomepageSearchType").hide();
     });
 
-    /*$("#user_messages").mouseenter(function(){
+    $("#user_messages").mouseenter(function(){
         $("#user_messages_list").show();
-        $.get('<%#=user_messages_unviewed_users_path %>');
+        $.get('<%=user_messages_unviewed_users_path %>');
         $("#ajax-indicator").hide();
     }).mouseleave(function(){
         $("#user_messages_list").hide();
-        $("#user_messages_list").html("<%#=escape_javascript(render :partial => 'layouts/message_loading') %>");
+        $("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
 
-    });*/
+    });
 
     $("#navHomepageProfile").mouseenter(function(){
         $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");

app/views/layouts/_show_messages_list.html.erb

@@ -1,7 +1,6 @@
 <font></font>
 <h4 class="shadowbox_news_title">未读消息</h4>
 <ul class="shadowbox_news_list">
-  <%# user_messages = User.current.user_messages_unviewed %>
   <% messages.each do |ma| %>
     <% if ma.class == SystemMessage %>
       <li><a href="<%=user_system_messages_path(User.current) %>" target="_blank" title="Trustie平台 发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%>"><span class="shadowbox_news_user">Trustie平台 </span>发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%></a></li>
@@ -60,15 +59,77 @@
               <% else %>
                   <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> 回复了作品评论：<%= ma.course_message.notes%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> </span>回复了作品评论：<%= ma.course_message.notes%></a></li>
               <% end %>
+          <% elsif ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
+              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id) %>" target="_blank" title="<%=ma.course_message.homework_common.user.show_name %>老师 发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评"><span class="shadowbox_news_user"><%=ma.course_message.homework_common.user.show_name %>老师 </span>发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评</a></li>
+          <% elsif ma.course_message_type == "StudentWork" && ma.status == 1 %>
+              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 重新提交了作品：<%=ma.course_message.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>重新提交了作品：<%=ma.course_message.name %></a></li>
+          <% elsif ma.course_message_type == "StudentWork" && ma.status == 2 %>
+              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 追加新附件了：作业标题：<%=ma.course_message.homework_common.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>追加新附件了：作业标题：<%=ma.course_message.homework_common.name %></a></li>
+          <% elsif ma.course_message_type == "Course" %>
+              <li><a href="<%=course_path(ma.course_message) %>" target="_blank" title="系统提示 您成功创建了课程：课程名称：<%=ma.course_message.name %>"><span class="shadowbox_news_user">系统提示 </span>您成功创建了课程：课程名称：<%=ma.course_message.name %></a></li>
+          <% elsif ma.course_message_type == "JoinCourseRequest" %>
+              <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}" %>
+              <li><a href="<%=user_path(User.find(ma.course_message_id), :course_id => ma.course_id) %>" target="_blank" title="系统提示 您有了新的课程成员申请：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>您有了新的课程成员申请：<%=content %></a></li>
+          <% elsif ma.course_message_type == "CourseRequestDealResult" %>
+              <% content = ma.status == 1 ? '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝' %>
+              <li><a href="<%=course_path(Course.find(ma.course_id)) %>" target="_blank" title="系统提示 课程申请进度反馈：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>课程申请进度反馈：<%=content %></a></li>
+          <% elsif ma.course_message_type == "JoinCourse" and ma.status == 0 %>
+              <li><a href="<%=course_member_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您加入了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您加入了课程：<%=ma.course.name %></a></li>
+          <% elsif ma.course_message_type == "JoinCourse" and ma.status == 1 %>
+              <li><a href="<%=user_path(ma.course_message_id) %>" target="_blank" title="系统提示 您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %>"><span class="shadowbox_news_user">系统提示 </span>您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %></a></li>
+          <% elsif ma.course_message_type == "RemoveFromCourse" %>
+              <li><a href="<%=member_course_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您移出了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您移出了课程：<%=ma.course.name %></a></li>
+          <% elsif ma.course_message_type == "Exercise" && ma.status == 2 %>
+              <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程测验：测验题目:<%=ma.course_message.exercise_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程测验：测验题目:<%=ma.course_message.exercise_name %></a></li>
+          <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
+              <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了</a></li>
           <% end %>
-    <% end %>
+      <% elsif ma.class == ForgeMessage %>
+          <% if ma.forge_message_type == "AppliedProject" %>
+              <li><a href="<%=settings_project_path(:id => ma.project, :tab => "members") %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>申请加入项目：<%= ma.project.name%></a></li>
+          <% elsif ma.forge_message_type == "JoinProject" %>
+              <li><a href="<%=project_member_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您加入了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您加入了项目：<%= ma.project.name%></a></li>
+          <% elsif ma.forge_message_type == "RemoveFromProject" %>
+              <li><a href="<%=member_project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您移出了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您移出了项目：<%= ma.project.name%></a></li>
+          <% elsif ma.forge_message_type == "RemoveFromProject" %>
+              <li><a href="<%=project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 邀请你加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>邀请你加入项目：<%= ma.project.name%></a></li>
+          <% elsif ma.forge_message_type == "Issue" && ma.status == 1 %>
+              <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！</a></li>
+          <% elsif ma.forge_message_type == "Issue" && ma.status != 1 %>
+              <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%></a></li>
+          <% elsif ma.forge_message_type == "Journal" %>
+              <li><a href="<%=issue_path(:id => ma.forge_message.journalized_id) %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 更新了问题状态：<%= ma.forge_message.journalized.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>更新了问题状态：<%= ma.forge_message.journalized.subject%></a></li>
+          <% elsif ma.forge_message_type == "Message" %>
+              <li><a href="<%=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) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%></a></li>
+          <% elsif ma.forge_message_type == "News" %>
+              <li><a href="<%=news_path(ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 发布了新闻：<%= ma.forge_message.title.html_safe%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>发布了新闻：<%= ma.forge_message.title.html_safe%></a></li>
+          <% elsif ma.forge_message_type == "Comment" %>
+              <li><a href="<%=news_path(ma.forge_message.commented.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>评论了新闻：<%= ma.forge_message.commented.title%></a></li>
+          <% end %>
+      <% elsif ma.class == MemoMessage %>
+          <% if ma.memo_type == "Memo" %>
+              <li><a href="<%=forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id) %>" target="_blank" title="<%=ma.memo.author.show_name %> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%>"><span class="shadowbox_news_user"><%=ma.memo.author.show_name %> </span><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%></a></li>
+          <% end %>
+      <% elsif ma.class == UserFeedbackMessage %>
+          <% if ma.journals_for_message_type == "JournalsForMessage" %>
+              <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.journals_for_message.user.show_name %> <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%>"><span class="shadowbox_news_user"><%=ma.journals_for_message.user.show_name %> </span><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%></a></li>
+          <% end %>
+      <% elsif ma.class == OrgMessage %>
+          <% if ma.message_type == 'ApplySubdomain' %>
+              <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.organization.name %> 申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>"><span class="shadowbox_news_user"><%=ma.organization.name %> </span>申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%></a></li>
+          <% elsif ma.message_type == 'AgreeApplySubdomain' %>
+              <li><a href="javascript:void(0)" target="_blank" title="系统提示 管理员同意了您的子域名申请：<%= ma.content%>"><span class="shadowbox_news_user">系统提示 </span>管理员同意了您的子域名申请：<%= ma.content%></a></li>
+          <% end %>
+      <% elsif AtMessage === ma && ma.at_valid? %>
+          <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
+            <% href = course_boards_path(ma.at_message.course,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+          <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+              <% href = project_boards_path(ma.at_message.project,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+          <% else %>
+            <% href = ma.url %>
+          <% end %>
+          <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
+      <% end %>
   <% end %>
-  <!--<li><span class="shadowbox_news_user">教辅测试老师</span><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试辅测试老辅测试老老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank"><span class="c_red">【课程通知】</span>发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
-  <li><a href="#" target="_blank" class="shadowbox_news_user">教辅测试老师</a><a href="#" target="_blank">发布的作业：作业标题：0525发布布的作业：作业标题：0525发布布的作业：作业标题：0525发布普...</a></li>
--->
 </ul>
 <%= link_to '查看全部', user_message_path(User.current), :class => "shadowbox_news_all", :target =>"_Blank" %>

app/views/layouts/base_courses.html.erb

@@ -173,7 +173,7 @@
       </div><!--项目标签 end-->
       <!--课程推荐-->
       <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
-      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %></div>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %> （自2016年5月）</div>
     </div><!--LSide end-->
 
     <div id="RSide" class="fl">