diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 689791a..0b6692c 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,12 +1,28 @@ -

<%= t('.forgot_your_password', :default => 'Forgot your password?') %>

+
+

<%= t('.forgot_your_password', :default => 'Forgot your password?') %>

+
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> -
<%= f.label :email %>
- <%= f.email_field :email %>
+
+
+
+
+ <%= f.label :email, class: "control-label" %> + <%= f.email_field :email, autofocus: true, class: 'text-field form-control' %> +
+
+

+ The same email address used to sign up. +

+
+
+
+
-
<%= f.submit t('.send_me_reset_password_instructions', :default => "Send me reset password instructions") %>
+
+ <%= f.submit t('.send_me_reset_password_instructions', :default => "Send me reset password instructions"), class: 'btn btn-warning' %> + <%= render "devise/shared/links" %> +
<% end %> - -<%= render "devise/shared/links" %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 144a874..08cb0d9 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,30 +1,83 @@ -

<%= t('.title', :resource => resource_class.model_name.human , :default => "Edit #{resource_name.to_s.humanize}") %>

+
+

<%= t('.title', :resource => resource_class.model_name.human , :default => "Edit #{resource_name.to_s.humanize}") %>

<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> <%= devise_error_messages! %> -
<%= f.label :email %>
- <%= f.email_field :email %>
+
+
+
+
+ <%= f.label :name, class: 'control-label' %>
+ <%= f.email_field :name, :autofocus => true, class: 'text-field form-control' %> +
+
+

+ Your full name. +

+
+
+
+
+ <%= f.label :email, class: 'control-label' %>
+ <%= f.email_field :email, class: 'text-field form-control' %> + <%- if devise_mapping.confirmable? && resource.pending_reconfirmation? -%> +

+ <%= t('.currently_waiting_confirmation_for_email', :email => resource.unconfirmed_email, :default => "Currently waiting confirmation for: %{email}") %> +

+ <%- end -%> +
+
+

+ Your email is our communication channel. Make sure you have typed it correctly. +

+
+
- <%- if devise_mapping.confirmable? && resource.pending_reconfirmation? -%> -

- <%= t('.currently_waiting_confirmation_for_email', :email => resource.unconfirmed_email, :default => "Currently waiting confirmation for: %{email}") %> -

- <%- end -%> +
+
+ <%= f.label :password, class: 'control-label' %> (<%= t('.leave_blank_if_you_don_t_want_to_change_it', :default => "leave blank if you don't want to change it") %>)
+ <%= f.password_field :password, :autocomplete => "off", class: 'text-field form-control' %> +
+
+

+ Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters. +

+
+
-
<%= f.label :password %> (<%= t('.leave_blank_if_you_don_t_want_to_change_it', :default => "leave blank if you don't want to change it") %>)
- <%= f.password_field :password, :autocomplete => "off" %>
+
+
+ <%= f.label :password_confirmation, class: 'control-label' %>
+ <%= f.password_field :password_confirmation, class: 'text-field form-control' %> +
+
+

+ Confirm your password. +

+
+
-
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
+
+
+ <%= f.label :current_password, class: 'control-label' %> (<%= t('.we_need_your_current_password_to_confirm_your_changes', :default => 'we need your current password to confirm your changes') %>)
+ <%= f.password_field :current_password, class: 'text-field form-control' %> +
+
+

+ Your current password is needed to confirm your changes. +

+
+
-
<%= f.label :current_password %> (<%= t('.we_need_your_current_password_to_confirm_your_changes', :default => 'we need your current password to confirm your changes') %>)
- <%= f.password_field :current_password %>
- -
<%= f.submit t('.update', :default => "Update") %>
+
+ <%= f.submit t('.update', :default => "Update"), class: 'btn btn-primary col-md-2' %> +
+
+
<% end %> -

<%= t('.cancel_my_account', :default => 'Cancel my account') %>

+

<%= t('.cancel_my_account', :default => 'Cancel my account') %>

<%= t('.unhappy', :default => 'Unhappy') %>? <%= link_to t('.cancel_my_account', :default => "Cancel my account"), registration_path(resource_name), :data => { :confirm => t('.are_you_sure', :default => "Are you sure?") }, :method => :delete %>.

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 47a1247..aa76673 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,18 +1,63 @@ -

<%= t('.sign_up', :default => "Sign up") %>

+
+

<%= t('.sign_up', :default => "Sign up") %>

+
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> <%= devise_error_messages! %> -
<%= f.label :email %>
- <%= f.email_field :email %>
+
+
+
+
+ <%= f.label :name, class: 'control-label' %>
+ <%= f.text_field :name, :autofocus => true, class: 'text-field form-control' %> +
+
+

+ Your full name. +

+
+
-
<%= f.label :password %>
- <%= f.password_field :password %>
+
+
+ <%= f.label :email, class: 'control-label' %>
+ <%= f.email_field :email, class: 'text-field form-control' %> +
+
+

+ Your email is our communication channel. Make sure you have typed it correctly. +

+
+
-
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
+
+
+ <%= f.label :password, class: 'control-label' %>
+ <%= f.password_field :password, class: 'text-field form-control' %> +
+
+

+ Your password must have at least 8 characters. Strong passwords contain numbers, symbols, upper and lowercase characters. +

+
+
-
<%= f.submit t('.sign_up', :default => "Sign up") %>
-<% end %> +
+
+ <%= f.label :password_confirmation, class: 'control-label' %>
+ <%= f.password_field :password_confirmation, class: 'text-field form-control' %> +
+
+

+ Confirm your password. +

+
+
+
+
-<%= render "devise/shared/links" %> +
+ <%= f.submit t('.sign_up', :default => "Sign up"), class: 'btn btn-primary col-md-2' %> +
+<% end %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index a54f3ad..a1ae9ef 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,17 +1,51 @@ -

<%= t('.sign_in', :default => "Sign in") %>

+
+

<%= t('.sign_in', :default => "Sign in") %>

+
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> -
<%= f.label :email %>
- <%= f.email_field :email %>
+
+
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email %> +
+
+

+ The same email address used to sign up. +

+
+
-
<%= f.label :password %>
- <%= f.password_field :password %>
+
+
+ <%= f.label :password %>
+ <%= f.password_field :password %> +
+
+

+ If you forgot your password, follow this link to reset it. +

+
+
- <% if devise_mapping.rememberable? -%> -
<%= f.check_box :remember_me %> <%= f.label :remember_me %>
- <% end -%> + <% if devise_mapping.rememberable? -%> +
+
+ <%= f.check_box :remember_me %> <%= f.label :remember_me %> +
+
+

+ Stay logged in. +

+
+
+ <% end -%> +
+
-
<%= f.submit t('.sign_in', :default => "Sign in") %>
+
+ <%= f.submit t('.sign_in', :default => "Sign in"), class: 'btn btn-primary', :tabindex => 3 %> + <%= render "devise/shared/links" %> +
<% end %> - -<%= render "devise/shared/links" %> diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb index 37c72f7..6a1e05d 100644 --- a/app/views/devise/shared/_links.erb +++ b/app/views/devise/shared/_links.erb @@ -1,25 +1,25 @@ <%- if controller_name != 'sessions' %> -<%= link_to t(".sign_in", :default => "Sign in"), new_session_path(resource_name) %>
+<%= link_to t(".sign_in", :default => "Sign in"), new_session_path(resource_name), class: 'btn btn-info' %> <% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> -<%= link_to t(".sign_up", :default => "Sign up"), new_registration_path(resource_name) %>
+<%= link_to t(".sign_up", :default => "Sign up"), new_registration_path(resource_name), class: 'btn btn-info' %> <% end -%> -<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> -<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %>
-<% end -%> + <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> -<%= link_to t('.didn_t_receive_confirmation_instructions', :default => "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %>
+<%= link_to t('.didn_t_receive_confirmation_instructions', :default => "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name), class: 'btn btn-info' %> <% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> -<%= link_to t('.didn_t_receive_unlock_instructions', :default => "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %>
+<%= link_to t('.didn_t_receive_unlock_instructions', :default => "Didn't receive unlock instructions?"), new_unlock_path(resource_name), class: 'btn btn-info' %> <% end -%> <%- if devise_mapping.omniauthable? %> <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to t('.sign_in_with_provider', :provider => provider.to_s.titleize, :default => "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider) %>
+ <%= link_to t('.sign_in_with_provider', :provider => provider.to_s.titleize, :default => "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider), class: 'btn btn-info' %> <% end -%> <% end -%> \ No newline at end of file -- libgit2 0.21.2