From cb7cd581f6a14c1101919dc66757cf4b9f034d6e Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 20 Nov 2014 17:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug<admin=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=87=BA=E9=94=99>=20Signed-off-by:=20alan?=
 =?UTF-8?q?=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/register.html.erb | 4 ++--
 app/views/admin/search.html.erb     | 2 +-
 public/stylesheets/nyan.css         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index 32940d111..21bdd8fa7 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -22,12 +22,12 @@
           <p><%= f.password_field :password, :size => 25, :required => true %>
             <em class="info" style="color: #acaeb1"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
           </p>
-          <p><%= f.password_field :password_confirmation, :size => 25, :required => true %><span id="valid_password"></span></p>
+          <p><%= f.password_field :password_confirmation, :size => 25, :required => true %><span id="valid_password" style="padding-left: 10px;"></span></p>
       <% end %>
 
       <p>
         <%= f.text_field :mail,:size => 25, :required => true %>
-        <span id="valid_user_mail"></span>
+        <span id="valid_user_mail" ></span>
       </p>
       <p>
         <em class="info" style="color: #acaeb1">
diff --git a/app/views/admin/search.html.erb b/app/views/admin/search.html.erb
index 758c7b32f..320fce125 100644
--- a/app/views/admin/search.html.erb
+++ b/app/views/admin/search.html.erb
@@ -54,7 +54,7 @@
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
               <td  class="buttons"> <%= change_status_link(user) %>
-                <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
+                <%= delete_link user_path(user, :back_url => admin_search_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>
         </tbody>
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 27e8a367e..10dbededb 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -15,7 +15,7 @@ span[id^=valid_user] {
 }
 
 .red {
-    color: red;margin-left: 10px;margin-right: 10px;text-align: right;
+    color: red;margin-right: 10px;text-align: right;
 }
 
 .green {