update authentication system to Devise
This commit is contained in:
@ -33,12 +33,6 @@
|
||||
<div class="col-sm-8 col-xs-8"><%= f.password_field :password, :class => 'form-control' %></div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 col-xs-4 control-label"><%= t(:password_confirmation) %></label>
|
||||
<div class="col-sm-8 col-xs-8"><%= f.password_field :password_confirmation, :class => 'form-control' %></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 col-xs-4 control-label"><%= t(:password_current) %></label>
|
||||
<div class="col-sm-8 col-xs-8"><%= f.password_field :password_current, :class => 'form-control' %></div>
|
||||
|
@ -11,7 +11,7 @@
|
||||
</tr>
|
||||
<% end %>
|
||||
</table>
|
||||
<br />
|
||||
<br>
|
||||
<%= will_paginate @channels %>
|
||||
<% else %>
|
||||
<%= t(:user_no_public_channels) %>
|
||||
|
@ -1,17 +1,17 @@
|
||||
<% if @user.public_flag == true %>
|
||||
|
||||
<div class="FR">
|
||||
<br /><br />
|
||||
<br><br>
|
||||
<%= gravatar_tag @user, :default => 'wavatar', :secure => true %>
|
||||
</div>
|
||||
|
||||
<h2><%= t(:profile_for) %> <%= @user.login %></h2>
|
||||
<%= link_to t(:channels_public_view), list_channels_path(@user.login) %>
|
||||
<br /><br />
|
||||
<br><br>
|
||||
<%= t(:member_since) %> <%= @user.created_at.strftime('%B %-d, %Y') %>
|
||||
<br /><br />
|
||||
<br><br>
|
||||
<%= t(:profile_website) %>: <%= link_to @user.website, @user.website %>
|
||||
<br /><br />
|
||||
<br><br>
|
||||
<%= t(:profile_bio) %>: <%= @user.bio %>
|
||||
|
||||
<% else %>
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
<div class="col-pad">
|
||||
<%= link_to t(:account_edit), edit_account_path, :class => 'btn btn-primary btn-sm' %>
|
||||
<br /><br />
|
||||
<br><br>
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td><%= t(:userid) %></td>
|
||||
@ -29,13 +29,13 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<br /><br />
|
||||
<br><br>
|
||||
<h4 class="breadcrumb"><%= t(:public_profile) %></h4>
|
||||
<div class="col-pad">
|
||||
<%= link_to t(:profile_edit), edit_profile_path, :class => 'btn btn-primary btn-sm' %>
|
||||
<br /><br />
|
||||
<br><br>
|
||||
<%= link_to t(:profile_view), user_profile_path(@user.login) %>
|
||||
<br /><br />
|
||||
<br><br>
|
||||
<% if @user.public_flag %>
|
||||
<table class="table">
|
||||
<tr>
|
||||
|
Reference in New Issue
Block a user