From 1084cda730b7604fc41dd33fd9d8e93c80b4e5ca Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 5 Dec 2014 11:37:37 +0800
Subject: [PATCH] =?UTF-8?q?#1665=20=E2=80=9C=E8=BD=AF=E4=BB=B6=E5=88=9B?=
 =?UTF-8?q?=E5=AE=A2=E2=80=9D=E9=93=BE=E6=8E=A5=E5=85=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=8A=A5404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/index.html.erb  | 14 ++++++++++----
 app/views/users/search.html.erb | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 65e1bf2f5..9b93c7f44 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -18,8 +18,12 @@
 	<%= form_tag( users_search_path, :method => :get, :id => 'search_user_form') do %>
 	<table width="940px">
 		<tr>
-			<td class="info_font" style="width: 220px; color: #15bccf" ><%= l(:label_software_user ) %></td>
-			<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
+			<td class="info_font" style="width: 220px; color: #15bccf" rowspan="2">
+              <%= l(:label_software_user ) %>
+            </td>
+			<td class="location-list">
+              <strong><%= l(:label_user_location) %> :</strong>
+            </td>
 			<td rowspan="2">				
 			</td>
 			<td rowspan="2" >	
@@ -35,8 +39,10 @@
 			</td>
 		</tr>
 		<tr>
-			<td style="padding-left: 8px"><a><%= link_to request.host()+"/users", :controller => 'users', :action => 'index' %> </a></td>
-	        <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_software_user), :controller => 'users', :action => 'index' %></td>
+	        <td >
+              <%=link_to l(:field_homepage), home_path %> >
+              <a><%= l(:label_software_user)%></a>
+            </td>
 		</tr>
 	</table>
 	<% end %>
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
index f8d5a7cf3..8586e59c5 100644
--- a/app/views/users/search.html.erb
+++ b/app/views/users/search.html.erb
@@ -14,8 +14,12 @@
   <%= form_tag( users_search_path, :method => :get, :id => 'search_user_form') do %>
 	<table width="940px">
 		<tr>
-			<td class="info_font" style="width: 220px; color: #15bccf "><%= l(:label_software_user ) %></td>
-			<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
+			<td class="info_font" style="width: 220px; color: #15bccf " rowspan="2">
+              <%= l(:label_software_user ) %>
+            </td>
+			<td class="location-list">
+              <strong><%= l(:label_user_location) %> :</strong>
+            </td>
 			<td rowspan="2">				
 			</td>
 			<td rowspan="2" >	
@@ -31,8 +35,10 @@
 			</td>
 		</tr>
 		<tr>
-			<td style="padding-left: 8px"><a><%= link_to request.host()+"/users", :controller => 'users', :action => 'index' %> </a></td>
-	        <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_software_user), :controller => 'users', :action => 'index' %></td>
+	        <td >
+              <%=link_to l(:field_homepage), home_path %> >
+              <a><%= l(:label_software_user)%></a>
+            </td>
 		</tr>
 	</table>
 </div>