Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[FIX]

  • Loading branch information...
commit f4a04e7d7df4b7a9e08155d899048993fb885c5c 1 parent 98768f2
@eladmeidar eladmeidar authored
View
37 app/views/admins/sessions/new.html.erb
@@ -1,15 +1,28 @@
-<h2>Sign in</h2>
+<div class="row">
+ <div class="span6">
+ <h2>Sign in as Administrator</h2>
+ <%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+ <div class="form-inputs">
+ <%= f.input :email, :required => false, :autofocus => true %>
+ <%= f.input :password, :required => false %>
+ <%= f.input :remember_me, :as => :boolean if devise_mapping.rememberable? %>
+ </div>
-<%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
- <div class="form-inputs">
- <%= f.input :email, :required => false, :autofocus => true %>
- <%= f.input :password, :required => false %>
- <%= f.input :remember_me, :as => :boolean if devise_mapping.rememberable? %>
- </div>
+ <div class="form-actions">
+ <%= f.button :submit, "Sign in" %>
+ </div>
+ <% end %>
- <div class="form-actions">
- <%= f.button :submit, "Sign in" %>
+ <%= render "admins/shared/links" %>
</div>
-<% end %>
-
-<%= render "admins/shared/links" %>
+ <div class="span6">
+ <h2>Sign in as a Fan</h2>
+ <p>
+ <a href="<%= user_omniauth_authorize_path(:facebook) %>" class="btn btn-primary btn-large">
+ <i class="icon-facebook-sign icon-large"></i>
+ &nbsp;
+ Sign in with Facebook
+ </a>
+ </p>
+ </div>
+</div>
View
16 app/views/users/confirmations/new.html.erb
@@ -0,0 +1,16 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+ <%= f.error_notification %>
+ <%= f.full_error :confirmation_token %>
+
+ <div class="form-inputs">
+ <%= f.input :email, :required => true, :autofocus => true %>
+ </div>
+
+ <div class="form-actions">
+ <%= f.button :submit, "Resend confirmation instructions" %>
+ </div>
+<% end %>
+
+<%= render "users/shared/links" %>
View
5 app/views/users/mailer/confirmation_instructions.html.erb
@@ -0,0 +1,5 @@
+<p>Welcome <%= @email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %></p>
View
8 app/views/users/mailer/reset_password_instructions.html.erb
@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>
View
7 app/views/users/mailer/unlock_instructions.html.erb
@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %></p>
View
19 app/views/users/passwords/edit.html.erb
@@ -0,0 +1,19 @@
+<h2>Change your password</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+ <%= f.error_notification %>
+
+ <%= f.input :reset_password_token, :as => :hidden %>
+ <%= f.full_error :reset_password_token %>
+
+ <div class="form-inputs">
+ <%= f.input :password, :label => "New password", :required => true, :autofocus => true %>
+ <%= f.input :password_confirmation, :label => "Confirm your new password", :required => true %>
+ </div>
+
+ <div class="form-actions">
+ <%= f.button :submit, "Change my password" %>
+ </div>
+<% end %>
+
+<%= render "users/shared/links" %>
View
15 app/views/users/passwords/new.html.erb
@@ -0,0 +1,15 @@
+<h2>Forgot your password?</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+ <%= f.error_notification %>
+
+ <div class="form-inputs">
+ <%= f.input :email, :required => true, :autofocus => true %>
+ </div>
+
+ <div class="form-actions">
+ <%= f.button :submit, "Send me reset password instructions" %>
+ </div>
+<% end %>
+
+<%= render "users/shared/links" %>
View
27 app/views/users/registrations/edit.html.erb
@@ -0,0 +1,27 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+ <%= f.error_notification %>
+
+ <div class="form-inputs">
+ <%= f.input :email, :required => true, :autofocus => true %>
+
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+ <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
+ <% end %>
+
+ <%= f.input :password, :autocomplete => "off", :hint => "leave it blank if you don't want to change it", :required => false %>
+ <%= f.input :password_confirmation, :required => false %>
+ <%= f.input :current_password, :hint => "we need your current password to confirm your changes", :required => true %>
+ </div>
+
+ <div class="form-actions">
+ <%= f.button :submit, "Update" %>
+ </div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %></p>
+
+<%= link_to "Back", :back %>
View
17 app/views/users/registrations/new.html.erb
@@ -0,0 +1,17 @@
+<h2>Sign up</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+ <%= f.error_notification %>
+
+ <div class="form-inputs">
+ <%= f.input :email, :required => true, :autofocus => true %>
+ <%= f.input :password, :required => true %>
+ <%= f.input :password_confirmation, :required => true %>
+ </div>
+
+ <div class="form-actions">
+ <%= f.button :submit, "Sign up" %>
+ </div>
+<% end %>
+
+<%= render "users/shared/links" %>
View
16 app/views/users/sessions/new.html.erb
@@ -0,0 +1,16 @@
+<!-- <h2>Sign in</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+ <div class="form-inputs">
+ <%= f.input :email, :required => false, :autofocus => true %>
+ <%= f.input :password, :required => false %>
+ <%= f.input :remember_me, :as => :boolean if devise_mapping.rememberable? %>
+ </div>
+
+ <div class="form-actions">
+ <%= f.button :submit, "Sign in" %>
+ </div>
+<% end %>
+<%= render "users/shared/links" %> -->
+
+<%= link_to "Sign in with Facebook", omniauth_authorize_path(:user, "facebook") %><br />
View
25 app/views/users/shared/_links.erb
@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+ <%= link_to "Sign in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+ <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+ <%- resource_class.omniauth_providers.each do |provider| %>
+ <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+ <% end -%>
+<% end -%>
View
16 app/views/users/unlocks/new.html.erb
@@ -0,0 +1,16 @@
+<h2>Resend unlock instructions</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
+ <%= f.error_notification %>
+ <%= f.full_error :unlock_token %>
+
+ <div class="form-inputs">
+ <%= f.input :email, :required => true, :autofocus => true %>
+ </div>
+
+ <div class="form-actions">
+ <%= f.button :submit, "Resend unlock instructions" %>
+ </div>
+<% end %>
+
+<%= render "users/shared/links" %>
View
6 config/routes.rb
@@ -19,7 +19,11 @@
devise_for :admins
devise_scope :admin do
- root to: "devise/sessions#new", as: :admin_root
+ #root to: "devise/sessions#new", as: :admin_root
+ end
+
+ devise_scope :user do
+ root to: "teams#show", as: :user_root
end
namespace :admin do
Please sign in to comment.
Something went wrong with that request. Please try again.