Merge remote-tracking branch 'origin/szzh' into szzh

.rspec

@@ -1,2 +1,2 @@
---format documentation
 --color
+--require spec_helper

Gemfile

@@ -28,28 +28,21 @@ gem "rmagick", ">= 2.0.0"
 
 group :development do
   gem 'grape-swagger'
-  #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
-  gem 'puma' if RbConfig::CONFIG['host_os'] =~ /linux/
-  gem 'pry-rails'
-  if RUBY_VERSION >= '2.0.0'
-    gem 'pry-byebug'
-  else
-    # gem 'pry-debugger'
-  end
-  gem 'pry-stack_explorer'
   gem 'better_errors', '~> 1.1.0'
   gem 'rack-mini-profiler', '~> 0.9.3'
 end
 
-group :test do
-  gem "shoulda", "~> 3.5.0"
-  gem "mocha", "~> 1.1.0"
-  gem 'capybara', '~> 2.4.1'
-  gem 'nokogiri', '~> 1.6.3'
-  gem 'factory_girl', '~> 4.4.0'
-  gem 'selenium-webdriver', '~> 2.42.0'
+group :development, :test do 
+  unless RUBY_PLATFORM =~ /w32/
+    gem 'pry-rails'
+    if RUBY_VERSION >= '2.0.0'
+      gem 'pry-byebug'
+    end
+    gem 'pry-stack_explorer'
+  end
 
-  gem "faker"
+  gem 'rspec-rails', '~> 3.0'
+  gem 'factory_girl_rails'
 end
 
 # Gems used only for assets and not required

app/controllers/avatar_controller.rb

@@ -8,23 +8,26 @@ class AvatarController < ApplicationController
     # Make sure that API users get used to set this content type
     # as it won't trigger Rails' automatic parsing of the request body for parameters
     unless request.content_type == 'application/octet-stream'
-      render :nothing => true, :status => 406
-      return
-    end
-
-    unless request.raw_post.nil?
-     @source_type = params[:source_type]
+      @source_type = params[:source_type]
       @source_id = params[:source_id]
-      @temp_file = request.raw_post
-      if @temp_file.size > 0
-        if @temp_file.respond_to?(:original_filename)
-          @image_file = @temp_file.original_filename
-          #image_file.force_encoding("UTF-8") if filename.respond_to?(:force_encoding)
-        else
-          @image_file=params[:filename]
-        end      
+      @temp_file = params[:avatar][:image] 
+      @image_file = @temp_file.original_filename
+    else
+      unless request.raw_post.nil?
+        @source_type = params[:source_type]
+        @source_id = params[:source_id]
+        @temp_file = request.raw_post
+        if @temp_file.size > 0
+          if @temp_file.respond_to?(:original_filename)
+            @image_file = @temp_file.original_filename
+            #image_file.force_encoding("UTF-8") if filename.respond_to?(:force_encoding)
+          else
+            @image_file=params[:filename]
+          end      
+        end
       end
     end
+
     if  @temp_file && (@temp_file.size > 0)
       diskfile=disk_filename(@source_type,@source_id)
       @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
@@ -61,6 +64,10 @@ class AvatarController < ApplicationController
     image.compress(300)
 
     respond_to do |format|
+      format.json{
+        render :inline => "#{@urlfile.to_s}?#{Time.now.to_i}",:content_type => 'text/html'
+        return
+      }
       format.js
       format.api {
         if saved

app/controllers/boards_controller.rb

@@ -80,7 +80,7 @@ class BoardsController < ApplicationController
               includes(:last_reply).
               limit(@topic_pages.per_page).
               offset(@topic_pages.offset).
-              order(sort_clause).
+              order("last_replies_messages.created_on desc").
               preload(:author, {:last_reply => :author}).
               all
         elsif @course
@@ -88,7 +88,7 @@ class BoardsController < ApplicationController
               includes(:last_reply).
               # limit(@topic_pages.per_page).
               # offset(@topic_pages.offset).
-              order(sort_clause).
+              order("last_replies_messages.created_on desc").
               preload(:author, {:last_reply => :author}).
               all : []
           @topics = paginateHelper board_topics,10

app/controllers/courses_controller.rb

@@ -5,6 +5,7 @@ class CoursesController < ApplicationController
   helper :activities
   helper :members
   helper :words
+  helper :attachments
 
   before_filter :auth_login1, :only => [:show, :feedback]
   menu_item :overview

app/controllers/issues_controller.rb

@@ -58,7 +58,7 @@ class IssuesController < ApplicationController
 
   def index
     retrieve_query
-    sort_init(@query.sort_criteria.empty? ? [['updated_on', 'desc']] : @query.sort_criteria)
+    sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
     sort_update(@query.sortable_columns)
     @query.sort_criteria = sort_criteria.to_a
 
@@ -387,7 +387,7 @@ class IssuesController < ApplicationController
   def retrieve_previous_and_next_issue_ids
     retrieve_query_from_session
     if @query
-      sort_init(@query.sort_criteria.empty? ? [['updated_on', 'desc']] : @query.sort_criteria)
+      sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
       sort_update(@query.sortable_columns, 'issues_index_sort')
       limit = 500
       issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])

app/controllers/messages_controller.rb

@@ -194,11 +194,19 @@ class MessagesController < ApplicationController
         redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id))
       end
     elsif request.get?
-      respond_to do |format|
-        format.html {
-          layout_file = @project ? 'base_projects' : 'base_courses'
-          render :layout => layout_file
-        }
+      if params[:is_board]
+        if @project
+          redirect_to project_boards_path(@project)
+        elsif @course
+          redirect_to course_boards_path(@course)
+        end
+      else
+        respond_to do |format|
+          format.html {
+            layout_file = @project ? 'base_projects' : 'base_courses'
+            render :layout => layout_file
+          }
+        end
       end
     end
   end

app/controllers/repositories_controller.rb

@@ -244,12 +244,12 @@ update
 
   def show
     ## TODO: the below will move to filter, done.
-    # if !User.current.member_of?(@project)
-    #   if @project.hidden_repo
-    #     render_403 
-    #     return -1
-    #   end
-    # end
+    if !User.current.member_of?(@project)
+      if @project.hidden_repo
+        render_403
+        return -1
+      end
+    end
     #if( !User.current.member_of?(@project) || @project.hidden_repo)
     @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
 

app/helpers/application_helper.rb

@@ -593,6 +593,17 @@ module ApplicationHelper
     Project.project_tree(projects, &block)
   end
 
+  # 判断当前用户是否为项目管理员
+  def is_project_manager?(user_id,project_id)
+    @result = false
+    mem = Member.where("user_id = ? and project_id = ?",user_id, project_id)
+    unless mem.blank?
+      mem.first.roles.to_s.include?("Manager")
+      @result = false
+    end
+    return @result
+  end
+
   def principals_check_box_tags(name, principals)
     s = ''
     principals.each do |principal|
@@ -1770,8 +1781,7 @@ module ApplicationHelper
 
   def get_memo
     @new_memo = Memo.new
-    #@new_memo.subject = "有什么想说的，尽管来咆哮吧~~"
-    @public_forum = Forum.find(1)
+    @public_forum = Forum.find(1) rescue ActiveRecord::RecordNotFound
   end
 
   #获取用户未过期的课程

app/helpers/repositories_helper.rb

@@ -232,6 +232,18 @@ module RepositoriesHelper
                         :label => l(:label_git_report_last_commit)
                          ))
   end
+
+  # 判断项目是否有主版本库
+  def judge_main_repository(pro)
+    if pro.repositories.blank?
+      return false
+    else
+      pro.repositories.sort.each do |rep|
+        rep.is_default?
+        return true
+      end
+    end
+  end
   # def cvs_field_tags(form, repository)
     # content_tag('p', form.text_field(
                      # :root_url,

app/models/token.rb

@@ -32,6 +32,8 @@ class Token < ActiveRecord::Base
     token = Token.get_token_from_user(user, 'autologin')
     unless token
       token = Token.create(:user => user, :action => 'autologin')
+    else
+      token.update_attribute(:created_on, Time.now)
     end
     token
   end

app/views/attachments/_form.html.erb

@@ -17,6 +17,7 @@
 
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
+    <div class="cl"></div>
   <% end %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
@@ -34,10 +35,12 @@
 
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
+    <div class="cl"></div>
   <% end %>
 <% end %>
 </span>
   <% project = project %>
+  <div class="cl"></div>
   <span class="add_attachment" style="font-weight:normal;">
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->

app/views/attachments/_form_course.html.erb

@@ -56,7 +56,7 @@
         :file_count => l(:label_file_count),
         :delete_all_files => l(:text_are_you_sure_all)
       } %>
-<span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+<span id="upload_file_count<%= container.id %>" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 

app/views/attachments/_form_project.html.erb

@@ -1,26 +1,32 @@
+<% if defined?(container) %>
 <span id="attachments_fields<%= container.id %>" class="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="sub_btn">
+
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
-                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
-      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
       <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
-      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+
+      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+     <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>
   <% else %>
   <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
+
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
-                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
-      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
-      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+          <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+              <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+
+              <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+              <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>
@@ -38,9 +44,9 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
   <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-  <%= button_tag "文件浏览", :type=>"button", :onclick=>"file#{container.id}.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+  <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file#{container.id}.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
   <%= file_field_tag 'attachments[dummy][file]',
-                     :id => "file#{container.id}",
+                     :id => "_file#{container.id}",
                      :class => 'file_selector',
                      :multiple => true,
                      :onchange => "addInputFiles_board(this, '#{container.id}');",
@@ -56,10 +62,73 @@
                              :file_count => l(:label_file_count),
                              :delete_all_files => l(:text_are_you_sure_all)
                      } %>
-  <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+  <span id="upload_file_count<%=container.id %>" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+</span>
+<% else %>
+    <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) && container && container.saved_attachments %>
+  <% if isReply  %>
+  <% container.saved_attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="sub_btn">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
+                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
+  <% else %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
+                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
+  <% end %>
+<% end %>
+</span>
+    <script type='text/javascript'>
+        //    function CompatibleSend()
+        //    {
+        //        var obj=document.getElementById("_file");
+        //        var file= $(obj).clone();
+        //        file.click();
+        //    }
+    </script>
+    <span class="add_attachment">
+<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+      <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+      <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+      <%= file_field_tag 'attachments[dummy][file]',
+                         :id => '_file',
+                         :class => 'file_selector',
+                         :multiple => true,
+                         :onchange => 'addInputFiles(this);',
+                         :style => 'display:none',
+                         :data => {
+                                 :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                                 :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                                 :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                                 :upload_path => uploads_path(:format => 'js'),
+                                 :description_placeholder => l(:label_optional_description),
+                                 :field_is_public => l(:field_is_public),
+                                 :are_you_sure => l(:text_are_you_sure),
+                                 :file_count => l(:label_file_count),
+                                 :delete_all_files => l(:text_are_you_sure_all)
+                         } %>
+      <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 
+<% end %>
 <% content_for :header_tags do %>
     <%= javascript_include_tag 'attachments' %>
 <% end %>

app/views/attachments/_homework_jour_link.html.erb

@@ -13,6 +13,6 @@
                         :target => "_blank"%>
           </div>
       <% end %>
-      <br>
+      <div class="cl"></div>
   <% end %>
 </div>

app/views/attachments/upload.js.erb

@@ -3,14 +3,15 @@ var fileSpan = $('#attachments_<%= j params[:attachment_id] %>');
   fileSpan.hide();
   alert("<%= escape_javascript @attachment.errors.full_messages.join(', ') %>");
 <% else %>
-$('<input>', { type: 'hidden', name: 'attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
 fileSpan.find('a.remove-upload')
-  .attr({
-    "data-remote": true,
-    "data-method": 'delete',
-    "href": '<%= j attachment_path(@attachment, :attachment_id => params[:attachment_id], :format => 'js') %>'
-  })
-  .off('click');
+        .attr({
+            "data-remote": true,
+            "data-method": 'delete',
+            "href": '<%= j attachment_path(@attachment, :attachment_id => params[:attachment_id], :format => 'js') %>'
+        })
+        .off('click');
+$('<input>', { type: 'hidden', name: 'attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
+
 //var divattach = fileSpan.find('div.div_attachments');
 //divattach.html('<%= j(render :partial => 'tags/tagEx', :locals => {:obj => @attachment, :object_flag => "6"})%>');
 <% end %>

app/views/avatar/_new_avatar_form.html.erb

@@ -7,8 +7,7 @@
                    :id => nil,
                    :class => 'upload_file',
                    :size => "1",
-                   :multiple => false,
-                   :onchange => 'addInputAvatar(this);',
+                   :multiple => true,
                    :data => {
                            :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
                            :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
@@ -22,6 +21,6 @@
                    } %>
 <!--</span>-->
 <% content_for :header_tags do %>
-    <%= javascript_include_tag 'avatars' %>
+    <%= javascript_include_tag 'jq-upload/jquery.ui.widget', 'jq-upload/jquery.iframe-transport', 'jq-upload/jquery.fileupload', 'jq-upload/upload' %>
 <% end %>
-<div class="cl"></div>
+<div class="cl"></div>

app/views/avatar/upload.js.erb

@@ -1,4 +1,4 @@
-var imgSpan = $('#avatar_image');
+var imgSpan = jQuery('#avatar_image');
 
 imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'});
   

app/views/boards/_course_new.html.erb

@@ -3,7 +3,7 @@
     <%= 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="$('#message-form').submit();" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <a href="#" onclick="submitProjectsBoard('<%= @message.id %>')" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
       <div class="cl"></div>
     </li>
 <% end %>

app/views/boards/_course_show.html.erb

@@ -32,7 +32,7 @@
   <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
   <% if @topics.any? %>
       <% @topics.each do |topic| %>
-          <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
+          <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;" id="topic<%= topic.id %>">
             <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
             <div class="talkmain_txt fl mt5">
               <% author = topic.author.to_s + "：" %>
@@ -40,12 +40,10 @@
 
               <p  class="talkmain_tit fl fb break_word">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
               <% if topic.course_editable_by?(User.current) %>
-                  <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;float: left;
-                          margin-left: 20px;"><%= l(:button_edit) %></a>
-              <% end %>
-              <% 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)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;float: right;
+                          margin-right: 10px;"><%= l(:button_edit) %></a>
               <% end %>
+
               <%= link_to(
                           l(:button_delete),
                           {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
@@ -55,21 +53,28 @@
                           :style => ' margin-right: 10px;'
                   ) if topic.destroyable_by?(User.current) %>
 
-
+              <% if topic.sticky? %>
+                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
+              <% end %>
               <div class="cl"></div>
 
-              <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
-                <%= topic.content %>
-              </p>
-              <% if topic.content.size > 300 %>
-                  <p>
-                    <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+              <script>
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#project_show_<%= topic.id%>").show();}});
+              </script>
+              <div  class="project_board_content break_word" id="content_<%=topic.id%>">
+                <div id="contentmessage<%=topic.id %>" class="upload_img">
+                  <%= topic.content.html_safe %>
+                </div>
+              </div>
+
+
+              <p style="display: none" id="project_show_<%= topic.id%>">
+                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
 
-                  </p>
-              <% end %>
+              </p>
               <%= link_to_attachments_course topic, :author => false %>
 
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
@@ -95,7 +100,8 @@
                   <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message_form' + topic.id.to_s} do |f| %>
 
                       <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-                      <a href="#" onclick="$('#message_form<%= topic.id%>').submit();" class="talk_btn fr c_white" style=""><%= l(:label_memo_create)%></a>
+                      <%= toggle_link l(:button_cancel), "reply" + topic.id.to_s, :focus => 'message_content',:class => 'grey_btn fr ml10' %>
+                      <a href="#" onclick="$('#message_form<%= topic.id%>').submit();" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
                   <% end %>
                   <div class="cl"></div>
                 </div>

app/views/boards/_edit.html.erb

@@ -12,7 +12,7 @@
                            } do |f| %>
             <%= render :partial => 'form_project',
                      :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
-            <a href="#" onclick="$('#message-form<%= topic.id%>').submit();" class="blue_btn fl c_white" ><%= l(:button_submit)%></a>
+            <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>
           <%#= 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>
@@ -31,10 +31,10 @@
                                } do |f| %>
               <%= render :partial => 'form_course',
                          :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
-              <a href="javascript:void(0)" onclick="$('#message-form<%= topic.id%>').submit();"class="blue_btn fl 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"  %>
+              <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>
 
-          <% end %>
+        <% end %>
         </ul>
       </div>
 <% end %>

app/views/boards/_form_course.html.erb

@@ -8,16 +8,16 @@
       <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585" }.merge(extra_option) %>
 
 
-      <p id="subject_span" class="ml55"></p>
+      <p id="subject_span<%= topic.id%>" 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", onkeyup: "regexSubject();",: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" }.merge(extra_option) %>
 
-      <p id="subject_span" class="ml55"></p>
+      <p id="subject_span<%= f.object.id%>" class="ml55"></p>
     </li>
 <% end %>
 <li class="ml60 mb5">
@@ -40,12 +40,12 @@
   <% end %>
   <%= text_area :quote,:quote,:style => 'display:none' %>
   <% if replying%>
-      <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)", :style=>"width: 575px;" %>
+      <%= 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', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
+      <%= 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="cl"></div>
-  <p id="message_content_span"  class="ml55"></p>
+  <p id="message_content_span<%= f.object.id%>"  class="ml55"></p>
 </li>
 <div class="cl"></div>
 <li>

app/views/boards/_form_project.html.erb

@@ -5,19 +5,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",:class=>"talk_input w585" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}",:class=>"talk_input w585" }.merge(extra_option) %>
 
 
-  <p id="subject_span" class="ml55"></p>
+  <p id="subject_span<%= f.object.id%>" 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", onkeyup: "regexSubject();",: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" }.merge(extra_option) %>
 
-      <p id="subject_span" class="ml55"></p>
+      <p id="subject_span<%= f.object.id%>" class="ml55"></p>
     </li>
 <% end %>
 <li class="ml60 mb5">
@@ -36,16 +36,16 @@
 <li>
   <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
   <% unless replying %>
-    <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
+      <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', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)", :style=>"width: 575px;" %>
+      <%= 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', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
+      <%= 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="cl"></div>
-  <p id="message_content_span"  class="ml55"></p>
+  <p id="message_content_span<%= f.object.id%>"  class="ml55"></p>
 </li>
 <div class="cl"></div>
 <li>

app/views/boards/_project_new_topic.html.erb

@@ -4,7 +4,7 @@
     <li>
       <a href="javascript:void(0)"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
 
-      <a href="#" onclick="$('#message-form').submit();" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <a href="#" onclick="submitProjectsBoard('<%= @message.id %>')" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
       <div class="cl"></div>
     </li>
 <% end %>

app/views/boards/_project_show.html.erb

@@ -32,7 +32,8 @@
   <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
 <% if @topics.any? %>
       		<% @topics.each do |topic| %>
-          <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
+
+          <div class="talkmain_box" id="topic<%= topic.id %>" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
             <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
             <div class="talkmain_txt fl mt5">
                <% author = topic.author.to_s + "：" %>
@@ -40,12 +41,10 @@
 
               <p  class="talkmain_tit fl fb break_word">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
               <% if topic.editable_by?(User.current) %>
-                  <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;float: left;
-                          margin-left: 20px;"><%= l(:button_edit) %></a>
-              <% end %>
-              <% 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)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;float: right;
+                          margin-right: 10px;"><%= l(:button_edit) %></a>
               <% end %>
+
               <%= link_to(
                           l(:button_delete),
                           {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
@@ -55,21 +54,28 @@
                           :style => ' margin-right: 10px;'
                   ) if topic.destroyable_by?(User.current) %>
 
-
+              <% if topic.sticky? %>
+                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
+              <% end %>
               <div class="cl"></div>
+              <script>
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#project_show_<%= topic.id%>").show();}});
+              </script>
+              <div  class="project_board_content break_word" id="content_<%=topic.id%>">
+                <div id="contentmessage<%=topic.id %>" class="upload_img">
+                  <%= topic.content %>
+                </div>
+              </div>
+
 
-               <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
-                 <%= topic.content %>
-               </p>
-              <% if topic.content.size > 300 %>
-              <p>
-                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+              <p style="display: none" id="project_show_<%= topic.id%>">
+                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
 
               </p>
-               <% end %>
+
             <%= link_to_attachments_course topic, :author => false %>
 
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
@@ -96,7 +102,10 @@
                   <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message_form' + topic.id.to_s} do |f| %>
 
                       <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-                      <a href="#" onclick="$('#message_form<%= topic.id%>').submit();" class="talk_btn fr c_white" style=""><%= l(:label_memo_create)%></a>
+                      <%= toggle_link l(:button_cancel), "reply" + topic.id.to_s, :focus => 'message_content',:class => 'grey_btn fr ml10' %>
+                      <a href="#" onclick="$('#message_form<%= topic.id%>').submit();" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
+
+
                   <% end %>
                   <div class="cl"></div>
                 </div>
@@ -174,6 +183,7 @@
                <% end %>
            <% end %>
         </div>
+
        <% end %>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
@@ -205,20 +215,5 @@
             $("#message_form").submit();
         }
     }
-    function regexContent()
-    {
-        var content = $.trim($("#message_content").val());
-        if(content.length ==0)
-        {
-            $("#message_content_span").text("<%= l(:label_reply_empty) %>");
-            $("#message_content_span").css('color','#ff0000');
-            flag =  false;
-        }
-        else
-        {
-            $("#message_content_span").text("<%= l(:label_field_correct) %>");
-            $("#message_content_span").css('color','#008000');
-            flag = true;
-        }
-    }
+
 </script>