Merge branch 'develop' into yuanke_org

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/application_controller.rb

@@ -916,4 +916,11 @@ class ApplicationController < ActionController::Base
     call_hook(:controller_account_success_authentication_after, {:user => user })
   end
 
+  def user_unlogged_check
+    if !User.current.logged?
+      render(:partial => 'organizations/unlogged_tip')
+      return false
+    end
+    true
+  end
 end

app/controllers/attachments_controller.rb

@@ -265,6 +265,10 @@ class AttachmentsController < ApplicationController
       @history.save  #历史记录保存完毕
       #将最新保存的记录 数据替换到 需要修改的文件记录
       @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads", "quotes")
+      # 如果附件描述被修改，则保存附件
+      unless params[:description] == @attachment.description
+        @old_attachment.description = params[:description]
+      end
       @old_attachment.save
       #删除当前记录
       @attachment.delete

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/files_controller.rb

@@ -26,7 +26,7 @@ class FilesController < ApplicationController
   before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,
                                         :search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,
                                         :search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,
-                                        :search_files_in_subfield,:upload_files_menu,:file_hidden,:republish_file]
+                                        :search_files_in_subfield,:upload_files_menu,:file_hidden,:republish_file,:update_file_description]
 
   helper :sort
   include SortHelper
@@ -483,6 +483,7 @@ class FilesController < ApplicationController
            if !attachments.empty? && attachments[:files] && tag_name != ""
              attachments[:files].each do |attachment|
                attachment.tag_list.add(tag_name)
+               attachment.description = params[:description]
                attachment.save
              end
            end
@@ -493,6 +494,7 @@ class FilesController < ApplicationController
            if !attachments.empty? && attachments[:files] && tag_name != ""
              attachments[:files].each do |attachment|
                attachment.tag_list.add(tag_name)
+               attachment.description = params[:description]
                attachment.save
              end
            end
@@ -600,6 +602,7 @@ class FilesController < ApplicationController
            if !attachments.empty? && attachments[:files] && tag_name != ""
              attachments[:files].each do |attachment|
                attachment.tag_list.add(tag_name)
+               attachment.description = params[:description]
                attachment.save
              end
            end
@@ -610,6 +613,7 @@ class FilesController < ApplicationController
            if !attachments.empty? && attachments[:files] && tag_name != ""
              attachments[:files].each do |attachment|
                attachment.tag_list.add(tag_name)
+               attachment.description = params[:description]
                attachment.save
              end
            end
@@ -911,5 +915,10 @@ class FilesController < ApplicationController
 
   def upload_files_menu
 
-end
+  end
+  def update_file_description
+    @attachment = Attachment.find(params[:id])
+    @attachment.description = params[:description]
+    @attachment.save
+  end
 end

app/controllers/org_subfields_controller.rb

@@ -9,7 +9,7 @@ class OrgSubfieldsController < ApplicationController
       @subfield = OrgSubfield.create(:name => params[:name], :organization_id => params[:organization_id], :priority => @organization.org_subfields.order("priority").last.priority + 1)
       if !params[:sub_dir].blank?
         sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
-              "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
+            "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
         if SubfieldSubdomainDir.find_by_sql(sql).count == 0
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
@@ -57,6 +57,10 @@ class OrgSubfieldsController < ApplicationController
       @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
                                                   "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
                                                   " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
+      if @org_subfield.nil?
+        render_404
+        return
+      end
       if @org_subfield.field_type == 'Post'
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
         @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)

app/controllers/praise_tread_controller.rb

@@ -1,12 +1,12 @@
 class PraiseTreadController < ApplicationController
   
   accept_api_auth :tread_plus,:praise_plus
-  before_filter :require_login,:only => [:praise_plus,:tread_plus]
+  # before_filter :require_login,:only => [:praise_plus,:tread_plus]
+  before_filter :user_unlogged_check,:only => [:praise_plus,:tread_plus,:praise_minus]
   
   def praise_plus
     @obj = nil
     @activity = false
-
     if request.get?
       @obj_id = params[:obj_id]
       @obj_type = params[:obj_type]

app/controllers/repositories_controller.rb

@@ -360,7 +360,7 @@ update
       # ip = RepositoriesHelper::REPO_IP_ADDRESS
       gitlab_address = Redmine::Configuration['gitlab_address']
       # REDO:需优化，仅测试用
-      @zip_path = gitlab_address.to_s + "/api/v3/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=YTyCv4978MXmdL2B9C62"
+      @zip_path = Gitlab.endpoint.to_s + "/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=" + Gitlab.private_token
       if @repository.type.to_s == "Repository::Gitlab"
         @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
       else

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  && 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 && 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  && 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/account/login.html.erb

@@ -2,32 +2,6 @@
 <%= stylesheet_link_tag 'leftside'%>
 
 <script type="text/javascript">
-
-//    $(document).ready(function(){
-//        $("#loginSignButton").click(function(){
-//            $("#signUpBox").css({display:"block"});
-//            $("#loginInBox").css({display:"none"});
-//        });
-//        $("#loginInButton").click(function(){
-//            $("#signUpBox").css({display:"none"});
-//            $("#loginInBox").css({display:"block"});
-//        });
-//    });
-//    $(function(){
-//        $("#username").keypress(function(e){
-//            alert(11);
-//            if (e.keyCode == '13') {
-//                $('#main_login_form').submit();
-//            }
-//        });
-//
-//        $("#password").keypress(function(e){
-//            if (e.keyCode == '13') {
-//                $('#main_login_form').submit();
-//            }
-//        });
-//    });
-
     $(document).ready(function(){
         $(".homepageSearchIcon").click(function(){
             var val=$('input:radio[name="search_type"]:checked').val();
@@ -38,10 +12,6 @@
                 $("#navSearchAlert").css({display:"none"});
             }
         });
-//        $("#loginInButton").click(function(){
-//            $("#signUpBox").css({display:"none"});
-//            $("#loginInBox").css({display:"block"});
-//        });
     });
 
     $(document).ready(function(){
@@ -62,42 +32,6 @@
         }
     });
 
-//    $('#regist_btn').bind('keyup', function(event) {
-//    if (event.keyCode == "13" && $("#signUpBox").css('display') == 'block')) {
-//       register();
-//    }
-//});
-    function clearInfo(id, content) {
-                var text = $('#' + id);
-                if (text.val() == content) {
-                    $('#' + id).val('');
-                }
-            }
-
-    function showInfo(id, content) {
-        var text = $('#' + id);
-        if (text.val() == '') {
-            $('#' + id).val(content);
-        }
-    }
-
-    function login(){
-        $('#main_login_form').submit(); //表单提交没有任何反应的原因：js冲突
-    }
-
-    function register(){
-        if($("#loginUpButton").hasClass('loginUpDisableButton')){
-            return;
-        }
-        if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
-            $("#main_reg_form").submit();
-        }else{
-            $('#user_login').blur();
-            $('#user_mail').blur();
-            $('#user_password').blur();
-            $('#user_password_confirmation').blur();
-        }
-    }
     var $login_correct = false;
     var $mail_correct = false;
     var $passwd_correct = false;
@@ -118,7 +52,7 @@
                                 $('#login_req').html('<span style="color: green">'+data.message+'</span>');
                                 $login_correct = true;
                             } else {
-                                $('#login_req').html( '<span style="color: red">'+data.message+'</span>');
+                                $('#login_req').html( '<span style="color: #c00202">'+data.message+'</span>');
                                 $login_correct = false;
                             }
                             $('#login_req').css('display','block');
@@ -129,7 +63,7 @@
 
         $mail.blur(function (event) {
             if (/^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){
-                $('#mail_req').html( '<span style="color: red">邮件格式不对</span>').show();
+                $('#mail_req').html( '<span style="color: #c00202">邮件格式不对</span>').show();
                 $mail_correct = false;
                 return ;
             }
@@ -142,7 +76,7 @@
                                 $('#mail_req').html( '<span style="color: green">'+data.message+'</span>' );
                                  $mail_correct = true;
                             } else {
-                                $('#mail_req').html( '<span style="color: red">'+data.message+'</span>' );
+                                $('#mail_req').html( '<span style="color: #c00202">'+data.message+'</span>' );
                                  $mail_correct = false;
                             }
                             $('#mail_req').css('display','block');
@@ -158,7 +92,7 @@
                  $passwd_correct = true;
             }
             else {
-                $('#passwd_req').html( '<span style="color: red">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>');
+                $('#passwd_req').html( '<span style="color: #c00202">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>');
                  $passwd_correct = false;
             }
             $('#passwd_req').css('display','block');
@@ -174,7 +108,7 @@
                  $passwd_comfirm_correct = true;
             }
             else {
-                $('#confirm_req').html('<span style="color: red">'+'<%= l(:setting_password_error) %>'+'</span>');
+                $('#confirm_req').html('<span style="color: #c00202">'+'<%= l(:setting_password_error) %>'+'</span>');
                  $passwd_comfirm_correct = false;
 
             }
@@ -184,121 +118,90 @@
 
         });
     });
-
-        function user_name_keypress(e){
-            if (e.keyCode == '13') {
-                $('#main_login_form').submit();
-            }
-        }
-
-        function changeRegisterBtn(checkbox){
-            if(checkbox.checked == true){
-                $("#loginUpButton").removeClass('loginUpDisableButton');
-                $("#loginUpButton").addClass('loginUpButton');
-            }else{
-                $("#loginUpButton").removeClass('loginUpButton')
-                $("#loginUpButton").addClass('loginUpDisableButton');
-            }
-        }
 </script>
-<div class="loginContentContainer">
-  <div class="loginContent">
-    <div class="loginLeft">
-      <div class="loginLogo"><img src="images/trustie_big_log.png" width="100" height="88" alt="Trustie Logo" /></div>
-      <div class="loginInro">&nbsp;&nbsp;欢迎加入Trustie创新实践社区！在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。<br/><br/>&nbsp;&nbsp;Trustie社区的理想是：让创新过程变的更美好！</div>
+
+<div class="new_login" id = "loginInBox">
+  <div class="new_login_con">
+    <div class="new_login_txt fl">
+      <h3> 欢迎加入Trustie创新实践社区</h3>
+      <p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
     </div>
-    <div class="loginRight">
-      <div id="loginInBox">
-        <div class="loginChooseBox">
-          <div class="mb5">
-          <ul class="loginChooseList">
-            <li class="loginChoose fl"><span class="loginChooseTab">登录</span></li>
-            <li class="loginChooseBorder fl"></li>
-          </ul>
-        </div>
-        <div class="loginSignAlert" style="color: red"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></div>
-        </div>
-        <div class="loginIn">
+    <div class="new_login_box fr mr45 mt100">
+      <h2 class="new_login_h2">登录
+        <a href="<%= register_url_without_domain %>" class="fr mt5">立即注册</a><div class="cl"></div>
+      </h2>
+      <div class="new_login_form">
+        <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
+            <%= back_url_hidden_field_tag %>
+            <ul>
+              <li class="new_loggin_users">
+                <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
+              </li>
+              <li class="new_login_lock">
+                <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
+                <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
+              </li>
+
+              <li>
+                <% if Setting.autologin? %>
+                    <label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
+                <% end %>
+                <a href="<%= lost_password_path %>"  class="fr">
+                  <% if Setting.lost_password? %>忘记密码<% end %>
+                </a>
+                <div class="cl"></div>
+              </li>
+              <li><button type="submit" class="new_login_submit"><a href="javascript:void(0);" id="login_btn" onclick="$('#main_login_form').submit();" style="text-decoration: none;">登录</a></button></li>
+            </ul>
+        <% end %>
+      </div>
 
-          <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
-          <%= back_url_hidden_field_tag %>
-          <div class="mb20">
-            <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
-                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
-            <!--<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />-->
-          </div>
-          <% if Setting.openid? %>
-                  <div class="mb20">
-                    <%= text_field_tag "openid_url", nil, :tabindex => '3',:placeholder=>'请输入OpenId URL' %>
-                  </div>
-          <% end %>
-          <div>
-            <!--<input type="text" placeholder="请输密码" class="loginSignBox" />-->
-            <%= password_field_tag 'password', nil, :tabindex => '2',:class=>'loginSignBox' ,:placeholder=>'请输密码', :onkeypress => "user_name_keypress(event);"%>
-          </div>
-          <div class="loginSignOption">
-            <% if Setting.autologin? %>
-                <div class="fl mt3 mr5">
-                  <%= check_box_tag 'autologin', 1, true, :tabindex => 4 %>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
+<%# 注册 %>
+<div class="new_register" id = "signUpBox">
+  <div class="new_register_con">
+    <div class="new_login_txt fl new_register_left">
+      <h3> 欢迎加入Trustie创新实践社区</h3>
+      <p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
+    </div>
+    <div class="new_login_box fr mr45 mt50">
+      <h2 class="new_login_h2">注册<a href="<%= signin_url_without_domain %>"  class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
+      <div class="new_login_form">
+        <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
+            <%= error_messages_for 'user' %>
+            <ul>
+              <li class="new_register_li">
+                <%= f.text_field :mail, :size => 25, :class => 'new_register_input' , :placeholder => "请输入邮箱地址"%>
+                <p class="new_login_error" id="mail_req" style="display: none"  >请输入正确的邮箱</p>
+              </li>
+              <li class="new_register_li">
+                <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_register_input' %>
+                <p class="new_login_error" id="passwd_req" style="display: none">请输入6-16位密码，区分大小写，不能使用空格！</p>
+              </li>
+              <li class="new_register_li">
+                <%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_register_input' %>
+                <p class="new_login_error" id="confirm_req" style="display: none">两次密码不一致！</p>
+              </li>
+              <li class="new_register_li">
+                <%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_register_input'%>
+                <p class="new_login_error" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</p>
+              </li>
+              <li>
+                <label><input type="checkbox" checked id="read_and_confirm" onchange="changeRegisterBtn(this);" class=" new_login_check">我已阅读并接受<a href="<%= agreement_path %>"  >Trustie服务协议条款</a></label>
+              </li>
+              <li>
+                <div class="new_login_submit" id="loginUpButton">
+                  <a href="javascript:void(0);" id="regist_btn" onclick="register();" class ="db" style="text-decoration: none;">注册</a>
                 </div>
-                <%= l(:label_stay_logged_in) %>
-            <% end %>
-            <a href="<%= lost_password_path %>" class="newsBlue mr40 fr">
-              <% if Setting.lost_password? %>
-              <u>忘记密码?</u>
-                  <% end %>
-            </a></div>
+            </ul>
         <% end %>
-          <div class="loginInButton" >
-            <a href="javascript:void(0);" id="login_btn" class="c_white db" onclick="$('#main_login_form').submit();">登录</a>
-          </div>
-
-        </div>
-
       </div>
-      <div id="signUpBox">
-        <div class="loginChooseBox">
-          <ul class="loginChooseList">
-            <li class="loginChoose fl"><span class="loginChooseTab">注册<%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></a></span>
-            <li class="loginChooseBorder fl"></li>
-          </ul>
-        </div>
-        <div class="loginIn">
-          <%= form_for :user, :url => register_path,:method=>'post',:html=>{:id=>'main_reg_form'} do |f| %>
-              <%= error_messages_for 'user' %>
-          <div class="loginSignRow">
-            <!--<input type="text" placeholder="请输入邮箱地址" class="loginSignBox" />-->
-            <%= f.text_field :mail,:size => 25, :class=>'loginSignBox' ,:placeholder=>"请输入邮箱地址"%>
-            <div class="loginSignAlert" id="mail_req" style="display: none"  >请输入有效邮箱地址</div>
-          </div>
-          <div  class="loginSignRow">
-            <!--<input type="text" placeholder="请输入密码" class="loginSignBox" />-->
-            <%= f.password_field :password, :size => 25,:placeholder=>"请输入密码",:class=>'loginSignBox' %>
-            <div class="loginSignAlert" id="passwd_req" style="display: none">至少需要 6 个字符</div>
-          </div>
-          <div  class="loginSignRow">
-            <!--<input type="text" placeholder="请再次输入密码" class="loginSignBox" />-->
-            <%= f.password_field :password_confirmation, :size => 25,:placeholder=>"请再次输入密码",:class=>'loginSignBox' %>
-            <div class="loginSignAlert" id="confirm_req" style="display: none">密码不一致</div>
-          </div>
-          <div  class="loginSignRow">
-            <!--<input type="text" placeholder="请输入用户昵称" class="loginSignBox" />-->
-            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户登录名",:class=>'loginSignBox'%>
-            <div class="loginSignAlert" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</div>
-          </div>
-              <div class="loginSignOption">
-                <div class="fl mt3 mr5">
-                  <input type="checkbox" id="read_and_confirm" onchange="changeRegisterBtn(this);"/>
-                </div>
-                我已阅读并接受<a href="<%= agreement_path %>" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
-          <div class="loginUpDisableButton" id="loginUpButton">
-            <a href="javascript:void(0);" class="c_white db" id="regist_btn" onclick="register();" >注册</a>
 
-          </div>
-          <% end %>
-        </div>
-      </div>
     </div>
     <div class="cl"></div>
   </div>
 </div>
+

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/attachments/_show_attachment_history.html.erb

@@ -1,7 +1,7 @@
 <!--<div class="resourceUploadPopup">-->
 <span class="uploadDialogText">更新资源版本</span>
 <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-<div class="uploadBoxContainer mt0">
+<div>
   <div>
     <div>当前版本
             <span class="attachment" >
@@ -39,10 +39,19 @@
         <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
         <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
       </div>
-      <div class="uploadResourceIntr">
-        <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
-        <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>
+      <div class="W300 uploadResourceIntr fontGrey2">
+        <span id="upload_file_count" class="mr15">(未选择文件)</span>
+        <span>您可以上传小于<span class="c_red">50MB</span>的文件</span>
       </div>
+      <div class="cl"></div>
+      <div class="mb5 mt5">
+        <p class="c_dark f14" style="line-height:30px;">描述：</p>
+        <div class="fl">
+          <textarea style="resize:none"  type="text" placeholder="请编辑资源描述" name="description" class="InputBox fl H60 W420" ><%= @attachment.description %></textarea>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
       </div>
       <div class="cl"></div>
       <div style="margin-top: 10px" >

app/views/blog_comments/_simple_ke_reply_form.html.erb

@@ -1,20 +1,24 @@
 <div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= reply.id%>'>
-      <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-          <input type="hidden" name="quote[quote]" id="quote_quote">
-          <% if course_id%>
-              <input type="hidden" name="course_id" id="" value="<%= course_id%>">
-          <% end %>
-          <input type="hidden" name="blog_comment[title]" id="reply_subject">
-          <div nhname='toolbar_container_<%= reply.id%>'></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
-          <div class="cl"></div>
-          <p nhname='contentmsg_<%= reply.id%>'></p>
-      <% end%>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+              <input type="hidden" name="quote[quote]" id="quote_quote">
+              <% if course_id%>
+                  <input type="hidden" name="course_id" id="" value="<%= course_id%>">
+              <% end %>
+              <input type="hidden" name="blog_comment[title]" id="reply_subject">
+              <div nhname='toolbar_container_<%= reply.id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
+              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= reply.id%>'></p>
+          <% end%>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>

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/courses/syllabus.html.erb

@@ -184,20 +184,24 @@
         <div class="homepagePostReplyContainer borderBottomNone minHeight48">
           <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @article.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@article.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer" style="margin-top: 8px">
-            <div nhname='new_message_<%= @article.id%>' style="display:none;">
-              <%= form_for 'blog_comment',:url =>  {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%>
-                  <input type="hidden" name="course_id" value="<%= @course.id%>">
-                <input type="hidden" name="blog_comment[title]" value="RE:<%= @article.title%>">
-                  <input type="hidden" name="blog_comment[sticky]" value="0">
-                  <input type="hidden" name="quote[quote]" value="">
-                  <input type="hidden" name="blog_comment[locked]" value="0">
-                  <div nhname='toolbar_container_<%= @article.id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @article.id%>' name="blog_comment[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)"  onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
-                  <div class="cl"></div>
-                  <p nhname='contentmsg_<%= @article.id%>'></p>
-              <% end%>
-            </div>
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= @article.id%>' style="display:none;">
+                  <%= form_for 'blog_comment',:url =>  {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%>
+                      <input type="hidden" name="course_id" value="<%= @course.id%>">
+                    <input type="hidden" name="blog_comment[title]" value="RE:<%= @article.title%>">
+                      <input type="hidden" name="blog_comment[sticky]" value="0">
+                      <input type="hidden" name="quote[quote]" value="">
+                      <input type="hidden" name="blog_comment[locked]" value="0">
+                      <div nhname='toolbar_container_<%= @article.id%>'></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @article.id%>' name="blog_comment[content]"></textarea>
+                      <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)"  onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+                      <div class="cl"></div>
+                      <p nhname='contentmsg_<%= @article.id%>'></p>
+                  <% end%>
+                </div>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
             <div class="cl"></div>
           </div>
           <div class="cl"></div>

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/files/_file_description.html.erb

@@ -0,0 +1,5 @@
+<p ondblclick=show_edit_file_description('<%= file.id %>')>
+  资源描述：<% if file.description.blank? %><span style="color:#C5C5BE; cursor:pointer;" title="双击可编辑">双击添加描述</span><% else %><span style="cursor:pointer;" title="双击可编辑"><%= file.description %></span><% end %>
+  <%#= file.description.blank? ? "该资源暂无描述" : file.description %>
+  <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_file_description("+file.id.to_s+");"%>
+</p>

app/views/files/_org_subfield_list.html.erb

@@ -1,7 +1,7 @@
 <% delete_allowed = User.current.admin? %>
 
 <% org_subfield_attachments.each do |file| %>
-  <% if file.is_public == 1 or User.current.member_of_org?(file.container.organization) %>
+  <% if file.is_public == 1 or User.current.member_of_org?(file.container.organization) || User.current.admin? %>
     <div class="resources mt10" id="container_files_<%= file.id %>">
         <div class="homepagePostBrief">
           <div class="homepagePostPortrait">
@@ -36,6 +36,22 @@
               <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
               <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<span id="reference_number_<%= file.id %>"><%= file.quotes.nil? ? 0:file.quotes  %></span></p>
             </div>
+            <div class="cl"></div>
+
+            <% if User.current.logged? && ((delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" )%>
+                <div>
+                  <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
+                    <%= render :partial => 'files/file_description', :locals => {:file => file} %>
+                  </div>
+                  <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                </div>
+            <% else %>
+                <div class="fontGrey2 mb4">
+                    资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
+                </div>
+            <% end %>
+
             <div class="cl"></div>
             <div class="tag_h">
               <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>

app/views/files/_project_file_list.html.erb

@@ -21,8 +21,8 @@
           <%= link_to truncate(file.filename,length: 35, omission: '...'),
             download_named_attachment_path(file.id, file.filename),
             :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
-          <% if User.current.logged? %>
-              <% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
+          <% if User.current.logged? || User.current.admin? %>
+              <% if ((manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file)) || User.current.admin? %>
                   <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
                   <% if authority_pubilic_for_files(project, file) && delete_allowed %>
                     <span id="is_public_<%= file.id %>">
@@ -43,6 +43,19 @@
                        <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
         </div>
         <div class="cl"></div>
+        <% if User.current.admin? || ( User.current.logged? && ( (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file))) %>
+            <div>
+              <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
+                <%= render :partial => 'files/file_description', :locals => {:file => file} %>
+              </div>
+              <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                        onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+            </div>
+        <% else %>
+            <div class="fontGrey2 mb4">
+                资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
+            </div>
+        <% end %>
         <div class="tag_h">
           <!-- container_type = 2 代表是项目里的资源 -->
           <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>

app/views/files/_project_list.html.erb

@@ -35,6 +35,19 @@
                 <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
               </div>
               <div class="cl"></div>
+              <% if User.current.admin? || (User.current.logged? && ( (is_project_manager?(User.current, project) || file.author_id == User.current.id) && project_contains_attachment?(project, file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project")) %>
+                  <div>
+                    <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
+                      <%= render :partial => 'files/file_description', :locals => {:file => file} %>
+                    </div>
+                    <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                              onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                  </div>
+              <% else %>
+                    <div class="fontGrey2 mb4">
+                        资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
+                    </div>
+              <% end %>
               <div class="tag_h">
                 <!-- container_type = 1 代表是课程里的资源 -->
                 <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>

app/views/files/_resource_detail.html.erb

@@ -35,10 +35,22 @@
         <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
         <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
       </div>
-      <% unless file.description.blank? %>
+      <%# unless file.description.blank? %>
           <div class="cl"></div>
-          <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-      <% end %>
+          <% if User.current.admin? || ( User.current.logged? && ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course")) %>
+            <div>
+              <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
+                    <%= render :partial => 'files/file_description', :locals => {:file => file} %>
+              </div>
+              <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                        onblur="edit_file_description('<%= update_file_description_course_file_path(@course,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+            </div>
+          <% else %>
+            <div class="fontGrey2 mb4">
+                资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
+            </div>
+          <% end %>
+      <%# end %>
       <div class="cl"></div>
       <div class="tag_h">
         <!-- container_type = 1 代表是课程里的资源 -->
@@ -48,9 +60,9 @@
       <div class="homepagePostSetting">
         <ul>
           <li class="homepagePostSettingIcon">
-            <% if User.current.logged? %>
-                <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
-                    <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"  %>
+            <% if User.current.logged? || User.current.admin? %>
+                <% if User.current.admin? || ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) %>
+                    <% if User.current.admin? || ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course") %>
                         <ul class="homepagePostSettiongText">
                           <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                           <li><%= link_to '延期发布',file_hidden_course_file_path(@course,file),:class => "postOptionLink",:remote=>true %></li>

app/views/files/_tool_settings.html.erb

@@ -1,8 +1,8 @@
 <ul>
   <li class="homepagePostSettingIcon">
-    <% if User.current.logged? %>
-        <% if (is_project_manager?(User.current, project) || file.author_id == User.current.id) && project_contains_attachment?(project, file) %>
-            <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project" %>
+    <% if User.current.admin? || (User.current.logged? ) %>
+        <% if User.current.admin? || ((is_project_manager?(User.current, project) || file.author_id == User.current.id) && project_contains_attachment?(project, file)) %>
+            <% if User.current.admin? || ((delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project") %>
                 <ul class="homepagePostSettiongText">
                   <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %></li>
                   <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>

app/views/files/_upload_project_files.erb

@@ -22,6 +22,13 @@
             <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => project} %>
           </div>
           <div class="cl"></div>
+          <div class="mb5">
+            <label class="fl c_dark f14" style="margin-top: 4px;">文件描述：</label>
+            <div class="fl">
+              <input  type="text" name="description"  placeholder="文件描述" class="InputBox fl W160">
+            </div>
+            <div class="cl"></div>
+          </div>
 
           <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->

app/views/files/_upload_subfield_file.html.erb

@@ -16,6 +16,13 @@
           <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
           <%= render :partial => 'files/org_subfield_upload_attachment_list', :locals => {:container => org_subfield}%>
           <div class="cl"></div>
+          <div class="mb5">
+            <label class="fl c_dark f14" style="margin-top: 4px;">文件描述：</label>
+            <div class="fl">
+              <input  type="text" name="description"  placeholder="文件描述" class="InputBox fl W160">
+            </div>
+            <div class="cl"></div>
+          </div>
           <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
       <% end %>

app/views/files/update_file_description.js.erb

@@ -0,0 +1,3 @@
+$("#file_description_show_<%= @attachment.id %>").html("<%= escape_javascript render(:partial => "files/file_description", :locals => {:file => @attachment}) %>");
+$("#file_description_show_<%= @attachment.id %>").show();
+$("#file_description_edit_<%= @attachment.id %>").hide();

app/views/forums/create.js.erb

@@ -3,5 +3,5 @@
 //$('#reorder_time').click();
     window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
 <%else%>
- $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
+    $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
 <%end %>

app/views/issues/_issue_replies.html.erb

@@ -62,23 +62,27 @@
   </div>
 
   <div class="homepagePostReplyInputContainer mb10">
-    <div nhname='new_message_<%= @issue.id %>' style="display:none;">
-      <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
-          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-          <!--<div class="cl"></div>-->
-          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
-          <div nhname='toolbar_container_<%= @issue.id %>' ></div>
-          <div class="cl"></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
-          <div class="cl"></div>
-          <div class="mt5 fl">
-            <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
-          </div>
-          <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
-          <div class="cl"></div>
-      <% end %>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= @issue.id %>' style="display:none;">
+          <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
+              <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+              <!--<div class="cl"></div>-->
+              <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+              <div nhname='toolbar_container_<%= @issue.id %>' ></div>
+              <div class="cl"></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
+              <div class="cl"></div>
+              <div class="mt5 fl">
+                <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
+              </div>
+              <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
+              <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
+              <div class="cl"></div>
+          <% end %>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
     <div class="cl"></div>
 

app/views/issues/_issue_reply_ke_form.html.erb

@@ -5,21 +5,25 @@
   </div>
 
   <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= @issue.id%>' style="display:none;">
-      <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
-          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-          <!--<div class="cl"></div>-->
-          <input type="hidden" name="quote" value=""/>
-          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
-          <div nhname='toolbar_container_<%= @issue.id%>' ></div>
-          <div class="cl"></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
-          <div class="cl"></div>
-          <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-          <div class="cl"></div>
-      <% end %>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= @issue.id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+              <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+              <!--<div class="cl"></div>-->
+              <input type="hidden" name="quote" value=""/>
+              <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+              <div nhname='toolbar_container_<%= @issue.id%>' ></div>
+              <div class="cl"></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
+              <div class="cl"></div>
+              <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
+              <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+          <% end %>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
     <div class="cl"></div>
 

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">

app/views/layouts/base_org.html.erb

@@ -136,7 +136,7 @@
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
 
       </div>
-      <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %></div>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %> （自2016年5月）</div>
     </div>
     <div class="homepageRight" style="margin-top:<%= (params[:show_homepage].nil? && User.current.logged?) ? '10px':'0px' %>;">
       <%= render_flash_messages %>

app/views/layouts/base_projects.html.erb

@@ -146,7 +146,7 @@
         <div class="cl"></div>
       </div><!--项目标签 end-->
 
-      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @project.visits.to_i %></div>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @project.visits.to_i %> （自2016年5月）</div>
     </div>
   </div>
 

app/views/layouts/login.html.erb

@@ -14,19 +14,8 @@
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
-  <!-- MathJax的配置 -->
-  <script type="text/javascript"
-          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-  </script>
-  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
-  <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({
-        showMathMenu: false,
-        showMathMenuMSIE: false,
-          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
-        });
-      </script>
 </head>
+<body style="background-color: #fff">
 <div class="navContainer">
     <% is_current_user = User.current.logged? && User.current == @user%>
     <% if User.current.logged? %>

app/views/layouts/new_base_user.html.erb

@@ -284,7 +284,7 @@
           <div class="cl"></div>
         </div>
       </div>
-      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %></div>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
     </div>
     <div class="homepageRight">
       <%= yield %>

app/views/memos/show.html.erb

@@ -119,19 +119,23 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @memo.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= @memo.id%>' style="display:none;">
-          <%= form_for('memo',:url=>forum_memos_path,:method => "post") do |f|%>
-              <%= f.hidden_field :subject, :required => true, value: @memo.subject %>
-              <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
-              <%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
-              <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
-              <div nhname='toolbar_container_<%= @memo.id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id%>' name="memo[content]"></textarea>
-              <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= @memo.id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= @memo.id%>' style="display:none;">
+              <%= form_for('memo',:url=>forum_memos_path,:method => "post") do |f|%>
+                  <%= f.hidden_field :subject, :required => true, value: @memo.subject %>
+                  <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
+                  <%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
+                  <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
+                  <div nhname='toolbar_container_<%= @memo.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id%>' name="memo[content]"></textarea>
+                  <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= @memo.id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/messages/_reply_message.html.erb

@@ -2,17 +2,21 @@
 <div class="ReplyToMessageContainer borderBottomNone" id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= reply.id%>'>
-      <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-          <input type="hidden" name="quote[quote]" id="quote_quote">
-          <input type="hidden" name="reply[subject]" id="reply_subject">
-          <div nhname='toolbar_container_<%= reply.id%>'></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-          <div class="cl"></div>
-          <p nhname='contentmsg_<%= reply.id%>'></p>
-      <% end%>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+              <input type="hidden" name="quote[quote]" id="quote_quote">
+              <input type="hidden" name="reply[subject]" id="reply_subject">
+              <div nhname='toolbar_container_<%= reply.id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
+              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= reply.id%>'></p>
+          <% end%>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>

app/views/org_document_comments/_simple_ke_reply_form.html.erb

@@ -1,17 +1,21 @@
 <div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= reply.id%>'>
-      <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
-          <input type="hidden" name="quote[quote]" id="quote_quote">
-          <input type="hidden" name="org_document_comment[title]" id="reply_subject">
-          <div nhname='toolbar_container_<%= reply.id%>'></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="org_document_comment[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
-          <div class="cl"></div>
-          <p nhname='contentmsg_<%= reply.id%>'></p>
-      <% end%>
-    </div>
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
+              <input type="hidden" name="quote[quote]" id="quote_quote">
+              <input type="hidden" name="org_document_comment[title]" id="reply_subject">
+              <div nhname='toolbar_container_<%= reply.id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="org_document_comment[content]"></textarea>
+              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= reply.id%>'></p>
+          <% end%>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>

app/views/organizations/_org_course_homework.html.erb

@@ -387,17 +387,21 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
-              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-              <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
-              <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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+                  <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
+                  <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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/organizations/_org_course_message.html.erb

@@ -131,18 +131,22 @@
         <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"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer  mb10">
-            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-                  <input type="hidden" name="quote[quote]" value="">
-                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                      <input type="hidden" name="quote[quote]" value="">
+                      <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                      <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                      <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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 class="cl"></div>
-                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
-              <% end%>
-              <div class="cl"></div>
-            </div>
+                </div>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
             <div class="cl"></div>
           </div>
           <div class="cl"></div>

app/views/organizations/_org_course_news.html.erb

@@ -98,16 +98,20 @@
     <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"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/organizations/_org_custom_header.html.erb

@@ -1,11 +1,12 @@
+
 <div class="por_header_top">
   <div class="por_header_con" >
-    <%= image_tag(url_to_avatar(@organization), width:"67", height: "61", :id => 'nh_user_tx', :class => "por_logo fl ", :target => "_blank") %>
+    <%= image_tag(url_to_avatar(@organization), width:"51", height: "51", :id => 'nh_user_tx', :class => "por_logo fl mt1", :target => "_blank") %>
     <% if User.current.logged? %>
         <div class="navHomepageProfile" id="navHomepageProfile">
           <ul>
-            <li class="homepageProfileMenuIcon fr mt15" id="homepageProfileMenuIcon">
-              <%= link_to "<div class='user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :width =>"40", :height => "40", :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
+            <li class="homepageProfileMenuIcon fr mt5 " id="homepageProfileMenuIcon">
+              <%= link_to "<div class='user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :width =>"40", :height => "40", :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_url_in_org(User.current.id) %>
               <ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
                 <li><%= link_to "修改资料", my_account_path, :class => "menuGrey"%></li>
                 <li><%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%></li>
@@ -90,10 +91,11 @@
             <% end %>
         <% end %>
     <% end %>
-  </ul>
   <% if User.current.admin_of_org?(@organization) %>
       <a href="<%= setting_organization_path(@organization) %>" class="link-black fr por_edit_index" target="_blank">配置</a>
   <% end %>
+  </ul>
+
   <div class="cl"></div>
 </div><!--por_nav end-->
 

app/views/organizations/_org_custom_left1.html.erb

@@ -8,11 +8,11 @@
       </h2>
       <ul class="por_hotbar_left fl">
         <% if acts.count > 1 %>
-            <% acts[1..2].each do |activity| %>
+            <% acts[1..3].each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
                     <li>
-                      <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
+                      <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
                       <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
                         <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
                       </p>
@@ -25,7 +25,7 @@
                         <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
                         <% if message.board.org_subfield_id %>
                             <li>
-                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
+                              <%= link_to title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                                 <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                               </p>
@@ -33,7 +33,7 @@
                             </li>
                         <% else %>
                             <li>
-                              <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
+                              <%= link_to title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
                               <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
                                 <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                               </p>
@@ -44,7 +44,7 @@
                     <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
                         <% news = activity.org_act %>
                         <li>
-                          <%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{news.title}".html_safe, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
+                          <%= link_to news.title, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
                           <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
                             <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
                           </p>
@@ -54,54 +54,6 @@
                 <% end %>
             <% end %>
         <% end %>
-
-        <% if acts.count > 3 %>
-            <% activity = acts[3] %>
-            <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
-                <% document = activity.org_act %>
-                <li>
-                  <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
-                  <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
-                    <%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
-                  </p>
-                  <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
-                </li>
-            <% else activity.container_type == 'OrgSubfield' %>
-                <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                    <% message = activity.org_act %>
-                    <% content = message.parent_id.nil? ? message.content : message.parent.content %>
-                    <% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
-                    <% if message.board.org_subfield_id %>
-                        <li>
-                          <%= link_to title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
-                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
-                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
-                          </p>
-                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
-                        </li>
-                    <% else %>
-                        <li>
-                          <%= link_to title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
-                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
-                            <%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
-                          </p>
-                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
-                        </li>
-                    <% end %>
-                <% end %>
-                <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                    <% news = activity.org_act %>
-                    <li>
-                      <%= link_to news.title, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
-                      <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
-                        <%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
-                      </p>
-                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
-                    </li>
-                <% end %>
-            <% end %>
-        <% end %>
-
       </ul>
 
       <%# if acts.count > 3 %>
@@ -114,9 +66,11 @@
                 <% else %>
                     <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                 <% end %>
-                <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
-                <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                <div style="background: #f8fafb; padding:3px 5px">
+                  <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
+                  <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                  <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                </div>
               </div>
           <% else activity.container_type == 'OrgSubfield' %>
               <!--发送过来的帖子-->
@@ -131,9 +85,11 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        <div style="background: #f8fafb; padding:3px 5px">
+                          <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
+                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        </div>
                       </div>
                   <% else %>
                       <div class="por_hotbar_right fl">
@@ -142,9 +98,11 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_path(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_path(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        <div style="background: #f8fafb; padding:3px 5px">
+                          <%= link_to title, board_message_path(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
+                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        </div>
                       </div>
                   <% end %>
               <% end %>
@@ -157,9 +115,11 @@
                     <% else %>
                         <%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                     <% end %>
-                    <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
-                    <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                    <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                    <div style="background: #f8fafb; padding:3px 5px">
+                      <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
+                      <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                    </div>
                   </div>
               <% end %>
           <% end %>
@@ -168,3 +128,7 @@
   <%# end %>
   <div class="cl"></div>
 </div><!--por_hotbar end-->
+
+<script>
+  $(".por_hotbar_left li:last").css("borderBottom","none");
+</script>

app/views/organizations/_org_custom_left3.html.erb

@@ -71,8 +71,8 @@
               <% end %>
           <% end %>
         </div>
-        <% unless acts[1..5].nil? %>
-            <% acts[1..5].each do |activity| %>
+        <% unless acts[1..4].blank? %>
+            <% acts[1..4].each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
                     <ul class="por_post_list">
@@ -110,10 +110,10 @@
             <% end %>
         <% end %>
       </div>
-      <% unless acts[6..19].nil? %>
+      <% unless acts[5..16].blank? %>
           <div class="fl">
             <ul class="por_post_right por_post_list">
-              <% acts[6..19].each do |activity| %>
+              <% acts[5..16].each do |activity| %>
                   <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                       <% document = activity.org_act %>
                       <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>

app/views/organizations/_org_custom_right3.html.erb

@@ -33,9 +33,6 @@
         <li id="por_teachers_nav_1" class="por_teachers_hover" onclick="HoverLi(1);">
           <a href="javascript:void(0);" class="por_teachers_type">名师风采</a>
         </li>
-        <li id="por_teachers_nav_2"  onclick="HoverLi(2);">
-          <a href="javascript:void(0);" class="por_teachers_type">学生英雄榜</a>
-        </li>
         <!--<a href="javascript:void(0);" target="_blank" class="f12 fontGrey2 fr mt5">更多></a>-->
         <div class="cl"></div>
       </ul>
@@ -65,29 +62,6 @@
           <% end %>
         </ul>
       </div>
-      <div id="por_teachers_content_2" class="undis">
-        <ul class="por_teachers_li">
-          <% excellent_students.each do |student| %>
-              <li >
-                <%= link_to image_tag(url_to_avatar(student), :width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(student), :alt => "用户头像", :target => '_blank', :class => "fl" %>
-                <div class="por_teachers_txt fl mt5">
-                  <%=link_to student.try(:realname) ? student.try(:realname) :student.try(:login), user_path(student), :class => "por_teachers_name link-black fl", :target => '_blank' %>
-                  <p class="por_teachers_p fr" title="<%= student.my_workplace %>"><%= student.my_workplace %></p>
-                  <div class="cl"></div>
-                  <p class="por_teachers_span ">
-                    <% unless student.my_blogs_count == 0 %>
-                        <span class=" mr10">博客 <%= student.my_blogs_count %></span>
-                    <% end %>
-                    <% unless student.courses.count == 0 %>
-                        <span class="mr10">课程 <%= student.courses.count %></span>
-                    <% end %>
-                  </p>
-                </div>
-                <div class="cl"></div>
-              </li>
-          <% end %>
-        </ul>
-      </div>
     </div>
 
     <script>

app/views/organizations/_org_project_issue.html.erb

@@ -115,16 +115,20 @@
     <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"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
-              <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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+                  <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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/organizations/_org_subfield_message.html.erb

@@ -103,17 +103,21 @@
     <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"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="quote[quote]" value="">
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="quote[quote]" value="">
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/organizations/_org_subfield_news.html.erb

@@ -87,16 +87,20 @@
     <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"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/organizations/_project_message.html.erb

@@ -108,17 +108,21 @@
     <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"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="quote[quote]" value="">
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-              <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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="quote[quote]" value="">
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                  <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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/organizations/_unlogged_tip.js.erb

@@ -0,0 +1,4 @@
+//获取登录页面地址
+var signinPath = '<%= signin_url_without_domain %>';
+var htmlvalue = "</br><div style='width:550px;text-align:center'>您还没有登录，请登录后再执行此操作，谢谢！</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href="+signinPath+" class='Blue-btn fl' target='_Blank' onclick=' hideModal()' >登录</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>关闭</a></div>";
+pop_up_box(htmlvalue,580,30,50);

app/views/organizations/courses.html.erb

@@ -14,9 +14,11 @@
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
     <% end %>
-    <div class="sn-font-grey fr">
-      <%= link_to "精品课程", courses_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
-    </div>
+    <% if User.current.admin? %>
+        <div class="sn-font-grey fr">
+          <%= link_to "精品课程", courses_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+        </div>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div id="org_container_list">

app/views/organizations/projects.html.erb

@@ -14,9 +14,11 @@
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
     <% end %>
-    <div class="sn-font-grey fr">
-      <%= link_to "热门项目", projects_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
-    </div>
+    <% if User.current.admin? %>
+        <div class="sn-font-grey fr">
+          <%= link_to "热门项目", projects_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+        </div>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div id="org_container_list">

app/views/organizations/students.html.erb

@@ -14,9 +14,11 @@
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
     <% end %>
-    <div class="sn-font-grey fr">
-      <%= link_to "学霸列表", students_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
-    </div>
+    <% if User.current.admin? %>
+        <div class="sn-font-grey fr">
+          <%= link_to "学霸列表", students_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+        </div>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div id="org_students_list">

app/views/organizations/teachers.html.erb

@@ -22,9 +22,11 @@
       <!--<option value="2">学生数</option>-->
       <!--<option value="3">资源数</option>-->
     <!--</select>-->
-    <div class="sn-font-grey fr">
-      <%= link_to "名师列表", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
-    </div>
+    <% if User.current.admin? %>
+        <div class="sn-font-grey fr">
+          <%= link_to "名师列表", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+        </div>
+    <% end %>
     <div class="cl"></div>
   </div>
   <div id="org_teachers_list">

app/views/projects/_project_news.html.erb

@@ -67,16 +67,20 @@
     <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"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/student_work/_choose_group_member.html.erb

@@ -93,18 +93,33 @@
             url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?homework='+<%=@homework.id %>,
             type:'get'
         });
-        <% if defined?(edit_mode) && edit_mode %>
-            <% pro = @homework.student_work_projects.where("user_id = ?",User.current.id).first.project_id.to_i %>
-            <% members = @homework.student_work_projects.where("project_id = ? and is_leader =?",pro,0) %>
-            <% members.each do |member| %>
-                var link = "<li id='choose_student_<%=member.user_id%>' onclick='delete_student(<%=member.user_id %>);'><%=member.user.show_name %>";
-                <% unless member.user.user_extensions.student_id == "" %>
-                link += "(<%=member.user.user_extensions.student_id %>)";
-                <% end %>
-                link += "</li>";
-                $("#choose_students_list").append(link);
-            <% end %>
-        <% end %>
+        var ids = $("#group_member_ids").val().split(',');
+        if (ids.length > 1){
+            for(var i=1; i<ids.length; i++) {
+                if($("#choose_student_"+ids[i]).length == 0) {
+                    $.get(
+                            '/student_work/get_user_infor',
+                            {
+                                user_id: ids[i]
+                            },
+                            function (data) {
+                                if (data.valid) {
+                                    var link = "<li id='choose_student_"+data.id+"' onclick='delete_student("+data.id+");'>"+data.name;
+                                    if (data.student_id != "" ) {
+                                        link += "("+data.student_id+")";
+                                    }
+                                    link += "</li>";
+                                    $("#choose_students_list").append(link);
+                                }
+                                else
+                                {
+
+                                }
+                            }
+                    );
+                }
+            }
+        }
     });
 </script>
 <% end %>

app/views/student_work/_evaluation_title.html.erb

@@ -7,7 +7,7 @@
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
     <% if @homework.homework_type != 3 %>
-        <th class="hworkList260 hide-text" style="text-align:left;">作品名称</th>
+        <th class="<%= @homework.homework_type == 2 ? 'hworkList210' : 'hworkList260' %> hide-text" style="text-align:left;">作品名称</th>
         <th class="hworkList80 hide-text">
           <span class="HomeworkStuTitle f14 fb">姓名</span>
         </th>

app/views/student_work/_no_teacher_score_notice.html.erb

@@ -1,7 +1,8 @@
 <div id="popbox02">
   <div class="ni_con">
     <p>
-      当前作品未进行评分，是否确定提交？
+      <%#A if work.teacher_score.nil? || work. %>
+      您当次评阅未对作品进行评分，分数将取上次的评分结果，若没有评分记录则不评分，是否确定提交？
     </p>
     <div class="ni_btn">
       <a href="javascript:" class="tijiao" onclick="submit_teacher_score(<%=work.id %>);" style="margin-bottom: 20px;" >

app/views/student_work/_set_score_rule_detail.html.erb

@@ -2,12 +2,14 @@
   <span class="uploadText">评分设置</span>
   <div class="mt15">
     <span class="f14 fontGrey3 mr10">迟交扣分</span>
-    <input type="text" name="late_penalty" id="late_penalty_num" placeholder="请输入0-50数值" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
+    <input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
+    <span class="f12 c_red ml10">请输入0-50数值</span>
   </div>
   <% if homework.anonymous_comment == 0 %>
-      <div>
+      <div class="mt10">
         <span class="f14 fontGrey3 mr10">缺评扣分</span>
-        <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="请输入0-50数值" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
+        <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="0-50" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
+        <span class="f12 c_red ml10">请输入0-50数值</span>
       </div>
   <% end %>
 
@@ -55,7 +57,7 @@
   </div>
   <div>
     <div class="courseSendSubmit">
-      <a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-modal').find('form').submit();clickCanel();">确定</a>
+      <a href="javascript:void(0);" class="sendSourceText" onclick="set_score_rule_submit();">确定</a>
     </div>
     <div class="courseSendCancel">
       <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="hideModal();">取消</a>
@@ -63,3 +65,15 @@
   </div>
   <div class="cl"></div>
 </div>
+<script type="text/javascript">
+  function set_score_rule_submit() {
+      if($("#late_penalty_num").val() == ""){
+          $("#late_penalty_num").val("0");
+      }
+      if($("#absence_penalty_num").val() == ""){
+          $("#absence_penalty_num").val("0");
+      }
+      $('#ajax-modal').find('form').submit();
+      clickCanel();
+  }
+</script>

app/views/student_work/_student_work_list.html.erb

@@ -4,14 +4,21 @@
       <font class="f12 c_red">
         (<%= @student_work_count%>人已交)
       </font>
-    <% my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
+    <%# my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
+    <% my_work = cur_user_works_for_homework @homework %>
     <% if !@is_teacher && my_work.nil? && User.current.member_of_course?(@course) %>
        <span class="f12 c_red">您尚未提交作品</span>
-        <%=link_to "提交作品",  new_student_work_url_without_domain(@homework.id),:class => 'blueCir ml5 f12' %>
+        <% unless @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+            <%=link_to "提交作品",  new_student_work_url_without_domain(@homework.id),:class => 'blueCir ml5 f12' %>
+        <% end %>
     <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
-       <span class="f12 c_red">您已提交且不可再修改，因为截止日期已过</span>
+       <span class="f12 c_red">已提交且不可再修改，因为截止日期已过</span>
     <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
-       <span class="f12 c_red">您已提交，您还可以修改</span>
+        <% if @homework.homework_type == 3 %>
+            <span class="f12 c_red">组长已提交，组长还可修改</span>
+        <% else %>
+            <span class="f12 c_red">您已提交，您还可以修改</span>
+        <% end %>
     <% end %>
   </span>
   <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3 || @homework.is_open == 1%>

app/views/student_work/edit.html.erb

@@ -103,21 +103,11 @@
     }
 
     function popupRegex(){
-        if($("#group_member_ids").length > 0) {
-            if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
-                $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-                showModal('ajax-modal', '500px');
-                $('#ajax-modal').siblings().remove();
-                $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-                $('#ajax-modal').parent().addClass("anonymos");
-            }
-        } else {
-            $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-            showModal('ajax-modal', '500px');
-            $('#ajax-modal').siblings().remove();
-            $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-            $('#ajax-modal').parent().addClass("anonymos");
-        }
+        $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+        showModal('ajax-modal', '500px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("anonymos");
     }
 
     function nh_check_field(params){
@@ -140,6 +130,12 @@
                     params.contentmsg.html('');
                 }
             }
+            if(!result) {
+                return result;
+            }
+        }
+        if($("#group_member_ids").length > 0) {
+            result=regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())));
         }
         return result;
     }

app/views/student_work/new.html.erb

@@ -62,21 +62,11 @@
   }
   // 作品校验
   function popupRegex(){
-      if($("#group_member_ids").length > 0) {
-          if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
-              $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-              showModal('ajax-modal', '500px');
-              $('#ajax-modal').siblings().remove();
-              $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-              $('#ajax-modal').parent().addClass("anonymos");
-          }
-      } else {
-          $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-          showModal('ajax-modal', '500px');
-          $('#ajax-modal').siblings().remove();
-          $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-          $('#ajax-modal').parent().addClass("anonymos");
-      }
+      $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+      showModal('ajax-modal', '500px');
+      $('#ajax-modal').siblings().remove();
+      $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+      $('#ajax-modal').parent().addClass("anonymos");
   }
 
   function nh_check_field(params){
@@ -99,6 +89,12 @@
                   params.contentmsg.html('');
               }
           }
+          if(!result) {
+              return result;
+          }
+      }
+      if($("#group_member_ids").length > 0) {
+            result=regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())));
       }
       return result;
   }

app/views/student_work/retry_work.js.erb

@@ -1,2 +1,3 @@
 hideModal('#popbox02');
 $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false,:has_group=>false})%>");
+$("#group_member_ids").val("<%=User.current.id %>");

app/views/student_work/search_course_students.js.erb

@@ -7,7 +7,8 @@ $("#all_students_list").empty();
     link += "</li>";
     $("#all_students_list").append(link);
 
-    var str = "";
+    var str = $("#group_member_ids").val();
+    /*var str = "";
     var lists = $("#choose_students_list li");
     if(lists.length > 0) {
         for(var i=0; i<lists.length; i++) {
@@ -17,7 +18,7 @@ $("#all_students_list").empty();
                 str += ",";
         }
     }
-}
+}*/
     <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? && user.member_of_course?(@course) %>
         if (str.indexOf(<%=user.id.to_s %>) < 0) {
             $("#student_<%=user.id %>").one("click",function choose_student() {

app/views/users/_course_homework.html.erb

@@ -319,17 +319,21 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
-              <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-              <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+                  <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/users/_course_journalsformessage.html.erb

@@ -14,13 +14,23 @@
         <% 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.parent %>
-            <%= link_to activity.parent.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
-        <% else %>
-            <%= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
-        <% end %>
-      </div>
+      <!--<div class="homepagePostTitle break_word list_style upload_img">
+        <%# if activity.parent %>
+            <%#= link_to activity.parent.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
+        <%# else %>
+            <%#= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
+        <%# end %>
+      </div>-->
+      <% if activity.parent %>
+          <% content = activity.parent.notes %>
+      <% else %>
+          <% content = activity.notes %>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
       <div class="homepagePostDate fl">
         留言时间：<%= format_time(activity.created_on) %>
       </div>
@@ -60,20 +70,24 @@
     <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 %>
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% if User.current.logged? %>
+            <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 %>
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/users/_course_message.html.erb

@@ -49,33 +49,35 @@
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
 
-      <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <% if activity.author.id == User.current.id%>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :class => 'postOptionLink'
-                        ) if activity.course_editable_by?(User.current) %>
-                  </li>
-                  <li>
-                    <%= link_to(
-                                l(:button_delete),
-                                delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :method => :post,
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if activity.course_destroyable_by?(User.current) %>
-                  </li>
-              <% end %>
-              <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <% if activity.author.id == User.current.id%>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :class => 'postOptionLink'
+                            ) if activity.course_editable_by?(User.current) %>
+                      </li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_delete),
+                                    delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :method => :post,
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if activity.course_destroyable_by?(User.current) %>
+                      </li>
+                  <% end %>
+                  <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+                </ul>
+              </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+        </div>
+      <% end %>
 
     </div>
     <div class="cl"></div>
@@ -116,18 +118,22 @@
         <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"), user_path(activity.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer  mb10">
-            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,is_course=>is_course},:method => "post", :remote => true) do |f|%>
-                  <input type="hidden" name="quote[quote]" value="">
-                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,is_course=>is_course},:method => "post", :remote => true) do |f|%>
+                      <input type="hidden" name="quote[quote]" value="">
+                      <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                      <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                      <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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 class="cl"></div>
-                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
-              <% end%>
-              <div class="cl"></div>
-            </div>
+                </div>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
             <div class="cl"></div>
           </div>
           <div class="cl"></div>

app/views/users/_course_news.html.erb

@@ -35,31 +35,33 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <% if User.current.logged? %>
-                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {controller:'news', :action => 'edit', :id => activity.id},
-                                :class => 'postOptionLink'
-                        ) if User.current.allowed_to?(:manage_news, activity.course) %>
-                  </li>
-                  <li>
-                    <%= delete_link(
-                                news_path(activity),
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if User.current.allowed_to?(:manage_news, activity.course) %>
-                  </li>
-                </ul>
-            <% end %>
-          </li>
-        </ul>
-      </div>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <% if User.current.logged? %>
+                    <ul class="homepagePostSettiongText">
+                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    {controller:'news', :action => 'edit', :id => activity.id},
+                                    :class => 'postOptionLink'
+                            ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                      </li>
+                      <li>
+                        <%= delete_link(
+                                    news_path(activity),
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                      </li>
+                    </ul>
+                <% end %>
+              </li>
+            </ul>
+        </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>
@@ -92,16 +94,20 @@
     <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"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/users/_project_issue.html.erb

@@ -13,29 +13,31 @@
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
       </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li>
-                <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
-              </li>
-              <li>
-                <% if !defined?(project_id) && !defined?(user_id) %>
-                    <%= link_to l(:button_delete), issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
-                <% elsif defined?(project_id) %>
-                    <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
-                <% elsif defined?(user_id) %>
-                    <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
-                <% end %>
-              </li>
-              <li>
-                <%= link_to l(:button_copy), project_copy_issue_path(activity.project, activity), :class => 'postOptionLink' if User.current.allowed_to?(:add_issues, activity.project) %>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
+                  </li>
+                  <li>
+                    <% if !defined?(project_id) && !defined?(user_id) %>
+                        <%= link_to l(:button_delete), issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                    <% elsif defined?(project_id) %>
+                        <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                    <% elsif defined?(user_id) %>
+                        <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                    <% end %>
+                  </li>
+                  <li>
+                    <%= link_to l(:button_copy), project_copy_issue_path(activity.project, activity), :class => 'postOptionLink' if User.current.allowed_to?(:add_issues, activity.project) %>
+                  </li>
+                </ul>
               </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+        </div>
+      <% end %>
       <div class="homepagePostTitle break_word">
         <% case activity.tracker_id %>
         <% when 1%>

app/views/users/_project_issue_reply.html.erb

@@ -27,16 +27,20 @@
   <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"), user_path(activity.author_id), :alt => "用户头像" %></div>
     <div class="homepagePostReplyInputContainer mb10">
-      <div nhname='new_message_<%= user_activity_id %>' style="display:none;">
-        <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %>
-            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
-            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+      <% if User.current.logged? %>
+          <div nhname='new_message_<%= user_activity_id %>' style="display:none;">
+            <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %>
+                <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+                <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+      <% else %>
+          <%= render :partial => "users/show_unlogged" %>
+      <% end %>
       <div class="cl"></div>
     </div>
     <div class="cl"></div>

app/views/users/_project_message.html.erb

@@ -49,33 +49,35 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
-      <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <% if activity.author.id == User.current.id%>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :class => 'postOptionLink'
-                        ) if activity.editable_by?(User.current) %>
-                  </li>
-                  <li>
-                    <%= link_to(
-                                l(:button_delete),
-                                delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :method => :post,
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if activity.destroyable_by?(User.current) %>
-                  </li>
-              <% end %>
-              <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <% if activity.author.id == User.current.id%>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :class => 'postOptionLink'
+                            ) if activity.editable_by?(User.current) %>
+                      </li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_delete),
+                                    delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :method => :post,
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if activity.destroyable_by?(User.current) %>
+                      </li>
+                  <% end %>
+                  <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+                </ul>
+              </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+        </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>
@@ -111,17 +113,21 @@
         <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"), user_path(activity.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer mb10">
-            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-                  <input type="hidden" name="quote[quote]" value="">
-                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                      <input type="hidden" name="quote[quote]" value="">
+                      <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                      <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+                      <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
             <div class="cl"></div>
           </div>
           <div class="cl"></div>

app/views/users/_project_news.html.erb

@@ -32,31 +32,33 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <% if User.current.logged? %>
-                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {:action => 'edit', :id => activity},
-                                :class => 'postOptionLink'
-                        ) if activity.author == User.current %>
-                  </li>
-                  <li>
-                    <%= delete_link(
-                                news_path(activity),
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if activity.author == User.current %>
-                  </li>
-                </ul>
-            <% end %>
-          </li>
-        </ul>
-      </div>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <% if User.current.logged? %>
+                    <ul class="homepagePostSettiongText">
+                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    {:action => 'edit', :id => activity},
+                                    :class => 'postOptionLink'
+                            ) if activity.author == User.current %>
+                      </li>
+                      <li>
+                        <%= delete_link(
+                                    news_path(activity),
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if activity.author == User.current %>
+                      </li>
+                    </ul>
+                <% end %>
+              </li>
+            </ul>
+        </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>
@@ -89,16 +91,20 @@
     <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"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/users/_reply_to.html.erb

@@ -1,7 +1,8 @@
-<div class="orig_reply_box borderBottomNone" id="reply_to_message_<%= reply.id%>">
-  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
-  <div class="orig_textarea mb10 fl">
-    <div nhname='new_message_<%= reply.id%>'>
+<div class="<%= User.current.logged? ? 'orig_reply_box' : 'orig_reply_box2' %> borderBottomNone" id="reply_to_message_<%= reply.id%>">
+  <% if User.current.logged? %>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+      <div class="orig_textarea mb10 fl">
+      <div nhname='new_message_<%= reply.id%>'>
       <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
           <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
           <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
@@ -13,7 +14,10 @@
           <div class="cl"></div>
           <p nhname='contentmsg_<%= reply.id%>'></p>
       <% end%>
-    </div>
+      </div>
+  <% else %>
+    <%= render :partial => "users/show_unlogged_reply" %>
+  <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>

app/views/users/_show_unlogged.html.erb

@@ -1,3 +1,4 @@
 <div class="visitor-box fontGrey2">
-  <%= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>后可添加回复
+  <a href='<%= signin_url_without_domain %>' class='linkBlue' target='_Blank' >登录</a>后可添加回复
+  <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
 </div>

app/views/users/_show_unlogged_reply.html.erb

@@ -0,0 +1,4 @@
+<div class="visitor-box fontGrey2 mt10">
+  <a href='<%= signin_url_without_domain %>' class='linkBlue' target='_Blank' >登录</a>后可添加回复
+  <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
+</div>

app/views/users/_user_at_message.html.erb

@@ -1,4 +1,4 @@
-<% if AtMessage === ma && ma.at_valid? %>
+<% if ma.class == AtMessage && ma.at_valid? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %></a></li>
           <li class="homepageNewsPubType fl">

app/views/users/_user_blog.html.erb

@@ -74,21 +74,25 @@
     <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"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'blog_comments', :action => 'reply', :user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="quote[quote]" value="">
-              <input type="hidden" name="in_user_center" value="true">
-              <input type="hidden" name="blog_comment[sticky]" value="0">
-              <input type="hidden" name="blog_comment[locked]" value="0">
-              <input type="hidden" name="blog_comment[title]" value="RE:<%= activity.title%>">
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'blog_comments', :action => 'reply', :user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id},:method => "post", :remote => true) do |f|%>
+                  <input type="hidden" name="quote[quote]" value="">
+                  <input type="hidden" name="in_user_center" value="true">
+                  <input type="hidden" name="blog_comment[sticky]" value="0">
+                  <input type="hidden" name="blog_comment[locked]" value="0">
+                  <input type="hidden" name="blog_comment[title]" value="RE:<%= activity.title%>">
+                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/users/_user_group_attr.html.erb

@@ -3,11 +3,14 @@
 <div class="mt10">
   <span class="f14 fontGrey3 mr5">每组最小人数：</span>
   <input id="min_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.min_num : 2 %>" />人
+  <span class="c_red undis" id="min_num_notice"></span>
 </div>
 <div class="mt10">
   <span class="f14 fontGrey3 mr5">每组最大人数：</span>
   <input id="max_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.max_num : 10 %>" />人
+  <span class="c_red undis" id="max_num_notice"></span>
 </div>
+<p class="c_red undis" id="min_max_num_notice"></p>
 <div class="mb10 mt10">
   <label>
     <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 1 %>" id="base_on_project"/>

app/views/users/_user_homework_detail.html.erb

@@ -329,17 +329,21 @@
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= homework_common.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"),  :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= homework_common.id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => homework_common.id},:method => "post", :remote => true) do |f|%>
-              <%= hidden_field_tag 'homework_common_id',params[:homework_common_id],:value =>homework_common.id %>
-              <%= hidden_field_tag 'is_in_course',params[:is_in_course],:value =>is_in_course %>
-              <div nhname='toolbar_container_<%= homework_common.id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= homework_common.id%>' name="homework_message"></textarea>
-              <a id="new_message_submit_btn_<%= homework_common.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= homework_common.id%>'></p>
-          <% end%>
-        </div>
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= homework_common.id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => homework_common.id},:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'homework_common_id',params[:homework_common_id],:value =>homework_common.id %>
+                  <%= hidden_field_tag 'is_in_course',params[:is_in_course],:value =>is_in_course %>
+                  <div nhname='toolbar_container_<%= homework_common.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= homework_common.id%>' name="homework_message"></textarea>
+                  <a id="new_message_submit_btn_<%= homework_common.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= homework_common.id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/users/_user_journalsformessage.html.erb

@@ -16,22 +16,26 @@
             <% end %>
         <% end %>
       </div>
-      <% if is_activity.to_i == 1 %>
-          <div class="homepagePostTitle break_word list_style upload_img">
-            <% if activity.parent %>
-                <%= link_to activity.parent.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
-            <% else %>
-                <%= link_to activity.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
-            <% end %>
-          </div>
-      <% else %>
+      <%# if is_activity.to_i == 1 %>
+          <!--<div class="homepagePostTitle break_word list_style upload_img">
+            <%# if activity.parent %>
+                <%#= link_to activity.parent.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
+            <%# else %>
+                <%#= link_to activity.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
+            <%# end %>
+          </div>-->
+      <%# else %>
           <% if activity.parent %>
               <% content = activity.parent.notes %>
           <% else %>
               <% content = activity.notes %>
           <% end %>
           <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
-    <% end %>
+          <div class="cl"></div>
+          <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+          <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+          <div class="cl"></div>
+    <%# end %>
       <div class="homepagePostDate fl">
         留言时间：<%= format_time(activity.created_on) %>
       </div>
@@ -87,21 +91,25 @@
     <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 %>
-              <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% if User.current.logged? %>
+            <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 %>
+                  <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" 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>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>

app/views/users/_user_jours_list.html.erb

@@ -5,7 +5,7 @@
 
 <%if jours %>
     <% jours.each do |jour|%>
-        <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
+        <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id && !User.current.admin?)) %>
             <script type="text/javascript">
                 $(function(){
                     sd_create_editor_from_data(<%= jour.id%>, null, "100%", "<%=jour.class.to_s%>");

app/views/users/_user_message_course.html.erb

@@ -326,7 +326,7 @@
 
         </ul>
     <% end %>
-    <% if ma.course_message_type == "StudentWorksScore" %>
+    <% if ma.course_message_type == "StudentWorksScore" && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <% if ma.course_message.reviewer_role == 3 %>

app/views/users/new_user_commit_homework.html.erb

@@ -7,6 +7,15 @@
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
+        <%if @homework.anonymous_comment == 0 && @homework.homework_detail_manual.comment_status != 1%>
+            $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_student_work_alert') %>');
+            showModal('ajax-modal', '360px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                    "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+            $('#ajax-modal').parent().css("top","65%").css("left","60%").css("border","3px solid #269ac9");
+            $('#ajax-modal').parent().addClass("anonymos_work");
+        <% end%>
     });
 </script>
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->

app/views/users/user_messages.html.erb

@@ -4,8 +4,9 @@
     <% if (!@message_alls.nil? && @message_alls.count >0) %>
         <% if params[:type].nil? || params[:type] == "unviewed" %>
             <div class="newsReadSetting">
-              有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读
-              <% unless (unviewed_message(@user) == 0 || User.current != @user) %>
+              <% count = unviewed_message(@user) %>
+              有&nbsp;<span class="c_red"><%= count %></span>&nbsp;条未读
+              <% unless (count == 0 || User.current != @user) %>
                   <a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
               <% end %>
             </div>

config/locales/account/zh.yml

@@ -37,7 +37,7 @@ zh:
   label_password_lost: "忘记密码？"
   button_login: 登录
   #     account_controller中判断用户名或密码输入有误的提示信息
-  notice_account_invalid_creditentials: "无效的用户名或密码，注意登录名区分大小写，谢谢！"
+  notice_account_invalid_creditentials: "无效的用户名或密码，注意登录名区分大小写。"
   #     account_controller中判断未激活的提示信息
   notice_account_invalid_creditentials_new: "您还未到邮箱激活。如果您丢失帐户，电子邮件验证帮助我们的支持团队验证帐户的所有权，并允许您接收所有您要求的通知。"
 

config/routes.rb

@@ -130,6 +130,7 @@ RedmineApp::Application.routes.draw do
       end
       member do
         match "quote_resource_show_org_subfield", :via => [:get]
+        get "update_file_description"
       end
     end
 
@@ -329,6 +330,7 @@ RedmineApp::Application.routes.draw do
       post 'last_codecomparetime'
       post 'set_score_rule'
       get 'work_canrepeat'
+      get 'get_user_infor'
     end
   end
 
@@ -779,6 +781,7 @@ RedmineApp::Application.routes.draw do
       member do
         match "quote_resource_show", :via => [:get]
         get "file_hidden"
+        get "update_file_description"
       end
     end
 
@@ -975,7 +978,6 @@ RedmineApp::Application.routes.draw do
       match 'delete_softapplications', :via =>  [:get, :post]
     end
   end
-
   resources :groups do
     member do
       get 'autocomplete_for_user'
@@ -1019,6 +1021,7 @@ RedmineApp::Application.routes.draw do
   get 'admin/excellent_courses', as: :excellent_courses
   get 'admin/excellent_all_courses', as: :excellent_all_courses
   match 'admin/set_excellent_course/:id', :to => 'admin#set_excellent_course'
+  match 'admin/cancel_excellent_course/:id', :to => 'admin#cancel_excellent_course'
   get 'admin/course_resource_list'
   get 'admin/project_resource_list'
   match 'admin/users',  :via => :get
@@ -1114,6 +1117,7 @@ RedmineApp::Application.routes.draw do
         match "quote_resource_show", :via => [:get]
         get "file_hidden"
         post "republish_file"
+        get "update_file_description"
       end
     end
     resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do

db/migrate/20160613064914_create_syllabuses.rb

@@ -0,0 +1,12 @@
+class CreateSyllabuses < ActiveRecord::Migration
+  def change
+    create_table :syllabuses do |t|
+      t.string :title
+      t.text :description
+      t.references :user
+
+      t.timestamps
+    end
+    add_index :syllabuses, :user_id
+  end
+end