From c05b1f5959d7f7664ac6e6b424aa93e8c44a6395 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 23 Sep 2015 09:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=B8=96=E5=AD=90=20?=
 =?UTF-8?q?=E5=92=8C=E5=9B=9E=E5=A4=8D=20=E8=AE=A1=E7=AE=97=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_forum_list.html.erb  | 4 ++--
 app/views/forums/index.html.erb        | 2 +-
 app/views/layouts/base_forums.html.erb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index a17314173..fbbe023a0 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -17,7 +17,7 @@
             <div class="postStatics">
               <div>
                 <!--<a href="javascript:void(0);" class="linkGrey5 fb">280</a>-->
-                    <%= link_to (forum.memo_count), forum_path(forum),:class=>"linkGrey5 fb" %>
+                    <%= link_to ( forum.topic_count), forum_path(forum),:class=>"linkGrey5 fb" %>
               </div>
               <div>帖子</div>
             </div>
@@ -25,7 +25,7 @@
             <div class="postStatics mr20">
               <div>
                 <!--<a href="javascript:void(0);" class="linkGrey5 fb">335</a>-->
-                <%= link_to (forum.topic_count), forum_path(forum),:class=>"linkGrey5 fb" %>
+                <%= link_to (forum.memo_count), forum_path(forum),:class=>"linkGrey5 fb" %>
               </div>
               <div>回答</div>
             </div>
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index aeb0e1654..429be7ff0 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -150,7 +150,7 @@
       <%= 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 => false,:remote =>true,:flag=>true%>
+        <%= pagination_links_full @forums_pages, @forums_count ,:per_page_links => true,:remote =>true,:flag=>true%>
       </ul>
     <div class="cl"></div>
     </div>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 703d9b616..855d9031c 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -95,7 +95,7 @@
             <div class="fl">
               <div class="f16 fontBlue mb10"><a href="<%= forums_path+"/"+@forum.id.to_s%>"><%= @forum.name%></a></div>
               <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= @forum.creator.name%></a></div>
-              <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5"><%= @forum.topic_count%></a> 帖子：<a href="javascript:void(0);" class="linkOrange"><%= @forum.memo_count%></a></div>
+              <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange"><%=@forum.topic_count%></a></div>
             </div>
             <div class="cl"></div>
             <div class="fontGrey2 mt10"><span id="forum_desc_span"><%= @forum.description%></span>