qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改bug<admin删除用户出错> 

Signed-off-by: alan <547533434@qq.com>
This commit is contained in:
alan 2014-11-20 17:08:10 +08:00
parent 972b788687
commit cb7cd581f6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/account/register.html.erb
View File

@ -22,12 +22,12 @@
<p><%= f.password_field :password, :size => 25, :required => true %> <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> <em class="info" style="color: #acaeb1"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
</p> </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 %> <% end %>
<p> <p>
<%= f.text_field :mail,:size => 25, :required => true %> <%= f.text_field :mail,:size => 25, :required => true %>
<span id="valid_user_mail"></span> <span id="valid_user_mail" ></span>
</p> </p>
<p> <p>
<em class="info" style="color: #acaeb1"> <em class="info" style="color: #acaeb1">

2
app/views/admin/search.html.erb
View File

@ -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="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 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) %> <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> </tr>
<% end -%> <% end -%>
</tbody> </tbody>

2
public/stylesheets/nyan.css
View File

@ -15,7 +15,7 @@ span[id^=valid_user] {
} }
.red { .red {
color: red;margin-left: 10px;margin-right: 10px;text-align: right; color: red;margin-right: 10px;text-align: right;
} }
.green { .green {