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

app/controllers/forums_controller.rb

@@ -7,7 +7,7 @@ class ForumsController < ApplicationController
   before_filter :find_forum_if_available
   before_filter :authenticate_user_edit, :only => [:edit, :update]
   before_filter :authenticate_user_destroy, :only => [:destroy]
-  before_filter :require_login, :only => [:new, :create]
+  before_filter :require_login, :only => [:new, :create,:destroy,:update,:edit]
 
   helper :sort
   include SortHelper
@@ -97,7 +97,24 @@ class ForumsController < ApplicationController
 
   def index
     @offset, @limit = api_offset_and_limit({:limit => 10})
-    @forums_all = Forum.reorder("sticky DESC")
+    if(params[:reorder_complex])
+      @type="reorder_complex"
+      @str=params[:reorder_complex]
+       @forums_all = Forum.reorder("topic_count #{params[:reorder_complex]},updated_at #{params[:reorder_complex]}")
+    elsif(params[:reorder_popu])
+      @type="reorder_popu"
+      @str=params[:reorder_popu]
+      @forums_all = Forum.reorder("topic_count #{params[:reorder_popu]}")
+    elsif(params[:reorder_time])
+      @type="reorder_time"
+      @str=params[:reorder_time]
+      @forums_all = Forum.reorder("updated_at #{params[:reorder_time]}")
+    else
+      params[:reorder_complex] = "desc"
+      @type="reorder_complex"
+      @str=params[:reorder_complex]
+        @forums_all = Forum.reorder("topic_count desc,updated_at desc")
+    end
     @forums_count = @forums_all.count
     @forums_pages = Paginator.new @forums_count, @limit, params['page']
 
@@ -106,6 +123,7 @@ class ForumsController < ApplicationController
     #@forums = Forum.all
     respond_to do |format|
       format.html # index.html.erb
+      format.js
       format.json { render json: @forums }
     end
   end
@@ -113,11 +131,25 @@ class ForumsController < ApplicationController
   # GET /forums/1
   # GET /forums/1.json
   def show
-    sort_init 'updated_at', 'desc'
-    sort_update 'created_at' => "#{Memo.table_name}.created_at",
-                'replies' => "#{Memo.table_name}.replies_count",
-                'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
-
+    # sort_init 'updated_at', 'desc'
+    # sort_update 'created_at' => "#{Memo.table_name}.created_at",
+    #             'replies' => "#{Memo.table_name}.replies_count",
+    #             'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+    order = ""
+    @order_str = ""
+    if(params[:reorder_complex])
+      order = " last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}"
+      @order_str = "reorder_complex="+params[:reorder_complex]
+    elsif(params[:reorder_popu])
+      order = "replies_count #{params[:reorder_popu]}"
+      @order_str = "reorder_popu="+params[:reorder_popu]
+    elsif(params[:reorder_time])
+     order = "#{Memo.table_name}.updated_at #{params[:reorder_time]}"
+     @order_str = "reorder_time="+params[:reorder_time]
+    else
+      order = "last_replies_memos.created_at desc, #{Memo.table_name}.created_at desc"
+      @order_str = "reorder_complex=desc"
+    end
     @memo = Memo.new(:forum => @forum)
     @topic_count = @forum.topics.count
     @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
@@ -126,19 +158,15 @@ class ForumsController < ApplicationController
                     includes(:last_reply).
                     limit(@topic_pages.per_page).
                     offset(@topic_pages.offset).
-                    order(sort_clause).
+                    reorder(order).
                     preload(:author, {:last_reply => :author}).
                     all
     @memos
-    # @offset, @limit = api_offset_and_limit({:limit => 10})
-    # @forum = Forum.find(params[:id])
-    # @memos_all = @forum.topics
-    # @topic_count = @memos_all.count
-    # @topic_pages = Paginator.new @topic_count, @limit, params['page']
-
-    # @offset ||= @topic_pages.offset
-    # @memos = @memos_all.offset(@offset).limit(@limit).all
+    @my_topic_count =   Memo.where("forum_id = #{@forum.id} and author_id = #{User.current.id} and parent_id is null").count
+    @my_replies_count =  Memo.where("forum_id = #{@forum.id} and author_id = #{User.current.id} and parent_id is not null").count
+    @errors = params[:errors]
     respond_to do |format|
+      format.js
       format.html {
         render :layout => 'base_forums'
       }# show.html.erb
@@ -172,20 +200,23 @@ class ForumsController < ApplicationController
       # Author lizanle
       # Description after save后需要进行资源记录的更新
       # owner_type = 2 对应的是 forum
+      @save_flag=true
       if params[:asset_id]
         ids = params[:asset_id].split(',')
         update_kindeditor_assets_owner ids ,@forum.id,OwnerTypeHelper::FORUM
       end
       #end
       respond_to do |format|
-
+          format.js
           format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
           format.json { render json: @forum, status: :created, location: @forum }
       end
 
     else
+      @save_flag=false
       respond_to do |format|
         flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}"
+        format.js
         format.html { render action: "new" }
         format.json { render json: @forum.errors, status: :unprocessable_entity }
       end
@@ -199,10 +230,12 @@ class ForumsController < ApplicationController
 
     respond_to do |format|
       if @forum.update_attributes(params[:forum])
+        format.js  {render :text=> true}
         format.html { redirect_to @forum, notice: l(:label_forum_update_succ) }
         format.json { head :no_content }
       else
         flash.now[:error] = "#{l :label_forum_update_fail}: #{@forum.errors.full_messages[0]}"
+        format.js { render :text=> false}
         format.html { render action: "edit" }
         format.json { render json: @forum.errors, status: :unprocessable_entity }
       end
@@ -261,6 +294,47 @@ class ForumsController < ApplicationController
     end
   end
 
+  #检查forum的名字
+  def check_forum_name
+    forum_name_exist = Forum.where("name = '#{params[:forum_name]}'").count >= 1 ? true : false
+    render :text => forum_name_exist
+  end
+
+  #添加论坛tag
+  def add_forum_tag
+    @forum = Forum.find(params[:id])
+    unless @forum.nil?
+      @forum.tag_list.add(params[:tag_str].split(','))
+      @forum.save
+    end
+    respond_to do |format|
+      format.js {render :delete_forum_tag}
+    end
+  end
+
+  #删除forum的tag
+  def delete_forum_tag
+    @tag_id = (ActsAsTaggableOn::Tag.find_by_name(params[:tag_name])).id
+    #forum的taggable_type = 5
+    @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,params[:id],'Forum')
+
+    unless @taggings.nil?
+      @taggings.delete
+    end
+
+    # 是否还有其他记录 引用了 tag_id
+    @tagging = ActsAsTaggableOn::Tagging.find_by_tag_id(@tag_id)
+    # 如果taggings表中记录已经不存在 ，那么检查tags表 作删除动作
+    if @tagging.nil?
+      @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id)
+      @tag.delete unless @tag.nil?
+    end
+    @forum = Forum.find(params[:id])
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def find_forum_if_available

app/controllers/memos_controller.rb

@@ -11,7 +11,7 @@ class MemosController < ApplicationController
   include AttachmentsHelper
   include ApplicationHelper
 
-  layout 'base_memos'
+  # layout 'base_memos'
 
   def quote
     @subject = @memo.subject
@@ -77,37 +77,10 @@ class MemosController < ApplicationController
           format.json { render json: @memo, status: :created, location: @memo }
       else
         flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
-        # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
-        pre_count = REPLIES_PER_PAGE
-
-        @memo_new = @memo.dup
-        @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示
-        unless @memo.new_record?
-          @memo.update_column(:viewed_count, (@memo.viewed_count.to_i + 1))
-        end
-
-
-        page = params[:page]
-        if params[:r] && page.nil?
-          offset = @memo.children.where("#{Memo.table_name}.id < ?", params[:r].to_i).count
-          page = 1 + offset / pre_count
-        else
-          
-        end
-        @reply_count = @memo.children.count
-        @reply_pages = Paginator.new @reply_count, pre_count, page
-        @replies = @memo.children.
-                    includes(:author, :attachments).
-                    reorder("#{Memo.table_name}.created_at DESC").
-                    limit(@reply_pages.per_page).
-                    offset(@reply_pages.offset).
-                    all
-        if @memo.new_record?
-          format.html { render :new,:layout=>'base'}
-        else
-          format.html { render action: :show }
+          format.js
+          format.html { redirect_to( forum_path(Forum.find(params[:forum_id]),:errors=>@memo.errors.full_messages[0])) }
           format.json { render json: @memo.errors, status: :unprocessable_entity }
-        end
+        #end
 
       end
     end
@@ -115,6 +88,7 @@ class MemosController < ApplicationController
   
   REPLIES_PER_PAGE = 20 unless const_defined?(:REPLIES_PER_PAGE)
   def show
+
     # 更新贴吧帖子留言对应的memo_messages的viewed字段
     unless @memo.children.blank?
       @memo.children.each do |child|
@@ -154,21 +128,27 @@ class MemosController < ApplicationController
 
     @memo_new = Memo.new
 
-
+    @my_topic_count =   Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is null").count
+    @my_replies_count =  Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is not null").count
     # @memo = Memo.find_by_id(params[:id])
     # @forum = Forum.find(params[:forum_id])
     # @replies = @memo.replies
     # @mome_new = Memo.new
     
     respond_to do |format|
-      format.html # show.html.erb
+      format.html {render :layout=> 'base_forums'}#:layout=> 'base_forums',
       format.json { render json: @memo }
       format.xml { render xml: @memo }
     end
   end
 
   def edit
+    @my_topic_count =   Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is null").count
+    @my_replies_count =  Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is not null").count
     @replying = false
+    respond_to do |format|
+      format.html {render :layout=>'base_forums'}
+    end
   end
 
   def update
@@ -176,7 +156,8 @@ class MemosController < ApplicationController
       if( #@memo.update_column(:subject, params[:memo][:subject]) &&
            @memo.update_column(:content, params[:memo][:content]) &&
            @memo.update_column(:sticky, params[:memo][:sticky]) &&
-           @memo.update_column(:lock, params[:memo][:lock])) 
+           @memo.update_column(:lock, params[:memo][:lock]) &&
+           @memo.update_column(:subject,params[:memo][:subject]))
         @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
         @memo.save
         # @memo.root.update_attribute(:updated_at, @memo.updated_at)
@@ -227,7 +208,7 @@ class MemosController < ApplicationController
   end
 
   def back_memo_url
-    forum_memo_path(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id))
+    forum_memo_path(@forum, (@memo.root.nil? ? @memo : @memo.root))
   end
 
   def back_memo_or_forum_url

app/controllers/messages_controller.rb

@@ -160,7 +160,7 @@ class MessagesController < ApplicationController
     @reply.safe_attributes = params[:reply]
     @reply.content = @quote + @reply.content
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
-    @reply.reply_id = @message.author
+    # @reply.reply_id = params[:id]
     @topic.children << @reply
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
     user_activity.updated_at = Time.now

app/controllers/tags_controller.rb

@@ -15,6 +15,7 @@ class TagsController < ApplicationController
   include ContestsHelper
   include ActsAsTaggableOn::TagsHelper
   include TagsHelper
+  include FilesHelper
   helper :projects
   helper :courses
   helper :tags
@@ -236,12 +237,21 @@ class TagsController < ApplicationController
     @rename_tag_name = params[:renameName]
     @taggable_id = params[:taggableId]
     @taggable_type = numbers_to_object_type(params[:taggableType])
-
+    @course_id = params[:courseId]
 
     @rename_tag = (ActsAsTaggableOn::Tag.find_by_name(@rename_tag_name))  #查找重命名后的tag
     @tag_id = (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).id  #重命名前的tag_id
-    @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type)
-    @obj = get_object(@taggable_id,params[:taggableType])
+    @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type) unless @taggable_id.blank?
+    @obj = get_object(@taggable_id,params[:taggableType]) unless @taggable_id.blank?
+    if  @taggable_id.blank? #如果没有传tag_id，那么直接更新tag_name就好了。但是要防止 重命名后的tag存在。
+      #看重命名后的tag是否存在。如果存在的话，只需要更改taggings里边的id即可
+      if @rename_tag
+        @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type)
+        @taggings.update_attributes({:tag_id=>@rename_tag.id})
+      else #如果不存在，那么就直接更新该tag名称为新的名称
+        (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).update_attributes(:name=>@rename_tag_name)
+      end
+    else
       if(@rename_tag.nil?) #这次命名的是新的tag
 
         # 是否还有其他记录 引用了 tag_id
@@ -267,16 +277,51 @@ class TagsController < ApplicationController
           @taggings.update_attributes({:tag_id=>@rename_tag.id})
         end
       end
+    end
+
     @obj_flag =  params[:taggableType]
     if @obj && @obj_flag == '6' && @obj.container.kind_of?(Course)
       @course = @obj.container
       @tag_list = @tag_list = get_course_tag_list @course
+    elsif @course_id
+      @course = Course.find(@course_id)
+      @tag_list = get_course_tag_list @course
+
+      #这里要引用FilesController里的逻辑了。将资源库当前的文件列表刷新一遍。
+      @flag = params[:flag] || false
+      sort = ""
+      @sort = ""
+      @order = ""
+      @is_remote = false
+      @isproject = false
+
+      sort = "#{Attachment.table_name}.created_on desc"
+
+      @containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
+
+      show_attachments @containers
+    elsif @obj &&  @obj_flag == '5'
+      @forum = @obj
     end
     respond_to do |format|
       format.js
     end
   end
 
+  def show_attachments obj
+    @attachments = []
+    obj.each do |container|
+      @attachments += container.attachments
+    end
+    @all_attachments = User.current.admin? ? @attachments : visable_attachemnts(@attachments)
+    @limit = 10
+    @feedback_count = @all_attachments.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    @offset ||= @feedback_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @obj_attachments = paginateHelper @all_attachments,10
+  end
+
   def tag_save
     @select_tag_name = params[:tag_for_save][:tag_name]
     @tags = params[:tag_for_save][:name]

app/helpers/tags_helper.rb

@@ -1,5 +1,6 @@
 module TagsHelper
   include StoresHelper
+  include CoursesHelper
   # 通过 id和type获取对象
   def get_object(obj_id,obj_type)
     @obj = nil
@@ -62,6 +63,27 @@ module TagsHelper
 
 end
 
+#判断课程course中是否包含课件attachment，course中引用了attachment也算作包含
+def course_contains_attachment? course,attachment
+  course.attachments.each do |att|
+    if att.id == attachment.id || (!att.copy_from.nil? && !attachment.copy_from.nil? && att.copy_from == attachment.copy_from) || att.copy_from == attachment.id || att.id == attachment.copy_from
+      return true
+    end
+  end
+  false
+end
+
+#判断用户是否拥有不包含当前资源的课程，需用户在该课程中角色为教师且该课程属于当前学期或下一学期
+def has_course? user,file
+  result = false
+  user.courses.each do |course|
+    if !course_contains_attachment?(course,file) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course)
+      return true
+    end
+  end
+  result
+end
+
 # 判断用户是否是贴吧的管理员
 # add by chenmin
 def is_forum_manager?(user_id,forum_id)

app/models/forum.rb

@@ -14,7 +14,7 @@ class Forum < ActiveRecord::Base
   'sticky',
   'locked'
   validates_presence_of :name, :creator_id, :description
-  validates_length_of :name, maximum: 50
+  validates_length_of :name, maximum: 160
   #validates_length_of :description, maximum: 255
   validates :name, :uniqueness => true
   after_destroy :delete_kindeditor_assets

app/views/files/_course_list.html.erb

@@ -3,13 +3,13 @@
   <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
   <p class="f_r" style="color: #808080">
     <% if order == "asc" %>
-        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
-        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
-        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
     <% else %>
-        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
-        <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
-        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
     <% end %>
   </p>
 </div>

app/views/files/_tag_yun.html.erb

@@ -3,7 +3,7 @@
         <% if tag_name && tag_name == k%>
             <a href="javascript:void(0);" class="files_tag_select"><%= k%>×<%= v%></a>
         <% else%>
-            <a href="javascript:void(0);" class="files_tag_icon" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"><%= k%>×<%= v%></a>
+            <a href="javascript:void(0);" class="files_tag_icon" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a>
         <% end%>
     <% end%>
 <% end%>

app/views/files/index.html.erb

@@ -229,6 +229,9 @@
     var ele;    //当前双击的链接
     var tagId; //标签的id
     var taggableType; //被标签的类型
+    //这里renameTag有两种情况，一种是改变某个资源的tag名称。如果其他资源也有这个tag。则新增一个改变后的tag名
+    //第二种是改变某个tag名称。其他所有的资源如果拥有这个tag。那么对应的tag名也要改掉。
+    //目前这两种依据 的来源就是 是否 传了参数 id。如果有id。就指定了资源id，就是第一种情况。如果没有id。就是第二种情况
     function rename_tag(domEle,name,id,type){
         if(domEle.children().get(0) != undefined ){ //已经是编辑框的情况下不要动
             return;
@@ -239,7 +242,8 @@
         ele = domEle;
         tagId = id;
         taggableType = type;
-        domEle.html('<input name="" id="renameTagName" style="width: 100px;" value="'+name+'"/>');
+        width = parseInt(domEle.css('width').replace('px','')) >=100 ?  parseInt(domEle.css('width').replace('px','')) : 100
+        domEle.html('<input name="" id="renameTagName" maxlength="<%=Setting.tags_max_length%>" minlength="<%= Setting.tags_min_length%>" style="width:'+width +'px;" value="'+name+'"/>');
         domEle.parent().css("border","1px solid #ffffff");
         $("#renameTagName").focus();
     }
@@ -258,11 +262,7 @@
                     if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){
                           $.post(
                                     '<%= update_tag_name_path %>',
-                                {"taggableId":tagId,"taggableType":taggableType,"tagName":tagName,"renameName":$("#renameTagName").val().trim()}
-//                                function(data){
-//                                    ele.parent().css("border","");
-//                                    ele.parent().html(tagNameHtml);
-//                                }
+                                    {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
                           )
                    }else{
                        ele.parent().css("border","");

app/views/forums/_file_form.html.erb

@@ -0,0 +1,79 @@
+<style type="text/css">
+    input.is_public,input.is_public_checkbox{height:12px;}
+    input.is_public_checkbox{margin-left:4px;margin-right:4px;}
+</style>
+<div class="fl">
+<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) && container && container.saved_attachments %>
+  <% 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 => 254, :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') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= 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">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :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') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= 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()"%-->
+    <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'AnnexBtn fl mt3' %>
+    <a href="javascript:void(0);" onclick="$('#_file').click();" class="AnnexBtn fl mr15">上传附件</a>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :style => ie8? ? '' : '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', :project => project),
+                               :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">-->
+      <!--<%#= l(:label_no_file_uploaded) %>-->
+    <!--</span>-->
+    <!--(<%#= l(:label_max_size) %>:-->
+    <%#= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>
+    <!--)-->
+<!--</span>-->
+
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>

app/views/forums/_form_edit_mode.html.erb

@@ -1,49 +1,26 @@
-<!-- added by fq -->
-<!-- %= form_for(@forum) do |f| % -->
 
-<div id="share_new" style = "width: 500px; margin:0 auto; " >
-  <%= labelled_form_for(@forum) do |f|  %>
-  <% if @forum.errors.any? %>
-  <!--<div id="error_explanation">
-    <h2><#%= pluralize(@forum.errors.count, "error") %> prohibited this forum from being saved:</h2>
+<div class="homepageContentContainer mb10">
+  <div class="homepageContent">
+    <div class="pageBanner mt15"><div class="NewsBannerName">编辑贴吧</div></div>
+    <div class="cl"></div>
 
-    <ul>
-      <#% @forum.errors.full_messages.each do |msg| %>
-      <li><#%= msg %></li>
-      <#% end %>
-    </ul>
-  </div> -->
-  <% end %>
-  <div style="width: 120%;">
-    <div class="field">
-      <%= f.text_field :name, :required => true,  :style => 'width: 100%;', :class => 'create-share', :maxlength => 50%>
-    </div>
-    <div>
-      <% if User.current.logged? && User.current.admin? %>
-      <% if @forum.safe_attribute? 'sticky' %>
-          <%= f.check_box :sticky %>
-          <%= label_tag 'message_sticky', l(:label_board_sticky) %>
-      <% end %>
-      <% if @forum.safe_attribute? 'locked' %>
-          <%= f.check_box :locked %>
-          <%= label_tag 'message_locked', l(:label_board_locked) %>
-      <% end %>
-      <% end %>
+    <div class="postContainer">
+      <%= labelled_form_for(@forum) do |f|  %>
+      <div id="error" style="display: none;color: red;">
       </div>
       <div>
-      <p style="max-width:680px">
-        <%= f.kindeditor :description, :required => true,:owner_id => @forum.id,:owner_type => 2 %>
-      </p>
-      <!-- <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
-
-      <p style="color: #ff0000">
-        (<%= l(:label_forums_max_length) %>)
-      </p>
+        <textarea type="text" id="forum_name" name="forum[name]" class="postCreateInput" placeholder="对应贴吧名称"  ><%= @forum.name.html_safe%></textarea>
       </div>
-    <div class="actions" style=" padding-top: 10px; float:right">
-      <%= submit_tag l(:button_submit) %>
-      <%= link_to l(:button_back), forums_path ,:style => 'font-size: 14px; padding: 0px 3px;'  %>
+      <div class="mt15">
+        <textarea type="text" id="forum_desc" name="forum[description]" class="postCreateInput" placeholder="对应贴吧描述" ><%= @forum.description.html_safe%></textarea>
       </div>
+      <div class="mt10">
+        <div class="fr"><a href="javascript:void(0);" class="submit_btn" onclick="check_and_submit($(this));">确定</a></div>
+        <div class="fr"><a href="<%= forum_path(@forum)%>" class="linkGrey2 mr10" >取消</a><span class="mr10 fontGrey">或</span></div>
+        <div class="cl"></div>
       </div>
       <% end %>
+    </div>
+
+  </div>
 </div>

app/views/forums/_forum_form.html.erb

@@ -0,0 +1,15 @@
+<div><img src="images/post_portrait.jpg" width="75" height="75" alt="贴吧图片" id="forum_image" class="mr10 fl" />
+  <a href="javascript:void(0)" class="upImg linkGrey2 fl" onclick="open_upload_diaglog();">上传图片</a>
+  <div class="cl"></div>
+</div>
+<div class="mt15">
+  <input type="text" name="postName" class="postCreateInput" placeholder="输入贴吧名称"  />
+</div>
+<div class="mt15">
+  <input type="text" name="postName" class="postCreateInput" placeholder="输入贴吧描述" />
+</div>
+<div class="mt10">
+  <div class="fr"><a href="javascript:void(0);" class="submit_btn">确定</a></div>
+  <div class="fr"><a href="javascript:void(0);" class="linkGrey2 mr10" onclick="$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();">取消</a><span class="mr10 fontGrey">或</span></div>
+  <div class="cl"></div>
+</div>

app/views/forums/_forum_list.html.erb

@@ -1,57 +1,38 @@
-<!-- added by fq -->
-<div class="forums-list">
+
 <% if forums.any? %>
 	<% forums.each do |forum| %>
-	<div class="forums-index">
-		<div class="forums-inex-avatar">
-          <%= forum.creator.nil? ? (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar")) : (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator)) %>
-        </div>
-		<div class="forums-index-content">
-          <table class="content-text-list" style="table-layout: fixed;">
-            <tr>
-              <td valign="top" width="500px" class=" <%= forum.sticky? ? 'sticky' : '' %><%= forum.locked? ? 'locked' : '' %>" style="word-break: break-all;word-wrap: break-word;">
-                  <p >
-                    <%= link_to h(forum.name), forum_path(forum) %>
-                  </p>
-              </td>
-            </tr>
-			<tr>
-              <td style="word-break: break-all;word-wrap: break-word;" class="upload_img">
-                <p>
-                  <%= textAreailizable forum.description%>
-                </p>
-              </td>
-            </tr>
-			<tr>
-              <td style="word-break: break-all;word-wrap: break-word;">
-                <p >
-                  <%= authoring forum.created_at, forum.creator %>
-                </p>
-              </td>
-            </tr>
-          </table>
-        </div>
-		<div class="forums-index-count">
-			<table class="forums-count-color">
-              <tr class="forums-count-color" align="center">
-                <td>
-                  <%= link_to (forum.memo_count), forum_path(forum) %>
-                </td>
-                <td>
-                  <%= link_to (forum.topic_count), forum_path(forum) %>
-                </td>
-              </tr>
-              <tr align="center">
-                <td>回答</td>
-                <td>帖子</td>
-              </tr>
-            </table>
+          <div class="postRow">
+            <div class="postPortrait"><a href="javascript:void(0);" class="linkGrey2">
+              <%= link_to image_tag(url_to_avatar(forum.creator),:width=>75,:height => 75 ),user_path( forum.creator) %>
             </div>
+            <div class="postWrap">
+              <div class="postTitle">
+                <!--<a href="javascript:void(0);" class="f16 linkBlue">新手讨论吧</a>-->
+                <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
-	<% end %>
-	<div class="pagination" style="margin-top: 10px;">
-      <%= pagination_links_full @forums_pages, @forums_count %>
+              <div class="postDes"><%= textAreailizable forum.description%></div>
+              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
+              <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
+            </div>
+            <div class="postStatics">
+              <div>
+                <!--<a href="javascript:void(0);" class="linkGrey5 fb">280</a>-->
+                    <%= link_to ( forum.topic_count), forum_path(forum),:class=>"linkGrey5 fb" %>
+              </div>
+              <div>帖子</div>
+            </div>
+            <div class="slice"></div>
+            <div class="postStatics mr20">
+              <div>
+                <!--<a href="javascript:void(0);" class="linkGrey5 fb">335</a>-->
+                <%= link_to (forum.memo_count), forum_path(forum),:class=>"linkGrey5 fb" %>
               </div>
+              <div>回答</div>
+            </div>
+            <div class="cl"></div>
+          </div>
+	<% end %>
+
 <% else %>
+    <%= render :partial => "layouts/no_content" %>
 <% end %>
-</div>

app/views/forums/_forum_tag_list.html.erb

@@ -0,0 +1,8 @@
+<% forum.tag_list.each do |tag|%>
+    <span class="postlabel mr10">
+                <a href="javascript:void(0);" ondblclick="rename_tag($(this),<%= tag %>,<%= forum.id%>,5);" class="fontGrey2 mr5"><%= tag %></a>
+      <%if forum.creator.id == User.current.id%>
+                <a href="javascript:void(0);" class="fontGrey2" onclick="delete_forum_tag($(this));">×</a>
+       <% end %>
+        </span>
+<% end %>

app/views/forums/_post_banner.html.erb

@@ -0,0 +1,33 @@
+
+
+<div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a>
+  <% if order_type=='reorder_complex' && order_str == 'desc' %>
+    <a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveD"></a>
+  <% elsif order_type=='reorder_complex' && order_str == 'asc' %>
+      <a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveU"></a>
+  <% else %>
+      <a href="javascript:void(0);" id="reorder_complex" ></a>
+  <% end %>
+</div>
+<div class="postSort" id="popu"><a href="javascript:void(0);" class="linkGrey2 fl">人气</a>
+  <% if order_type=='reorder_popu' && order_str == 'desc' %>
+      <a href="javascript:void(0);" id="reorder_popu" class="sortArrowActiveD"></a>
+  <% elsif order_type=='reorder_popu' && order_str == 'asc' %>
+      <a href="javascript:void(0);" id="reorder_popu" class="sortArrowActiveU"></a>
+  <% else %>
+      <a href="javascript:void(0);" id="reorder_popu" ></a>
+  <% end %>
+</div>
+<div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a>
+  <% if order_type=='reorder_time' && order_str == 'desc' %>
+      <a href="javascript:void(0);" id="reorder_time" class="sortArrowActiveD"></a>
+  <% elsif order_type=='reorder_time' && order_str == 'asc' %>
+      <a href="javascript:void(0);" id="reorder_time" class="sortArrowActiveU"></a>
+  <% else %>
+      <a href="javascript:void(0);" id="reorder_time" ></a>
+  <% end %>
+</div>
+<div class="creatPost">
+  <a href="javascript:void(0);" id="create_btn" class="c_white db creatPostIcon bBlue"
+     onclick="$('#error').hide();clear_form();$('#new_forum_div').slideToggle();$(this).parent().slideToggle();">新建贴吧</a></div>
+<div class="cl"></div>

app/views/forums/_show_topics.html.erb

@@ -1,47 +1,31 @@
-<script>$(function(){$("img").removeAttr("alt");});</script>
-<div class="borad-topic-count">共有 <%=link_to @forum.memos.count %> 个贴子</div>
 <div style="padding-top: 10px">
   <% if memos.any? %>
       <% memos.each do |topic| %>
-          <table class="content-text-list">
-            <tr>
-              <td colspan="2" valign="top" style="width: 50px;">
-                <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%>
-              </td>
-              <td>
-                <table width="630px" border="0">
-                  <tr>
-                    <td valign="top" width="500px" class="<%= topic.sticky ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), forum_memo_path(topic.forum, topic) %></td>
-                    <td align="right" rowspan="3">
-                      <table class="borad-count">
-                        <tr>
-                          <td align="center" class="borad-count-digit"><%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic) %></td>
-                        </tr>
-                        <tr>
-                          <td align="center">回答</td>
-                        </tr>
-                      </table></td>
-                  </tr>
-                  <tr>
-                    <td colspan="2" ><span class="font_description">		</span></td>
-                  </tr>
-                  <tr>
-                    <td align="left" colspan="2" ><span class="font_lighter"><%= authoring topic.created_at, topic.author %>
-                      <span class="font_description2">
+          <div class="postDetailRow">
+            <div class="postDetailPortrait">
+              <!--<img src="images/homepageImage.jpg" width="50" height="50" alt="贴吧图片" /></a>-->
+              <%= link_to image_tag(url_to_avatar(topic.author), :width => 50,:height => 50,:alt => '贴吧图片'), user_path(topic.author) if topic.author%>
+            </div>
+            <div class="postDetailWrap">
+              <div class="postDetailTitle"><a href="<%= forum_memo_path(topic.forum, topic) %>" class="f14 linkGrey4 fb"><%=topic.subject%></a></div>
+              <div class="postDetailDes"><%= topic.content.html_safe%>
+                <!--<a href="javascript:void(0);" class="linkBlue2 underline ml8">显示全部</a>-->
+              </div>
               <% author = topic.last_reply.try(:author)%>
               <% if author%>
-                            最后回复：<%=link_to_user author %>
+                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
+                  <div class="postDetailDate"><%= format_date(topic.last_reply.created_at)%></div>
               <% end%>
-                      </span>
-                        <br />
-                    </span></td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
+
+            </div>
+            <div class="postDetailReply">
+              <a href="<%= forum_memo_path(topic.forum, topic)%>" class="postReplyIcon mr5" target="_blank"></a>
+              <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
+            </div>
+            <div class="cl"></div>
+          </div>
       <% end %>
-      <div class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></div>
+
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>

app/views/forums/create.js.erb

@@ -0,0 +1,6 @@
+<%if @save_flag%>
+$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
+$('#reorder_time').click();
+<%else%>
+ $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
+<%end %>

app/views/forums/delete_forum_tag.js.erb

@@ -0,0 +1,2 @@
+$("#forum_tag_list").html("<%= escape_javascript( render :partial=>'forum_tag_list',:locals=>{:forum=>@forum}) %>");
+$('#add_tag01').hide();

app/views/forums/edit.html.erb

@@ -1,4 +1,72 @@
-<!-- added by fq -->
-<h1>编辑讨论区</h1>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'new_user' %>
+<script>
+    $(function(){
+        document.getElementById('forum_name').onkeydown = function()
+        {
+            var n = 0;
+            var str = this.value;
+            for (i = 0; i < str.length; i++) {
+                var leg = str.charCodeAt(i);//ASCII码
+                if (leg > 255) {
+                    n += 2;
+                } else {
+                    n += 1;
+                }
+            }
+            if(n >= 160)
+                event.returnValue = false;
+        }
+    })
+
+    function check_and_submit(doc){
+        $("#error").html('').hide();
+        check_forum_name();
+        if(check_pass == false){
+            return;
+        }
+        if(  $("textarea[name='forum[name]']").val().trim() == "" &&  $("textarea[name='forum[description]']").val().trim()  != "" ){
+            $("#error").html("名称不能为空").show();
+            return;
+        } else if( $("textarea[name='forum[description]']").val().trim()  == "" && $("textarea[name='forum[name]']").val().trim() != "" ){
+            $("#error").html("描述不能为空").show();
+            return;
+        }else if($("textarea[name='forum[description]']").val().trim()  == "" && $("textarea[name='forum[name]']").val().trim() == ""){
+            $("#error").html("名称和描述不能为空").show();
+            return;
+        }
+        else{
+            doc.parent().parent().parent().submit();
+        }
+    }
+    var check_pass = true;
+    function check_forum_name(){
+        check_pass = true;
+        name = $("textarea[name='forum[name]']").val().trim();
+        if(name == '<%= @forum.name%>'){
+            return;
+        }
+        if( name != ""){
+            $.get(
+                    '<%= check_forum_name_forums_path %>',
+                    {"forum_name":name},
+                    function(data){
+
+                        if( data == 'true'){
+                            $("#error").html("贴吧名称已经存在").show();
+                            check_pass = false;
+                        }
+                    }
+            );
+        }else{
+            check_pass = false;
+        }
+    }
+</script>
 <%= render 'form_edit_mode' %>
+<script>
+    var textarea = document.getElementById('forum_name');
+    autoTextarea(textarea);
+    var textarea1 = document.getElementById('forum_desc');
+    autoTextarea(textarea1);
+</script>

app/views/forums/index.html.erb

@@ -1,48 +1,170 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<!-- added by fq -->
-<div class="top-content">
-	<table width="940px">
-		<tr>
-			<td class="info_font" style="width: 220px; color: #15bccf">公共贴吧 </td>
-			<td class="location-list">
-              <strong>
-                <%= l(:label_user_location) %> :
-              </strong>
-            </td>
-			<td rowspan="2"> 
-                <% if User.current.logged? %>
-                <%= link_to( l(:label_forum_new), new_forum_path, :class => 'icon icon-add') %>
+<%= javascript_include_tag 'new_user' %>
+<%= stylesheet_link_tag 'public'%>
+<script>
+  function add_class(id){
+      if($("#"+id).hasClass("sortArrowActiveD")){
+          $("#"+id).removeClass("sortArrowActiveD");
+          $("#"+id).addClass("sortArrowActiveU");
+          $.ajax({
+              type: 'GET',
+              url: '<%= forums_path %>' + '.js?' + id + '=asc&page='+<%= @forums_pages.page%>
+
+          });
+      }else if($("#"+id).hasClass("sortArrowActiveU")){
+          $("#"+id).removeClass("sortArrowActiveU");
+          $("#"+id).addClass("sortArrowActiveD");
+          $.ajax({
+              type: 'GET',
+              url: '<%= forums_path %>' + '.js?' + id + '=desc&page='+<%= @forums_pages.page%>
+
+          });
+      }else{
+          $("#"+id).addClass("sortArrowActiveD");
+          $.ajax({
+              type: 'GET',
+              url: '<%= forums_path %>' + '.js?' + id + '=desc&page='+<%= @forums_pages.page%>
+
+          });
+      }
+  }
+  $(function() {
+      $("#complex").click(function(){
+          $("#reorder_popu").removeClass("sortArrowActiveU");
+          $("#reorder_popu").removeClass("sortArrowActiveD");
+          $("#reorder_time").removeClass("sortArrowActiveD");
+          $("#reorder_time").removeClass("sortArrowActiveU");
+          add_class("reorder_complex");
+      });
+      $("#popu").click(function () {
+          $("#reorder_complex").removeClass("sortArrowActiveD");
+          $("#reorder_complex").removeClass("sortArrowActiveU");
+          $("#reorder_time").removeClass("sortArrowActiveD");
+          $("#reorder_time").removeClass("sortArrowActiveU");
+          add_class("reorder_popu");
+      });
+      $("#time").click(function () {
+          $("#reorder_complex").removeClass("sortArrowActiveD");
+          $("#reorder_complex").removeClass("sortArrowActiveU");
+          $("#reorder_popu").removeClass("sortArrowActiveU");
+          $("#reorder_popu").removeClass("sortArrowActiveD");
+          add_class("reorder_time");
+      });
+      document.getElementById('forum_name').onkeydown = function()
+      {
+          var n = 0;
+          var str = this.value;
+          for (i = 0; i < str.length; i++) {
+              var leg = str.charCodeAt(i);//ASCII码
+              if (leg > 255) {//大于255的都是中文
+                  n += 2;//如果是中文就是2个字节
+              } else {
+                  n += 1;//英文，不多说了
+              }
+          }
+          if(n >= 160 && event.keyCode != 8)
+              event.returnValue = false;
+      }
+  });
+  function check_and_submit(doc){
+      $("#error").html('').hide();
+      check_forum_name();
+    if(  $("textarea[name='forum[name]']").val().trim() == "" &&  $("textarea[name='forum[description]']").val().trim()  != "" ){
+        $("#error").html("名称不能为空").show();
+        return;
+    } else if( $("textarea[name='forum[description]']").val().trim()  == "" && $("textarea[name='forum[name]']").val().trim() != "" ){
+        $("#error").html("描述不能为空").show();
+        return;
+    }else if($("textarea[name='forum[description]']").val().trim()  == "" && $("textarea[name='forum[name]']").val().trim() == ""){
+        $("#error").html("名称和描述不能为空").show();
+        return;
+    }
+    else{
+        doc.parent().parent().submit();
+    }
+  }
+  var check_pass = true;
+  function check_forum_name(){
+      check_pass = true;
+      name = $("textarea[name='forum[name]']").val().trim();
+      if( name != ""){
+          $.get(
+              '<%= check_forum_name_forums_path %>',
+              {"forum_name":name},
+             function(data){
+
+                 if( data == 'true'){
+                     $("#error").html("贴吧名称已经存在").show();
+                     check_pass = false;
+                 }
+              }
+          );
+      }else{
+          check_pass = false;
+      }
+      if(check_pass == false){
+          return ;
+      }
+  }
+
+  function hideError(){
+      $("#error").html("").hide();
+  }
+
+  function create_cancle(){
+      $('#error').hide();
+      $('#new_forum_div').slideToggle();
+      $('#create_btn').parent().slideToggle();
+      clear_form();
+  }
+  function clear_form(){
+      $("#forum_name").val('');
+      $("#forum_desc").val('');
+  }
+</script>
+
+<div class="homepageContentContainer mb10">
+    <div class="homepageContent">
+    <div class="postContainer">
+     <div id="new_forum_div" class="mb5" style="display: none">
+       <div class="red fl mb10" id="error" style="display: none">error</div>
+       <%= form_tag({:controller => 'forums',:action=>'create',:format=>'js'},:method => 'post',:remote=>'true') do  |f| %>
+       <div class="mt15">
+         <textarea type="text" name="forum[name]"  id="forum_name"  class="postCreateInput" onfocus="hideError();" onblur="check_forum_name();" placeholder="输入贴吧名称"  ></textarea>
+         <script>
+           var textarea = document.getElementById('forum_name');
+               autoTextarea(textarea);
+         </script>
+       </div>
+       <div class="mt15">
+         <textarea type="text" name="forum[description]" id="forum_desc" class="postCreateInput"  placeholder="输入贴吧描述"></textarea>
+         <script>
+             var textarea1 = document.getElementById('forum_desc');
+             autoTextarea(textarea1);
+         </script>
+       </div>
+       <div class="mt10">
+         <div class="fr"><a href="javascript:void(0);" class="submit_btn" onclick="check_and_submit($(this));">确定</a></div>
+         <div class="fr"><a href="javascript:void(0);" class="linkGrey2 mr10" onclick="create_cancle();">取消</a><span class="mr10 fontGrey">或</span></div>
+         <div class="cl"></div>
+       </div>
        <% end %>
-			</td>
-			<td rowspan="2" width="250px" >
-				<div class="top-content-search">
-					<%#= form_tag(:controller => 'forums', :action => "search_forum", :method => :get) do %>
-					<%#= text_field_tag 'name', params[:name], :size => 20 %>
-					<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-					<%# end %>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="padding-left: 8px">
-              <a>
-                <%= link_to request.host()+"/forums", forums_path %>
-              </a>
-            </td>
-			<td >
-              <%= link_to l(:field_homepage), home_path %> >
-              <%= link_to "公共贴吧", forums_path %>
-            </td>
-		</tr>
-	</table>
-</div>
-<% if @forums.size > 0 %>
-  <%= render :partial => 'forums/forum_list', :locals => {:forums => @forums} %>
-<% else %>
-  <%= render :partial => "layouts/no_content" %>
-<% end %>
+     </div>
+    <div class="postBanner" id="postBanner">
+      <%= render :partial => 'post_banner' ,:locals => {:order_type=>@type,:order_str=>@str}%>
+      <!--<div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a><a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveD"></a></div>-->
+      <!--<div class="postSort" id="popu"><a href="javascript:void(0);" class="linkGrey2 fl">人气</a><a href="javascript:void(0)"  id="reorder_popu" ></a></div>-->
+      <!--<div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a><a href="javascript:void(0)"  id="reorder_time" ></a></div>-->
+      <!--<div class="creatPost"><a href="javascript:void(0);" id="create_btn" class="c_white db creatPostIcon bBlue" onclick="$('#error').hide();$('#new_forum_div').slideToggle();$(this).parent().slideToggle();">新建贴吧</a></div>-->
+      <!--<div class="cl"></div>-->
 
-<%html_title l(:label_forum)%>
+     </div>
+      <div id="forum_list">
+      <%= render :partial => 'forum_list',:locals => {:forums=>@forums}%>
+      </div>
+      <ul class="wlist fr" id="pages" style="margin-top: 10px;">
+        <%= pagination_links_full @forums_pages, @forums_count ,:per_page_links => true,:remote =>true,:flag=>true%>
+      </ul>
+    <div class="cl"></div>
+    </div>
+    </div>
+</div>

app/views/forums/index.js.erb

@@ -0,0 +1,4 @@
+//$("#postBanner").html("<%#= render :partial => 'post_banner' ,:locals => {:order_type=>@type,:order_str=>@str }%>");
+$("#forum_list").html("<%= escape_javascript(render :partial => 'forum_list',:locals => {:forums=>@forums}) %>");
+//这里出现一个问题竟然是单双引号引起的。注意！！
+$("#pages").html('<%= pagination_links_full @forums_pages, @forums_count,:per_page_links => false,:remote =>true,:flag=>true%>');

app/views/forums/show.html.erb

@@ -1,42 +1,144 @@
-<!-- added by fq -->
-<div id="add-memo" class='lz' style="<% unless @memo.errors.any?%>display: none;<% end %> padding: 20px;">
-  <h3>
-    <%=l(:label_memo_new)%>
-  </h3>
-  <% if User.current.logged? %>
-      <%= labelled_form_for(@memo, :url => create_memo_forum_path(@forum), :html => {:multipart => true} ) do |f|  %>
-          <div class="actions" style="max-width:680px">
-            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-            <p>
-              <%= f.text_field :subject, :required => true, :maxlength => 50%>
-            </p>
-            <p style="max-width:680px">
-              <%= f.kindeditor :content, :required => true %>
-            </p>
-            <!--<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script>-->
-            <p style="color: #ff0000">
-              (<%= l(:label_memos_max_length) %>)
-            </p>
-            <p class="fl" style="margin-top: 5px;">
-              <%= l(:label_attachment_plural) %>
-              <br />
-              <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
-            </p>
+<%= javascript_include_tag 'new_user' %>
+<script>
+    function add_class(id){
+        if($("#"+id).hasClass("sortArrowActiveD")){
+            $("#"+id).removeClass("sortArrowActiveD");
+            $("#"+id).addClass("sortArrowActiveU");
+            $.ajax({
+                type: 'GET',
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=asc&page='+<%= @topic_pages.page%>
+
+            });
+        }else if($("#"+id).hasClass("sortArrowActiveU")){
+            $("#"+id).removeClass("sortArrowActiveU");
+            $("#"+id).addClass("sortArrowActiveD");
+            $.ajax({
+               type: 'GET',
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
+
+            });
+        }else{
+            $("#"+id).addClass("sortArrowActiveD");
+            $.ajax({
+                type: 'GET',
+                url: '<%= forums_path+"/"+@forum.id.to_s %>' + '.js?' + id + '=desc&page='+<%= @topic_pages.page%>
+
+           });
+        }
+    }
+    $(function() {
+        $("#complex").click(function(){
+            $("#reorder_popu").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveU");
+            add_class("reorder_complex");
+        });
+        $("#popu").click(function () {
+            $("#reorder_complex").removeClass("sortArrowActiveD");
+            $("#reorder_complex").removeClass("sortArrowActiveU");
+            $("#reorder_time").removeClass("sortArrowActiveD");
+            $("#reorder_time").removeClass("sortArrowActiveU");
+            add_class("reorder_popu");
+        });
+        $("#time").click(function () {
+            $("#reorder_complex").removeClass("sortArrowActiveD");
+            $("#reorder_complex").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveU");
+            $("#reorder_popu").removeClass("sortArrowActiveD");
+            add_class("reorder_time");
+        });
+        <% if @errors %>
+            $('#create_memo_div').slideToggle();$('#create_memo_btn').slideToggle();
+            $("#error").html('<%= @errors.html_safe %>').show();
+        <% end %>
+    });
+
+    function check_and_submit(){
+        if(!check_memo_name()){
+            return;
+        }
+        if($("textarea[name='memo[subject]']").val().trim() != "" && $("textarea[name='memo[content]']").val().trim() != "" ){
+            $("#new_memo").submit();
+        }else if($("textarea[name='memo[subject]']").val().trim() == "" && $("textarea[name='memo[content]']").val().trim() != "" ){
+            $("#error").html("主题不能为空").show();
+        }else if($("textarea[name='memo[subject]']").val().trim() != "" && $("textarea[name='memo[content]']").val().trim() == ""){
+            $("#error").html("内容不能为空").show();
+        }
+    }
+
+    function check_memo_name(){
+        if($("#memo_subject").val().trim().length > 50){
+            $("#error").html("主题 过长（最长为 50 个字符）").show();
+            return false;
+        }
+        if($("#memo_content").val().trim().length > 5000){
+            $("#error").html("内容 过长（最长为 5000 个字符）").show();
+            return false;
+        }
+        return true;
+    }
+
+    function create_cancle(){
+        $('#create_memo_div').slideToggle();
+        $('#create_memo_btn').slideToggle();
+        $('#memo_subject').val('');
+        $('#memo_content').val('')
+        $('#error').html('').hide();
+    }
+</script>
+<div class="postRightContainer">
+  <div id="create_memo_div" style="display: none">
+    <div id="error" class="red fl mb10" style="display: none">error</div>
+    <%= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
+    <div>
+      <textarea type="text" name="memo[subject]" id="memo_subject" onblur="check_memo_name();" onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子标题"  ></textarea>
+      <script>
+          var textarea1 = document.getElementById('memo_subject');
+          autoTextarea(textarea1);
+      </script>
+    </div>
+    <div class="mt15">
+      <textarea type="text" name="memo[content]" id="memo_content"  onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子内容" /></textarea>
+      <script>
+          var textarea = document.getElementById('memo_content');
+          autoTextarea(textarea);
+      </script>
+    </div>
+    <div class="mt10">
+      <!--<a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>-->
+      <%= render :partial => 'file_form', :locals => {:container => @memo} %>
+      <div class="fr">
+        <a href="javascript:void(0);" class="submit_btn" onclick="check_and_submit();">确定</a>
+      </div>
+      <div class="fr"><a href="javascript:void(0);" class="linkGrey2 mr10" onclick="create_cancle();">取消</a><span class="mr10 fontGrey">或</span></div>
       <div class="cl"></div>
-            <%= f.submit :value => l(:label_memo_create) %>
-            <%= link_to l(:button_cancel), "#", :onclick => '$("#add-memo").hide(); return false;' %>
     </div>
     <% end %>
-  <% end %>
+  </div>
+  <div class="postDetailBanner">
+    <div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a><a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveD"></a><!--<a href="javascript:void(0);" class="sortArrowActiveD"></a>--></div>
+    <div class="postSort" id="popu"><a href="javascript:void(0);" class="linkGrey2 fl">人气</a><a href="javascript:void(0);"  id="reorder_popu" class=""></a></div>
+    <div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a><a href="javascript:void(0);" id="reorder_time" class=""></a></div>
+    <div class="creatPost" id="create_memo_btn"><a href="javascript:void(0);" class="c_white db creatPostIcon bBlue" onclick="$('#error').hide();$('#create_memo_div').slideToggle();$(this).parent().slideToggle();">发布新帖</a></div>
+    <div class="cl"></div>
+  </div>
+  <div id="topics_list">
+    <%= render :partial => 'show_topics',:locals => {:memos=>@memos}%>
+  </div>
+  <ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
+    <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
+  </ul>
+
+  <!--<div class="pageRoll">-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="linkBlue">上一页</a></div>-->
+    <!--<div class="pageCell pageCellActive"><a href="javascript:void(0);" class="c_white">1</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="fontBlue">2</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="fontBlue">3</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="fontBlue">...</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="fontBlue">14</a></div>-->
+    <!--<div class="pageCell"><a href="javascript:void(0);" class="linkBlue">下一页</a></div>-->
+  <!--</div>-->
+  <!--<div class="cl"></div>-->
+</div>
 </div>
-<!--modified by huang-->
-<span class="contextual-borad">
-  <%= link_to(image_tag('edit.png')+l(:label_forum_edit),{:action => 'edit', :id => @forum},  :method => 'get', :title => l(:button_edit)) if @forum.editable_by?(User.current) %>
-  <%= link_to(image_tag('delete.png')+'删除讨论区', {:action => 'destroy', :id => @forum}, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :title => l(:button_delete)
-      ) if @forum.destroyable_by?(User.current) %>
-</span>
-<span>
-	<%= link_to l(:label_memo_new_from_forum), new_forum_memo_path(@forum), :class => 'icon icon-add',
-                :onclick => 'showAndScrollTo("add-memo", "memo_subject"); return false;' if User.current.logged? %>
-</span>
-<%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %>

app/views/forums/show.js.erb

@@ -0,0 +1,2 @@
+$("#topics_list").html("<%= escape_javascript(render :partial => 'show_topics',:locals => {:memos=>@memos})%>")
+$("#pages").html('<%= pagination_links_full @topic_pages, @topic_count,:per_page_links => false,:remote =>true%>');

app/views/layouts/_footer.html.erb

@@ -5,7 +5,7 @@
       <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
       <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
       <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
-      <li class="fl"><a href="<%= forums_path %>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
+      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
 
     </ul>
   </div>