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

Conflicts:
	app/views/users/_course_journalsformessage.html.erb

Gemfile

@@ -1,4 +1,4 @@
-source 'http://ruby.taobao.org'
+source 'https://ruby.taobao.org'
 #source 'http://ruby.sdutlinux.org/'
 
 unless RUBY_PLATFORM =~ /w32/
@@ -28,6 +28,7 @@ gem 'ruby-ole'
 gem 'rails_kindeditor',path:'lib/rails_kindeditor'
 #gem "rmagick", ">= 2.0.0"
 gem 'binding_of_caller'
+gem 'chinese_pinyin'
 
 group :development do
   gem 'grape-swagger'

app/controllers/boards_controller.rb

@@ -90,65 +90,67 @@ class BoardsController < ApplicationController
         end
       end
     end
+
+    sort_init 'updated_on', 'desc'
+    sort_update 'created_on' => "#{Message.table_name}.created_on",
+                'replies' => "#{Message.table_name}.replies_count",
+                'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)"
+
+    @is_new = params[:is_new]
+    @topic_count = @board ? @board.topics.count : 0
+    if @project
+      @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+      #现在发布帖子的时候置顶功能已经没有了。所以取消这个置顶排序 #{Message.table_name}.sticky DESC,
+      @topics = @board.topics.
+          reorder("#{Message.table_name}.created_on desc").
+          includes(:last_reply).
+          limit(@topic_pages.per_page).
+          offset(@topic_pages.offset).
+
+          preload(:author, {:last_reply => :author}).
+          all
+    elsif @course
+      #
+      # board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
+      #     includes(:last_reply).
+      #     # limit(@topic_pages.per_page).
+      #     # offset(@topic_pages.offset).
+      #
+      #     preload(:author, {:last_reply => :author}).
+      #     all : []
+      # @topics = paginateHelper board_topics,10
+      if (@board)
+        limit = 10;
+        #pageno = params[:page];
+        #if(pageno == nil || pageno=='')
+        #   dw_topic = nil;
+        #  if( params[:parent_id]!=nil && params[:parent_id]!='' )
+        #    dw_topic = @board.topics.where(id:params[:parent_id]).first();
+        #  end
+        #  if( dw_topic != nil )
+        #    dw_count = @board.topics.where('(sticky>?) or (sticky=? and created_on>?)',dw_topic.sticky,dw_topic.sticky,dw_topic.created_on).count();
+        #    dw_count = dw_count+1;
+        #    pageno = dw_count%10==0 ? (dw_count/limit) : (dw_count/limit+1)
+        #  end
+        #end
+        #if(pageno == nil || pageno=='')
+        #  pageno=1;
+        #end
+        @topic_count = @board.topics.count();
+        @topic_pages = (params[:page] ? params[:page].to_i + 1 : 0) *10
+        @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) desc").
+            limit(limit).offset(@topic_pages).includes(:last_reply).
+            preload(:author, {:last_reply => :author}).all();
+      else
+        @topics = [];
+      end
+    end
+
+    @message = Message.new(:board => @board)
+    #modify by nwb
     respond_to do |format|
       format.js
       format.html {
-        sort_init 'updated_on', 'desc'
-        sort_update 'created_on' => "#{Message.table_name}.created_on",
-                    'replies' => "#{Message.table_name}.replies_count",
-                    'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)"
-
-        @topic_count = @board ? @board.topics.count : 0
-        if @project
-          @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
-          #现在发布帖子的时候置顶功能已经没有了。所以取消这个置顶排序 #{Message.table_name}.sticky DESC,
-          @topics =  @board.topics.
-              reorder("#{Message.table_name}.created_on desc").
-              includes(:last_reply).
-              limit(@topic_pages.per_page).
-              offset(@topic_pages.offset).
-
-              preload(:author, {:last_reply => :author}).
-              all
-        elsif @course
-          #
-          # board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
-          #     includes(:last_reply).
-          #     # limit(@topic_pages.per_page).
-          #     # offset(@topic_pages.offset).
-          #
-          #     preload(:author, {:last_reply => :author}).
-          #     all : []
-          # @topics = paginateHelper board_topics,10
-          if( @board )
-            limit = 10;
-            pageno = params[:page];
-            if(pageno == nil || pageno=='')
-              dw_topic = nil;
-              if( params[:parent_id]!=nil && params[:parent_id]!='' )
-                dw_topic = @board.topics.where(id:params[:parent_id]).first();
-              end
-              if( dw_topic != nil )
-                dw_count = @board.topics.where('(sticky>?) or (sticky=? and created_on>?)',dw_topic.sticky,dw_topic.sticky,dw_topic.created_on).count();
-                dw_count = dw_count+1;
-                pageno = dw_count%10==0 ? (dw_count/limit) : (dw_count/limit+1)
-              end
-            end
-            if(pageno == nil || pageno=='')
-              pageno=1;
-            end
-            @topic_count = @board.topics.count();
-            @topic_pages = Paginator.new @topic_count, limit, pageno
-            @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
-                            limit(limit).offset(@topic_pages.offset).includes(:last_reply).
-                            preload(:author, {:last_reply => :author}).all();
-          else
-            @topics = [];
-          end
-        end
-
-        @message = Message.new(:board => @board)
-        #modify by nwb
         if @project
           render :action => 'show', :layout => 'base_projects'
         elsif @course
@@ -158,10 +160,10 @@ class BoardsController < ApplicationController
       }
       format.atom {
         @messages = @board.messages.
-          reorder('created_on DESC').
+            reorder('created_on DESC').
-          includes(:author, :board).
+            includes(:author, :board).
-          limit(Setting.feeds_limit.to_i).
+            limit(Setting.feeds_limit.to_i).
-          all
+            all
         if @project
           render_feed(@messages, :title => "#{@project}: #{@board}")
         elsif @course

app/controllers/messages_controller.rb

@@ -37,6 +37,7 @@ class MessagesController < ApplicationController
 
   # Show a topic and its replies
   def show
+=begin
     if @course
       topic_id = params[:r]?params[:r]:params[:id]
       parent_id = params[:id]
@@ -44,6 +45,7 @@ class MessagesController < ApplicationController
       redirect_to url
       return;
     end
+=end
 
     @isReply = true
     page = params[:page]

app/controllers/my_controller.rb

@@ -126,11 +126,13 @@ class MyController < ApplicationController
         end
 
         @se = @user.extensions
-        if params[:occupation].to_i.to_s == params[:occupation]
+        # if params[:occupation].to_i.to_s == params[:occupation]
-          @se.school_id = params[:occupation]
+        #   @se.school_id = params[:occupation]
-        else
+        # else
-          @se.occupation = params[:occupation]
+        #   @se.occupation = params[:occupation]
-        end
+        # end
+        @se.school_id = params[:occupation]
+
         @se.gender = params[:gender]
         @se.location = params[:province] if params[:province]
         @se.location_city = params[:city] if params[:city]

app/controllers/repositories_controller.rb

@@ -46,16 +46,21 @@ class RepositoriesController < ApplicationController
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
-    scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
+    if @project.repositories.count == 0
-    @repository = Repository.factory(scm)
+      scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
-    @repository.is_default = @project.repository.nil?
+      @repository = Repository.factory(scm)
-    @repository.project = @project
+      @repository.is_default = @project.repository.nil?
-    @course_tag = params[:course]
+      @repository.project = @project
-    if @course_tag == 1
+      @course_tag = params[:course]
-      render :layout => 'base_courses'
+      if @course_tag == 1
+        render :layout => 'base_courses'
+      else
+        render :layout => 'base_projects'
+      end
     else
-      render :layout => 'base_projects'
+      render_403
     end
+
   end
   
   

app/controllers/school_controller.rb

@@ -105,4 +105,42 @@ class SchoolController < ApplicationController
 
     render :text => options    
   end
+
+  #根据学校名字或者拼音来查询
+  def on_search
+    condition = "#{params[:name].strip}".gsub(" ","")
+    #将条件截断为汉字和拼音（全汉字 或者 全拼音 或者 汉字和拼音），
+      #获取拼音的第一次出现的位置
+      chinese = []
+      pinyin  = []
+    condition.scan(/./).each_with_index  do |char,index|
+         if char =~ /[a-zA-Z0-9]/
+           pinyin << char
+         else
+           chinese << char
+         end
+    end
+    if(condition == '')
+      @school = School.all
+    else
+      @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").all
+    end
+
+    result = []
+    # @school.each do |sc|
+    #   result << {:value=>sc.name,:data=>sc.id}
+    # end
+   render :json => @school.to_json
+  end
+
+  #添加学校
+  def add_school
+    @school = School.new
+    @school.name = params[:name].strip
+    @school.pinyin = Pinyin.t(params[:name].strip, splitter: '')
+    @school.save
+    respond_to do |format|
+      format.js
+    end
+  end
 end

app/controllers/users_controller.rb

@@ -883,6 +883,7 @@ class UsersController < ApplicationController
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','Poll')"
     project_types = "('Message','Issue')"
+    principal_types = "JournalsForMessage"
     if params[:type].present?
       case params[:type]
         when "course_homework"
@@ -897,13 +898,15 @@ class UsersController < ApplicationController
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_message"
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
+        when "user_journals"
+          @user_activities = UserActivity.where("container_type = 'Principal' and act_type= 'JournalsForMessage' and container_id = #{@user.id}").order('updated_at desc').limit(10).offset(@page * 10)
         when "current_user"
           @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
         else
-          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
       end
     else
-      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
+      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
     end
     # @user_activities = paginateHelper @user_activities,500
     @type = params[:type]

app/controllers/words_controller.rb

@@ -76,7 +76,8 @@ class WordsController < ApplicationController
       #   render 'test/index'
       # }
       format.js {
-        @user_activity_id = params[:user_activity_id] if
+        @reply_type = params[:reply_type]
+        @user_activity_id = params[:user_activity_id]
         @activity = JournalsForMessage.find(parent_id)
       }
     end

app/helpers/application_helper.rb

@@ -2349,22 +2349,25 @@ module ApplicationHelper
 
   #根据传入作业确定显示为编辑作品还是新建作品,或者显示作品数量
   def user_for_homework_common homework,is_teacher
-    if is_teacher #老师显示作品数量
+    if User.current.member_of_course?(homework.course)
-      link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+      if is_teacher #老师显示作品数量
-    else #学生显示提交作品、修改作品等按钮
+        link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
-      work = cur_user_works_for_homework homework
+      else #学生显示提交作品、修改作品等按钮
-      if work.nil?
+        work = cur_user_works_for_homework homework
-        link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+        if work.nil?
-      else
+          link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
-        if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "作品已交",  "javascript:void(0)", :class => 'c_blue', :title => "开启匿评后不可修改作品"
-        elsif homework.homework_type == 2 #编程作业不能修改作品
-          link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else
-          link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+          if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
+            link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
+          elsif homework.homework_type == 2 #编程作业不能修改作品
+            link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          else
+            link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+          end
         end
       end
     end
+
   end
 
   def student_anonymous_comment homework

app/models/journals_for_message.rb

@@ -56,6 +56,7 @@ class JournalsForMessage < ActiveRecord::Base
   acts_as_attachable
 
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  has_many :principal_acts, :class_name => 'PrincipalActivity',:as =>:principal_act ,:dependent => :destroy
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # 消息关联
@@ -63,7 +64,7 @@ class JournalsForMessage < ActiveRecord::Base
   has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message
+  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity
   after_create :reset_counters!
   after_destroy :reset_counters!
   after_save :be_user_score
@@ -133,6 +134,15 @@ class JournalsForMessage < ActiveRecord::Base
     end
   end
 
+  #用户动态公共表记录
+  def act_as_principal_activity
+    if self.jour_type == 'Principal'
+      unless self.user_id == self.jour.id &&  self.user_id != self.reply_id && self.reply_id != 0
+        self.principal_acts << PrincipalActivity.new(:user_id => self.user_id, :principal_id => self.jour_id)
+      end
+    end
+  end
+
   def reset_counters!
     self.class.reset_counters!(self)
   end

app/models/principal_activity.rb

@@ -0,0 +1,34 @@
+class PrincipalActivity < ActiveRecord::Base
+  attr_accessible :principal_act_id, :principal_act_type, :principal_id, :user_id
+  #虚拟关联
+  belongs_to :principal_act ,:polymorphic => true
+  belongs_to :user
+  validates :user_id,presence: true
+  validates :principal_id,presence: true
+  validates :principal_act_id,presence: true
+  validates :principal_act_type, presence: true
+  has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
+  after_save :add_user_activity
+  before_destroy :destroy_user_activity
+
+  #在个人动态里面增加当前动态
+  def add_user_activity
+    user_activity = UserActivity.where("act_type = '#{self.principal_act_type.to_s}' and act_id = '#{self.principal_act_id}'").first
+    if user_activity
+      user_activity.save
+    else
+      user_activity = UserActivity.new
+      user_activity.act_id = self.principal_act_id
+      user_activity.act_type = self.principal_act_type
+      user_activity.container_type = "Principal"
+      user_activity.container_id = self.principal_id
+      user_activity.user_id = self.user_id
+      user_activity.save
+    end
+  end
+
+  def destroy_user_activity
+    user_activity = UserActivity.where("act_type = '#{self.principal_act_type.to_s}' and act_id = '#{self.principal_act_id}'")
+    user_activity.destroy_all
+  end
+end

app/models/project.rb

@@ -91,8 +91,10 @@ class Project < ActiveRecord::Base
                             
   has_many :tags, :through => :project_tags, :class_name => 'Tag'
   has_many :project_tags, :class_name => 'ProjectTags'
+  # 动态级联删除
+  has_many :forge_activities, :class_name => 'ForgeActivity', :dependent => :destroy
   # 关联虚拟表
-    has_many :forge_messages, :class_name =>'ForgeMessage', :as => :forge_message, :dependent => :destroy
+  has_many :forge_messages, :class_name =>'ForgeMessage', :as => :forge_message, :dependent => :destroy
 
   belongs_to :organization
 

app/models/school.rb

@@ -1,5 +1,5 @@
 class School < ActiveRecord::Base
-  attr_accessible :name, :province
+  attr_accessible :name, :province,:pinyin
   has_many :courses
 
   def to_s

app/models/user.rb

@@ -114,6 +114,7 @@ class User < Principal
   has_many :students_for_courses
   #has_many :courses, :through => :students_for_courses, :source => :project
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  has_many :principal_acts, :class_name => 'PrincipalActivity',:as =>:principal_act ,:dependent => :destroy
   has_many :file_commit, :class_name => 'Attachment', :foreign_key => 'author_id', :conditions => "container_type = 'Project' or container_type = 'Version'"
 ####
 # added by bai
@@ -211,7 +212,7 @@ class User < Principal
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy
   # added by fq
-  after_create :act_as_activity, :add_onclick_time
+  after_create :act_as_activity, :add_onclick_time, :act_as_principal_activity
   # end
   # 更新邮箱用户或用户名的同事，同步更新邀请信息
   after_update :update_invite_list
@@ -1006,6 +1007,11 @@ class User < Principal
     self.acts << Activity.new(:user_id => self.id)
   end
 
+  #用户动态公共表记录
+  def act_as_principal_activity
+    self.principal_acts << PrincipalActivity.new(:user_id => self.id,:principal_id => self.id)
+  end
+
   # 注册用户的时候消息默认点击时间为用户创建时间
   def add_onclick_time
     if OnclickTime.where("user_id =?" , self.id).first.nil?

app/views/attachments/_form_course.html.erb

@@ -42,7 +42,9 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
 <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-<%= button_tag "#{l(:button_browse)}", :type=>"button", :onclick=>"file#{container.id}.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+<%#= button_tag "#{l(:button_browse)}", :type=>"button", :onclick=>"file#{container.id}.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+<% id ="file#{container.id}"%>
+<a href="javascript:void(0);" class="AnnexBtn fl" style= "<%= ie8? ? 'display:none' : ''%>" onclick="$('#'+'<%= id %>').click();">上传附件</a>
 <%= file_field_tag 'attachments[dummy][file]',
       :id => "file#{container.id}",
       :class => 'file_selector',
@@ -63,7 +65,7 @@
   <% if container.nil? %>
     <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
  <% end %>
-(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+<!--(<%#= l(:label_max_size) %>: <%#= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)-->
 </span>
 
 <% content_for :header_tags do %>

app/views/boards/_course_message_edit.html.erb

@@ -0,0 +1,16 @@
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+        $("#message_subject").focus();
+    });
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      编辑帖子
+    </div>
+  </div>
+  <%= render :partial => 'boards/course_new',
+             :locals => {:f => f, :edit_mode => edit_mode, :topic => topic} %>
+</div>

app/views/boards/_course_new.html.erb

@@ -1,12 +1,67 @@
-<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'}, :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= error_messages_for 'message' %>
+<div class="resources mt10">
+  <div id="new_course_topic">
+    <div class="homepagePostBrief c_grey">
+      <div>
+        <input  type="text" name="message[subject]" id="message_subject" class="InputBox  w704" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布帖子，请先输入帖子标题" value="<%= topic.subject%>" >
+        <p id="subjectmsg"></p>
+      </div>
+      <div id="topic_editor" style="display: none;">
+        <div class="mt10">
+          <%= f.check_box :sticky, :value => topic.sticky%>
+          <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+          <%= f.check_box :locked, :value => topic.locked%>
+          <%= label_tag 'message_locked', l(:label_board_locked) %>
+          <div class="cl"></div>
+        </div>
+        <div class="mt10">
+          <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
 
-    <%= render :partial => 'form_course', :locals => {:f => f,  :topic => @message} %>
+          <%= f.kindeditor :content, :editor_id => 'message_content_editor',
-    <li>
+                           :owner_id => topic.nil? ? 0: topic.id,
+                           :owner_type => OwnerTypeHelper::MESSAGE,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'message_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 }%>
+          <div class="cl"></div>
+          <p id="message_content_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%= render :partial => 'attachments/form_course', :locals => {:container => topic, :isReply => @isReply} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <%if !edit_mode %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_topic();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <a href="javascript:void(0);" class="fr mr10 mt3" onclick="reset_topic();">取消</a>
+          <% else %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_topic();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <%= link_to "取消",board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "fr mr10 mt3"%>
+        <% end %>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <%#= render :partial => 'course_new_topic', :locals => {:f => f,  :topic => @message} %>
+    <!--<li>
       <div class="ml55 fl" nhname="toolbar_container"></div>
-      <a href="javascript:void(0);"  nhname="cancelbtn" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
+      <a href="javascript:void(0);"  nhname="cancelbtn" class="grey_btn fr ml10"><%#= l(:button_cancel) %></a>
       <a href="javascript:void(0);" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px">
-        <%= l(:button_submit)%>
+        <%#= l(:button_submit)%>
       </a>
       <div class="cl"></div>
-    </li>
+    </li>-->
-<% end %>
+  </div>
+</div>

app/views/boards/_project_show.html.erb

@@ -51,9 +51,9 @@
                            :data => {:confirm => l(:text_are_you_sure)},
                            :class => 'talk_edit fr',
                            :style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %>
-                <%# if topic.sticky? %>
+                <% if topic.sticky? %>
-                  <!--<a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%#= l(:label_board_sticky)%></a>-->
+                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
-                <%# end %>
+                <% end %>
                 <script>
                     //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
                     //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
@@ -209,11 +209,11 @@
             btn.click(function(){
                 if($(this).data('init')=='0'){
                     $(this).data('init',1);
-                    $(this).html('收起回复('+$(this).data('count')+')');
+                    $(this).html('收起回复');
                     target.show();
                 }else{
                     $(this).data('init',0);
-                    $(this).html('展开回复('+$(this).data('count')+')');
+                    $(this).html('展开回复'+$(this).data('count')+')');
                     target.hide();
                     target.eq(0).show();
                     target.eq(1).show();

app/views/boards/show.html.erb

@@ -30,11 +30,13 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
 
-<% if @project %>
+
+
+  <% if @project %>
     <%= render :partial => 'project_show', locals: {project: @project} %>
-<% elsif @course %>
+  <% elsif @course %>
-    <%= render :partial => 'course_show', locals: {course: @course} %>
+      <%= render :partial => 'course_show', :locals => {:topics => @topics, :page => 0, :course => @course} %>
-<% end %>
+    <% end %>
 
 
 <script type="text/javascript">//侧导航

app/views/boards/show.js.erb

@@ -0,0 +1 @@
+$("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/course_show',:locals => {:topics => @topics, :page => @page} )%>");

app/views/courses/_course_activity.html.erb

@@ -56,14 +56,15 @@
                 var btn = $(btnid);
                 if (btn.data('init') == '0') {
                     btn.data('init', 1);
-                    btn.html('收起回复(' + btn.data('count') + ')');
+                    btn.html('收起回复');
                     target.show();
                 } else {
                     btn.data('init', 0);
-                    btn.html('展开更多(' + btn.data('count') + ')');
+                    btn.html('展开更多');
                     target.hide();
                     target.eq(0).show();
                     target.eq(1).show();
+                    target.eq(2).show();
                 }
             }
 
@@ -73,25 +74,7 @@
 
             $(function () {
                 init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
-                var description_images=$("div#activity_description_<%= activity.id %>").find("img");
+                showNormalImage('activity_description_<%= activity.id %>');
-                if (description_images.length>0) {
-                    for (var i=0; i<description_images.length; i++){
-                        var image=$(description_images[i]);
-                        var element=$("<a></a>").attr("href",image.attr('src'));
-                        image.wrap(element);
-                    }
-                }
-                $('#activity_description_<%= activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
-
-                var reply_images=$("div#reply_content_<%= activity.id %>").find("img");
-                if (reply_images.length>0) {
-                    for (var i=0; i<reply_images.length; i++){
-                        var image=$(reply_images[i]);
-                        var element=$("<a></a>").attr("href",image.attr('src'));
-                        image.wrap(element);
-                    }
-                }
-                $('#reply_content_<%= activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
             });
         </script>
             <% if activity && activity.course_act%>

app/views/homework_common/index.html.erb

@@ -1,4 +1,4 @@
-<script type="text/javascript">
+  <script type="text/javascript">
     function reset_homework(){
         $("#homework_name").val("");
         $("#homework_end_time").val("");

app/views/issues/index.html.erb

@@ -47,7 +47,7 @@
       <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project},:remote=>'true', :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
           <%= hidden_field_tag 'set_filter', '1' %>
           <div class="problem_search" >
-            <input class="problem_search_input fl" id="v_subject" type="text" name="subject" value="<%= @subject ? @subject : ""%>" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
+            <input class="problem_search_input fl" id="v_subject" type="text" name="subject" placeholder="请输入问题名称" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
             <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
             <a href="javascript:void(0)" class="grey_btn fl ml10" onclick="nh_reset_form();" >清空</a>
           </div><!--problem_search end-->

app/views/layouts/base_courses.html.erb

@@ -108,7 +108,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "+#{l(:label_message_new)}",course_boards_path(@course, :flag => true),:class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
+          <%= link_to( "+#{l(:label_message_new)}",course_boards_path(@course, :flag => true, :is_new => 1),:class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %>