Merge branch 'szzh' into develop

.gitignore

@@ -5,7 +5,7 @@
 *.swp
 /config/database.yml
 /config/configuration.yml
-/config/additional_environment.rb
+
 /files/*
 /log/*
 /public/tmp/*

Gemfile

@@ -28,7 +28,7 @@ gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
 gem 'rails_kindeditor',path:'lib/rails_kindeditor'
-gem "rmagick", ">= 2.0.0"
+#gem "rmagick", ">= 2.0.0"
 
 group :development do
   gem 'grape-swagger'

app/api/mobile/apis/comments.rb

@@ -91,6 +91,7 @@ module Mobile
         desc '课程留言列表'
         params do
           optional :token, type: String
+          optional :page,type:Integer,desc:'页数'
         end
         get ':id/course_message' do
           cs = CommentService.new
@@ -99,6 +100,19 @@ module Mobile
           present :status, 0
         end
 
+        desc '留言详情'
+        params do
+          requires :token, type: String
+          requires :comment_parent_id,type:Integer,desc:'留言id'
+          optional :course_id,type:Integer,desc:'课程id'
+        end
+        get ':comment_parent_id/comment_details' do
+          cs = CommentService.new
+          jour = cs.comment_detail params,current_user
+          present :data, jour, with: Mobile::Entities::Jours
+          present :status, 0
+        end
+
       end
     end
   end

app/api/mobile/apis/users.rb

@@ -115,6 +115,8 @@ module Mobile
           requires :ref_user_id,type:Integer,desc:'被回复的用户id'
           requires :parent_id,type:Integer,desc:'留言父id'
           requires :ref_message_id,type:Integer,desc:'引用消息id'
+          optional :type,type:Integer,desc:'回复类型'
+          optional :course_id,type:Integer,desc:'课程id'
         end
         post ':user_id/reply_message' do
           us = UsersService.new
@@ -133,6 +135,18 @@ module Mobile
           us.leave_message params,current_user
           present :data,0
         end
+
+        desc "与我相关"
+        params do
+          requires :token, type: String
+          requires :page,type:Integer,desc:'页码'
+        end
+        get ':user_id/all_my_dynamic' do
+          us = UsersService.new
+          my_jours = us.reply_my_messages params,current_user
+          present :data,my_jours,with:Mobile::Entities::Jours
+          present :status,0
+        end
       end
     end
   end

app/api/mobile/entities/jours.rb

@@ -14,6 +14,11 @@ module Mobile
             else
               f.send(field)
             end
+          else
+            case f
+              when :course_name
+                f[:jour_type] == "Course" ? f.course.name : ""
+            end
           end
         end
       end
@@ -27,6 +32,11 @@ module Mobile
       jours_expose :notes
       jours_expose :m_reply_id
       jours_expose :m_parent_id
+      expose :course,using:Mobile::Entities::Course do |f,opt|
+        if f.is_a?(::JournalsForMessage) && f[:jour_type] == "Course"
+          f.course
+        end
+      end
       expose :reply_user,using: Mobile::Entities::User do |f, opt|
         f.at_user
       end

app/controllers/boards_controller.rb

@@ -80,19 +80,19 @@ class BoardsController < ApplicationController
         if @project
           @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
           @topics =  @board.topics.
-              reorder("#{Message.table_name}.sticky DESC").
+              reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
               includes(:last_reply).
               limit(@topic_pages.per_page).
               offset(@topic_pages.offset).
-              order("last_replies_messages.created_on desc").
+
               preload(:author, {:last_reply => :author}).
               all
         elsif @course
-          board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC").
+          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).
-              order("last_replies_messages.created_on desc").
+
               preload(:author, {:last_reply => :author}).
               all : []
           @topics = paginateHelper board_topics,10

app/controllers/messages_controller.rb

@@ -193,7 +193,7 @@ class MessagesController < ApplicationController
       else
         redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id))
       end
-    elsif request.get?
+    elsif request.get? || request.post?
       if params[:is_board]
         if @project
           redirect_to project_boards_path(@project)

app/controllers/projects_controller.rb

@@ -243,14 +243,7 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-    # params[:login]为邮箱邀请用户加入，主要功能：
-    # 1、自动注册
-    # 2、加入项目、创建角色
-    # 3、用户得分
-    if params[:mail]
-      Member.create(:role_ids => [4], :user_id => params[:user],:project_id => params[:id])
-      UserGrade.create(:user_id =>params[:user], :project_id => params[:id])
-    end
+
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
@@ -399,6 +392,26 @@ class ProjectsController < ApplicationController
   # by young
   # include CoursesHelper
   def member
+    # params[:login]为邮箱邀请用户加入，主要功能：
+    # 1、自动注册
+    # 2、加入项目、创建角色
+    # 3、用户得分
+    if params[:mail]
+      user = User.find(params[:user_id])
+      user.activate!
+      Member.create(:role_ids => [4], :user_id => params[:user_id],:project_id => params[:id])
+      UserGrade.create(:user_id => params[:user_id], :project_id => params[:id])
+      token = Token.get_token_from_user(user, 'autologin')
+      #user = User.try_to_autologin(token.value)
+      if user
+        start_user_session(user)
+        user.save
+        redirect_to project_member_path(params[:id])
+        return
+        # account_ project_member_path(params[:id])
+        flash[:notice] = l(:label_mail_invite_success)
+      end
+    end
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'project_member_list'
     # 判断是否课程

app/controllers/welcome_controller.rb

@@ -16,74 +16,77 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
+  # layout "base_welcome"
   include ApplicationHelper
   include WelcomeHelper
   helper :project_score
-  caches_action :robots
+  caches_action :robots, :course, :contest,  expires_in: 2.hours, layout: false
   #before_filter :find_first_page, :only => [:index]
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  
   def index
     # 企业版定制: params[:project]为传过来的参数
-    unless params[:organization].nil?
-      @organization = Organization.find params[:organization]
-      # @organization_projects = Project.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", @organization.id).order("score DESC").limit(10).all
-      @organization_projects = @organization.projects.visible.joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").order("project_scores.score DESC").limit(10).all
-      @part_projects = @organization_projects.count < 9 ? find_miracle_project( 9 - @organization_projects.count, 3,"score desc") : []
-      # @cur_projects = Project.find(params[:organization])
-      # @organization = @cur_projects.enterprise_name
-      # @organization_projects = (current_user.admin? || User.current.member_of?(@cur_projects)) ? Project.where("enterprise_name =? ", @organization) : Project.all_public.where("enterprise_name =? ", @organization)
-      # @e_count = @organization_projects.count
-      # @part_projects = []
-      # # 取十个
-      # @organization_projects.each do |obj|
-      #   break if(@organization_projects[10] == obj)
-      #   @part_projects << Project.visible.find_by_id("#{obj.id}") unless obj.id.nil?
-      # end
-      # # 不够十个的用最火项目替代
-      # @e_count < 9 ? @part_projects = find_miracle_project( 9 - @e_count, 3,"score desc") : @part_projects
-      # # 配置文件首页定制
-      @enterprise_page = FirstPage.find_by_page_type('enterprise')
-      if @enterprise_page.nil?
-        @enterprise_page = FirstPage.new
-        @enterprise_page.page_type = 'enterprise'
+
+      unless params[:organization].nil?
+        @organization = Organization.find params[:organization]
+        # @organization_projects = Project.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", @organization.id).order("score DESC").limit(10).all
+        @organization_projects = @organization.projects.visible.joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").order("project_scores.score DESC").limit(10).all
+        @part_projects = @organization_projects.count < 9 ? find_miracle_project( 9 - @organization_projects.count, 3,"score desc") : []
+        # @cur_projects = Project.find(params[:organization])
+        # @organization = @cur_projects.enterprise_name
+        # @organization_projects = (current_user.admin? || User.current.member_of?(@cur_projects)) ? Project.where("enterprise_name =? ", @organization) : Project.all_public.where("enterprise_name =? ", @organization)
+        # @e_count = @organization_projects.count
+        # @part_projects = []
+        # # 取十个
+        # @organization_projects.each do |obj|
+        #   break if(@organization_projects[10] == obj)
+        #   @part_projects << Project.visible.find_by_id("#{obj.id}") unless obj.id.nil?
+        # end
+        # # 不够十个的用最火项目替代
+        # @e_count < 9 ? @part_projects = find_miracle_project( 9 - @e_count, 3,"score desc") : @part_projects
+        # # 配置文件首页定制
+        @enterprise_page = FirstPage.find_by_page_type('enterprise')
+        if @enterprise_page.nil?
+          @enterprise_page = FirstPage.new
+          @enterprise_page.page_type = 'enterprise'
+        end
+        # 主页配置部分结束
       end
-      # 主页配置部分结束
-    end
-    # end 企业版定制结束
+      # end 企业版定制结束
 
-    if @first_page.nil? ||  @first_page.sort_type.nil?
-      @projects = find_miracle_project(10, 3,"score desc")
-    else
-      case @first_page.sort_type
-        when 0
-          @my_projects = find_my_projects
-          @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
-          @projects = find_miracle_project(10, 3,"created_on desc")
-          #@projects =  @projects_all.order("created_on desc")
-        when 1
-          @my_projects = find_my_projects
-          @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
-          @projects = find_miracle_project(10, 3,"score desc")
-          #@projects = @projects_all.order("grade desc")
-        when 2
-          @my_projects = find_my_projects
-          @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
-          @projects = find_miracle_project(10, 3,"watchers_count desc")
-          #@projects = @projects_all.order("watchers_count desc")
+      if @first_page.nil? ||  @first_page.sort_type.nil?
+        @projects = find_miracle_project(10, 3,"score desc")
+      else
+        case @first_page.sort_type
+          when 0
+            @my_projects = find_my_projects
+            @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
+            @projects = find_miracle_project(10, 3,"created_on desc")
+            #@projects =  @projects_all.order("created_on desc")
+          when 1
+            @my_projects = find_my_projects
+            @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
+            @projects = find_miracle_project(10, 3,"score desc")
+            #@projects = @projects_all.order("grade desc")
+          when 2
+            @my_projects = find_my_projects
+            @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
+            @projects = find_miracle_project(10, 3,"watchers_count desc")
+            #@projects = @projects_all.order("watchers_count desc")
 
-        #gcm
-        #when '3'
-        #@projects=desc_sort_course_by_avtivity(@project_activity_count_array,@project_all_array)
-        #  @projects=handle_project @projects_all,@project_activity_count
-        #  @s_type = 3
-        #  @projects =  @projects[@project_pages.offset, @project_pages.per_page]
+          #gcm
+          #when '3'
+          #@projects=desc_sort_course_by_avtivity(@project_activity_count_array,@project_all_array)
+          #  @projects=handle_project @projects_all,@project_activity_count
+          #  @s_type = 3
+          #  @projects =  @projects[@project_pages.offset, @project_pages.per_page]
 
-        else
-          @projects = @projects_all.order("score desc")
+          else
+            @projects = @projects_all.order("score desc")
+        end
       end
-    end
+
   rescue Exception => e
     render_404
   end

app/models/invite_list.rb

@@ -0,0 +1,5 @@
+class InviteList < ActiveRecord::Base
+  attr_accessible :project_id, :user_id
+  # belongs_to :user
+  # belongs_to :project
+end

app/models/mailer.rb

@@ -60,8 +60,8 @@ class Mailer < ActionMailer::Base
     user = us.register_auto(login, @email, @password)
     User.current = user unless User.current.nil?
     @user = user
-    @token = Token.get_token_from_user(user, 'autologin')
-    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :user => user.id, :mail => true, :token => @token.value)
+
+    @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true)
     mail :to => email, :subject => @subject
   end
 
@@ -72,8 +72,9 @@ class Mailer < ActionMailer::Base
     @invitor_name = "#{invitor.name}"
     @project_name = "#{project.name}"
     @user = user
+    @project = project
     @token = Token.get_token_from_user(user, 'autologin')
-    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :user => user.id, :mail => true, :token => @token.value)
+    @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true, :token => @token.value)
     mail :to => email, :subject => @subject
   end
 

app/models/project.rb

@@ -67,7 +67,7 @@ class Project < ActiveRecord::Base
   has_many :student, :through => :students_for_courses, :source => :user
   has_one :course_extra, :class_name => 'Course', :foreign_key => :extra,:primary_key => :identifier, :dependent => :destroy
   has_many :applied_projects
-
+  # has_many :invite_lists
 
   # end
   #ADDED BY NIE

app/models/user.rb

@@ -125,6 +125,10 @@ class User < Principal
   has_many :documents # 项目中关联的文档再次与人关联
 # end
 
+  # 邮件邀请状态
+  # has_many :invite_lists
+  # end
+
 ######added by nie
   has_many :project_infos, :dependent => :destroy
   has_one :user_status, :dependent => :destroy

app/services/comment_service.rb

@@ -94,11 +94,24 @@ class CommentService
   def course_messages params,current_user
     @course = ::Course.find(params[:id])
     if (current_user.admin? || @course.is_public == 1 || (@course.is_public == 0 && current_user.member_of_course?(@course)))
-      @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+      @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC').page(params[:page] ||= 1).per(10)
     else
       raise '403'
     end
     @jours
   end
 
+  def comment_detail params,current_user
+    if !params[:course_id].nil? && params[:course_id] != 0
+      course = Course.find(params[:course_id])
+      jour = course.journals_for_messages.where("id = ?  ",params[:comment_parent_id])
+      jour
+    else
+     jour1 = JournalsForMessage.where("id = ?  ",params[:comment_parent_id])
+     jour1
+    end
+  end
+
+
+
 end

app/services/users_service.rb

@@ -62,7 +62,7 @@ class UsersService
     else
       @user.password = ""
     end
-    @user = automatically_register(@user)
+    @user = automatically_register_lock(@user)
     if @user.id != nil
       ue = @user.user_extensions ||= UserExtensions.new
       ue.user_id = @user.id
@@ -169,19 +169,26 @@ class UsersService
   # 回复用户
   def reply_user_messages params,current_user
     user = User.find(params[:user_id])
-    parent_id = params[:parent_id]
+
+    m_parent_id = params[:parent_id]
     author_id = current_user.id
-    reply_user_id = params[:ref_user_id]
-    reply_id = params[:ref_message_id]
+    reply_id = params[:ref_user_id]
+    ref_message_id = params[:ref_message_id]
     content = params[:content]
-    options = {:user_id => author_id,
+    options = {:user_id => author_id,  # 作者id
                :status => true,
-               :m_parent_id => parent_id,
-               :m_reply_id => reply_id,
-               :reply_id => reply_user_id,
+               :m_parent_id => m_parent_id,# 父留言id
+               :m_reply_id => ref_message_id,  # 子留言 id
+               :reply_id => reply_id, # 被留言用户id
                :notes => content,
                :is_readed => false}
-    user.add_jour(nil, nil,nil,options)
+    if(params[:type] == 1)
+        user.add_jour(nil, nil,nil,options)
+    elsif(params[:type] == 2)
+        Course.find(params[:course_id]).journals_for_messages.build(options).save! unless params[:course_id].nil?
+    else
+    end
+
   end
 
   # 给用户留言
@@ -258,4 +265,42 @@ class UsersService
     scope
   end
 
+  # 课程留言中与我相关的回复
+  def my_course_messages params,current_user
+    #找到我所有的课程
+    @user = current_user
+    if !current_user.admin? && !@user.active?
+      raise '404'
+      return
+    end
+    if current_user == @user || current_user.admin?
+      membership = @user.coursememberships.all
+    end
+    # membership.sort! {|older, newer| newer.created_on <=> older.created_on }
+    message_list = []
+    membership.each do |mp|
+      #课程轮询找到与我相关的回复
+      message_list << mp.course.journals_for_messages.where("reply_id = ?",current_user.id)
+    end
+    message_list
+  end
+
+  # 获取与我相关的留言：我的留言，回复我的留言
+  def my_personal_messages params,current_user
+    jours = current_user.journals_for_messages.where('m_parent_id is null or reply_id = ?',current_user.id)
+    jours.update_all(:is_readed => true, :status => false)
+    jours
+  end
+
+  # 所有的与我相关
+  def reply_my_messages params,current_user
+    jours = my_personal_messages params,current_user
+    jours1 = my_course_messages params,current_user
+    my_jours = []
+    my_jours << jours << jours1
+    my_jours.flatten!.sort! {|older, newer| newer.created_on <=> older.created_on }
+    my_jours_arr = Kaminari.paginate_array(my_jours, total_count: my_jours.count).page(params[:page] || 1).per(10)
+    my_jours_arr
+  end
+
 end

app/views/boards/_course_new.html.erb

@@ -2,8 +2,10 @@
 
     <%= render :partial => 'form_course', :locals => {:f => f,  :topic => @message} %>
     <li>
-      <a href="javascript:void(0)"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
-      <a href="#" onclick="submitProjectsBoard('<%= @message.id %>')" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <a href="javascript:void(0);"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
+      <a href="javascript:void(0);" name="submitbtn" class="blue_btn fr " style="margin-left: 55px">
+        <%= l(:button_submit)%>
+      </a>
       <div class="cl"></div>
     </li>
 <% end %>

app/views/boards/_edit.html.erb

@@ -6,14 +6,14 @@
         <ul>
             <%= form_for topic, { :as => :message,
                              :url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id},
-                             :html => {:multipart => true,
+                             :html => {:multipart => true, :name=>'message-form',
                              :id => 'message-form' + topic.id.to_s,
-                             :method => :post}
+                             :method => :post,:nhname=>'form'}
                            } do |f| %>
             <%= render :partial => 'form_project',
                      :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
-            <a href="javascript:void(0)" onclick="submitProjectsBoard('<%= topic.id%>');" class="blue_btn fl c_white" ><%= l(:button_submit)%></a>
-              <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" class="blue_btn grey_btn fl c_white"><%= l(:button_cancel) %></a>
+            <a href="javascript:void(0)" nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
+            <a href="javascript:void(0)" nhname='submitbtn' class="blue_btn fr c_white" ><%= l(:button_submit)%></a>
           <%#= link_to l(:button_cancel), board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "blue_btn grey_btn fl c_white"  %>
         </ul>
       </div>
@@ -25,14 +25,14 @@
           <%= form_for topic, {
                                        :as => :message,
                                        :url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id},
-                                       :html => {:multipart => true,
+                                       :html => {:multipart => true, :name=>'message-form',
                                                  :id => 'message-form' + topic.id.to_s,
-                                                 :method => :post}
+                                                 :method => :post,:nhname=>'form'}
                                } do |f| %>
               <%= render :partial => 'form_course',
                          :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
-              <a href="javascript:void(0)" onclick="submitProjectsBoard('<%= topic.id%>');"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
-              <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" class="blue_btn grey_btn fl c_white"><%= l(:button_cancel) %></a>
+              <a href="javascript:void(0)"  nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
+              <a href="javascript:void(0)"  nhname='submitbtn' class="blue_btn fr c_white"><%= l(:button_submit)%></a>
 
         <% end %>
         </ul>

app/views/boards/_form_course.html.erb

@@ -5,17 +5,17 @@
     <li style="display: none">
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585", :aa=>"subject" }.merge(extra_option) %>
 
 
-      <p id="subject_span<%= topic.id%>" class="ml55"></p>
+      <p id="subject_span<%= f.object.id%>" class="ml55"></p>
     </li>
 <% else %>
-    <li>
+    <li >
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585", :aa=>"subject" }.merge(extra_option) %>
 
       <p id="subject_span<%= f.object.id%>" class="ml55"></p>
     </li>
@@ -39,13 +39,36 @@
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
   <%= text_area :quote,:quote,:style => 'display:none' %>
-  <% if replying%>
-      <%= f.text_area :content, :class => 'talk_text fl', :id => "message_content#{f.object.id}", :onkeyup => "regexContent('#{f.object.id}');", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)", :style=>"width: 575px;" %>
-  <% else %>
-      <%= f.text_area :content, :class => 'talk_text fl', :id => "message_content#{f.object.id}", :onkeyup => "regexContent('#{f.object.id}');", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
-  <% end %>
+  <div class="content">
+    <% if replying%>
+
+        <%= f.text_area :content,
+                        :width => '89%',
+                        :height => 300,
+                        :id => "message_content#{f.object.id}",
+                        :aa => 'content',
+                        :onkeyup => "regexContent('#{f.object.id}');",
+                        :class => 'talk_text fl',
+                        :placeholder => "最多3000个汉字(或6000个英文字符)",
+                        :maxlength => 5000 %>
+
+    <% else %>
+        <%= f.text_area :content,
+                        :width => '90%',
+                        :height => 300,
+                        :class => 'talk_text fl',
+                        :editor_id => "message_content#{f.object.id}_edit",
+                        :id => "message_content#{f.object.id}",
+                        :onkeyup => "regexContent('#{f.object.id}');",
+                        :class => 'talk_text fl',
+                        :aa => 'content',
+                        :placeholder => "最多3000个汉字(或6000个英文字符)",
+                        :maxlength => 5000 %>
+
+    <% end %>
+  </div>
   <div class="cl"></div>
-  <p id="message_content_span<%= f.object.id%>"  class="ml55"></p>
+  <p id="message_content_span<%= f.object.id%>"  aa="message_show"  class="ml55"></p>
 </li>
 <div class="cl"></div>
 <li>

app/views/boards/_form_project.html.erb

@@ -1,3 +1,16 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
+<style>
+    .comment{
+        position: relative;
+        width: 330px;
+        padding: 10px;
+    }
+    .comment .ke-toolbar{
+        position: absolute;
+        bottom: -18px;
+    }
+
+</style>
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
 <% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
@@ -5,19 +18,19 @@
 <li style="display: none">
   <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}",:class=>"talk_input w585" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}",:class=>"talk_input w585", :nhname=>'inputsubject' }.merge(extra_option) %>
 
 
-  <p id="subject_span<%= f.object.id%>" class="ml55"></p>
+  <p nhname="subjectmsg" class="ml55"></p>
 </li>
 <% else %>
     <li>
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", :class=>"talk_input w585", :nhname=>'inputsubject' }.merge(extra_option) %>
 
-      <p id="subject_span<%= f.object.id%>" class="ml55"></p>
+      <p nhname="subjectmsg" class="ml55"></p>
     </li>
 <% end %>
 <li class="ml60 mb5">
@@ -39,13 +52,36 @@
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
   <%= text_area :quote,:quote,:style => 'display:none' %>
+  <div class="content">
   <% if replying%>
-      <%= f.text_area :content, :class => 'talk_text fl', :id => "message_content#{f.object.id}", :onkeyup => "regexContent('#{f.object.id}');", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)", :style=>"width: 575px;" %>
+
+      <%= f.text_area :content,
+                       :width => '89%',
+                       :height => 300,
+                        :id => "message_content#{f.object.id}",
+                                        :nhname => 'textarea',
+                                        :onkeyup => "regexContent('#{f.object.id}');",
+                                        :class => 'talk_text fl',
+                                        :placeholder => "最多3000个汉字(或6000个英文字符)",
+                                        :maxlength => 5000 %>
+
   <% else %>
-      <%= f.text_area :content, :class => 'talk_text fl', :id => "message_content#{f.object.id}", :onkeyup => "regexContent('#{f.object.id}');", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
+      <%= f.text_area :content,
+                       :width => '90%',
+                       :height => 300,
+                       :class => 'talk_text fl',
+                       :editor_id => "message_content#{f.object.id}_edit",
+                        :id => "message_content#{f.object.id}",
+                                        :onkeyup => "regexContent('#{f.object.id}');",
+                                        :class => 'talk_text fl',
+                                        :nhname => 'textarea',
+                                        :placeholder => "最多3000个汉字(或6000个英文字符)",
+                                        :maxlength => 5000 %>
+
   <% end %>
+  </div>
   <div class="cl"></div>
-  <p id="message_content_span<%= f.object.id%>"  class="ml55"></p>
+  <p nhname="contentmsg" class="ml55"></p>
 </li>
 <div class="cl"></div>
 <li>

app/views/boards/_project_new_topic.html.erb

@@ -1,10 +1,10 @@
-<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},:nhname=>'form', :html => {:multipart => true, :id => 'message-form', :name=>'message-form'} do |f| %>
 
     <%= render :partial => 'form_project', :locals => {:f => f,  :topic => @message} %>
     <li>
-      <a href="javascript:void(0)"  onclick="show_newtalk();" 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="#" onclick="submitProjectsBoard('<%= @message.id %>')" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
       <div class="cl"></div>
     </li>
 <% end %>

app/views/boards/show.html.erb

@@ -51,16 +51,23 @@ var getParam = function(name){
 function show_newtalk()
 {
     $("#about_newtalk").toggle();
+
+
+
 }
 
 function show_newtalk1(id)
 {
     $(id).toggle();
+    $(id).focus();
+
+
 }
 
 
 
 </script>
+
 <% if @project %>
     <%= render :partial => 'project_show', locals: {project: @project} %>
 <% elsif @course %>

app/views/layouts/_base_feedback.html.erb

@@ -14,7 +14,7 @@
     .close_btn span { display:none;}
     .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
     .msgserver { margin:2px 0px 0px 4px; padding-top: 0px}
-    .msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -115px; padding-left:22px;}
+    .msgserver a { padding-left:4px;}
     .opnionText{ width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;}
     .opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;}
     .opnionButton:hover{background: #0fa9bb; }
@@ -180,7 +180,9 @@ function cookieget(n)
           <% end %>
                 </div>
                 <div class="msgserver">
-                    <a href="http://user.trustie.net/users/34/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
+                    <a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #15BCCF;">
+                      <%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
+                      <iframe name="hiddentab" style="display: none"></iframe>
                 </div>
             </div>
             <div class="side_bottom"></div>

app/views/layouts/_base_header.html.erb

@@ -1,11 +1,13 @@
 <%= render :partial => "layouts/base_feedback" %>
 <div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">
+
 	<div class="welcome_logo">
 		<%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px")%>
 	</div>
 	<div id="account">
 		<%= render_menu :account_menu -%>
 	</div>
+
   <% if User.current.logged? -%>
 	<div id="loggedas">
 	<ul style="padding:0 0; margin:0 0;display:inline;">