From 85055f2a8443c1fec7c15d8e979d9e84df1e2763 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 21 Apr 2016 09:39:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/blogs_controller.rb | 14 +++++++++++++-
 app/views/blogs/_article.html.erb   | 14 ++++++++++++--
 app/views/blogs/index.js.erb        |  0
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 app/views/blogs/index.js.erb

diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index 8ee153456..dcdb4846c 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -4,12 +4,20 @@ class BlogsController < ApplicationController
   def index
     @article = BlogComment.new
 
-    @topics = @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.updated_on desc")
+    @order, @b_sort = params[:order] || 1, params[:sort] || "desc"
+
+    sort_name = @order == 1 ? "created_on" : ""
+
+
+    @topics = @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.#{sort_name} #{@b_sort}")
 
     #分页
+
     @topics = paginateHelper @topics,10
     @page = (params['page'] || 1).to_i - 1
 
+
+
     respond_to do |format|
       format.html {render :layout=>'new_base_user'}
     end
@@ -62,4 +70,8 @@ class BlogsController < ApplicationController
   def find_user
     @user = User.find(params[:user_id])
   end
+
+  def blogsort
+
+  end
 end
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index cfc43ca47..7b8ccb5d3 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -2,8 +2,18 @@
   <h2 class="list-h2">博客列表</h2>
   <div class="category">
     <span class="grayTxt ">排序：</span>
-    <a href="#" class="sortTxt ">时间</a><a class="sortupbtn "></a>
-    <a href="#" class="sortTxt ">人气</a><a class="sortdownbtn "></a>
+
+
+    <%= link_to "时间", user_blog_sort_blog_path(:sort => @score, :order => 1, :search => " "), :class => "sortTxt", :remote => true %>
+    <% if @order == 1 %>
+        <%= link_to "", user_blog_sort_blog_path(:sort => @score, :order => 1, :search => " "), :class => "#{@score == 'desc' ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+    <% end %>
+
+    <%= link_to "人气", user_blog_sort_blog_path(:sort => @score, :order => 2, :search => " "), :class => "sortTxt", :remote => true %>
+    <% if @order == 2 %>
+        <%= link_to "", user_blog_sort_blog_path(:sort => @score, :order => 2, :search => " "), :class => "#{@score == 'desc' ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+    <% end %>
+
     <div class="cl"></div>
   </div>
   <div class="bloglistbox">
diff --git a/app/views/blogs/index.js.erb b/app/views/blogs/index.js.erb
new file mode 100644
index 000000000..e69de29bb