From 299d02ebe8af91bbcf68b55e046540e416cadca5 Mon Sep 17 00:00:00 2001
From: huangjingquan <huang@163.com>
Date: Mon, 12 Aug 2013 23:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 0734a75e9..07ffffd1d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -91,12 +91,13 @@
 	
 	
 	<% end %>
-	<% else %>
-	<%= l(:label_user_activities) %>
-</div>
+	</div>
 <div class="pagination" style="float:left;">
 	<ul>
 		<%= pagination_links_full @activity_pages %>
 		<ul>
 </div>
+	<% else %>
+	<%= l(:label_user_activities) %>
+
 <% end %>
\ No newline at end of file