diff options
Diffstat (limited to 'app/views/devise')
-rw-r--r-- | app/views/devise/confirmations/new.html.haml | 14 | ||||
-rw-r--r-- | app/views/devise/mailer/confirmation_instructions.html.erb | 9 | ||||
-rw-r--r-- | app/views/devise/mailer/reset_password_instructions.html.erb | 8 | ||||
-rw-r--r-- | app/views/devise/mailer/unlock_instructions.html.erb | 7 | ||||
-rw-r--r-- | app/views/devise/passwords/edit.html.haml | 19 | ||||
-rw-r--r-- | app/views/devise/passwords/new.html.haml | 14 | ||||
-rw-r--r-- | app/views/devise/registrations/edit.html.erb | 28 | ||||
-rw-r--r-- | app/views/devise/registrations/new.html.haml | 3 | ||||
-rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 12 | ||||
-rw-r--r-- | app/views/devise/sessions/_new_ldap.html.haml | 4 | ||||
-rw-r--r-- | app/views/devise/sessions/new.html.haml | 18 | ||||
-rw-r--r-- | app/views/devise/shared/_links.erb | 19 | ||||
-rw-r--r-- | app/views/devise/shared/_omniauth_box.html.haml | 10 | ||||
-rw-r--r-- | app/views/devise/shared/_sign_in_link.html.haml | 5 | ||||
-rw-r--r-- | app/views/devise/shared/_signin_box.html.haml | 26 | ||||
-rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 27 | ||||
-rw-r--r-- | app/views/devise/unlocks/new.html.erb | 12 |
17 files changed, 0 insertions, 235 deletions
diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml deleted file mode 100644 index 970ba147111..00000000000 --- a/app/views/devise/confirmations/new.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -.login-box - .login-heading - %h3 Resend confirmation instructions - .login-body - = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| - .devise-errors - = devise_error_messages! - .clearfix.append-bottom-20 - = f.email_field :email, placeholder: 'Email', class: "form-control", required: true - .clearfix - = f.submit "Resend confirmation instructions", class: 'btn btn-success' - -.clearfix.prepend-top-20 - = render 'devise/shared/sign_in_link' diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb deleted file mode 100644 index c6fa8f0ee36..00000000000 --- a/app/views/devise/mailer/confirmation_instructions.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<p>Welcome <%= @resource.name %>!</p> - -<% if @resource.unconfirmed_email.present? %> - <p>You can confirm your email (<%= @resource.unconfirmed_email %>) through the link below:</p> -<% else %> - <p>You can confirm your account through the link below:</p> -<% end %> - -<p><%= link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token) %></p> diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb deleted file mode 100644 index 23b31da92d8..00000000000 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<p>Hello <%= @resource.email %>!</p> - -<p>Someone has requested a link to change your password, and you can do this through the link below.</p> - -<p><%= link_to 'Change your 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> diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb deleted file mode 100644 index 79d6c761d8f..00000000000 --- a/app/views/devise/mailer/unlock_instructions.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<p>Hello <%= @resource.email %>!</p> - -<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p> - -<p>Click the link below to unlock your account:</p> - -<p><%= link_to 'Unlock your account', unlock_url(@resource, unlock_token: @token) %></p> diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml deleted file mode 100644 index 56048e99c17..00000000000 --- a/app/views/devise/passwords/edit.html.haml +++ /dev/null @@ -1,19 +0,0 @@ -.login-box - .login-heading - %h3 Change your password - .login-body - = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| - .devise-errors - = devise_error_messages! - = f.hidden_field :reset_password_token - %div - = f.password_field :password, class: "form-control top", placeholder: "New password", required: true - %div - = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true - .clearfix - = f.submit "Change your password", class: "btn btn-primary" - -.clearfix.prepend-top-20 - %p - = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) - = render 'devise/shared/sign_in_link' diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml deleted file mode 100644 index e8820daf58f..00000000000 --- a/app/views/devise/passwords/new.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -.login-box - .login-heading - %h3 Reset password - .login-body - = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| - .devise-errors - = devise_error_messages! - .clearfix.append-bottom-20 - = f.email_field :email, placeholder: "Email", class: "form-control", required: true - .clearfix - = f.submit "Reset password", class: "btn-primary btn" - -.clearfix.prepend-top-20 - = render 'devise/shared/sign_in_link' diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb deleted file mode 100644 index f379e71ae5b..00000000000 --- a/app/views/devise/registrations/edit.html.erb +++ /dev/null @@ -1,28 +0,0 @@ -<h2>Edit <%= resource_name.to_s.humanize %></h2> - -<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> - <%= devise_error_messages! %> - - <div><%= f.label :email %><br /> - <%= f.email_field :email %></div> - - <div><%= f.label :name %><br /> - <%= f.text_field :name %></div> - - <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br /> - <%= f.password_field :password %></div> - - <div><%= f.label :password_confirmation %><br /> - <%= f.password_field :password_confirmation %></div> - - <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br /> - <%= f.password_field :current_password %></div> - -<div><%= f.submit "Update", class: "input_button" %></div> -<% end %> - -<h3>Cancel your account</h3> - -<p>Unhappy? <%= link_to "Cancel your account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>.</p> - -<%= link_to "Back", :back %> diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml deleted file mode 100644 index d3e37f7494c..00000000000 --- a/app/views/devise/registrations/new.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -= render 'devise/shared/signup_box' - -= render 'devise/shared/sign_in_link'
\ No newline at end of file diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml deleted file mode 100644 index 54a39726771..00000000000 --- a/app/views/devise/sessions/_new_base.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| - = f.text_field :login, class: "form-control top", placeholder: "Username or Email", autofocus: "autofocus" - = f.password_field :password, class: "form-control bottom", placeholder: "Password" - - if devise_mapping.rememberable? - .remember-me.checkbox - %label{for: "user_remember_me"} - = f.check_box :remember_me - %span Remember me - .pull-right - = link_to "Forgot your password?", new_password_path(resource_name) - %div - = f.submit "Sign in", class: "btn btn-save" diff --git a/app/views/devise/sessions/_new_ldap.html.haml b/app/views/devise/sessions/_new_ldap.html.haml deleted file mode 100644 index 812e22373a7..00000000000 --- a/app/views/devise/sessions/_new_ldap.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -= form_tag(user_omniauth_callback_path(server['provider_name']), id: 'new_ldap_user' ) do - = text_field_tag :username, nil, {class: "form-control top", placeholder: "#{server['label']} Login", autofocus: "autofocus"} - = password_field_tag :password, nil, {class: "form-control bottom", placeholder: "Password"} - = button_tag "#{server['label']} Sign in", class: "btn-save btn" diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml deleted file mode 100644 index 89e4e229ac0..00000000000 --- a/app/views/devise/sessions/new.html.haml +++ /dev/null @@ -1,18 +0,0 @@ -%div - - if signin_enabled? || ldap_enabled? - = render 'devise/shared/signin_box' - - -# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box - - if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable? - .clearfix.prepend-top-20 - = render 'devise/shared/omniauth_box' - - -# Signup only makes sense if you can also sign-in - - if signin_enabled? && signup_enabled? - .prepend-top-20 - = render 'devise/shared/signup_box' - - -# Show a message if none of the mechanisms above are enabled - - if !signin_enabled? && !ldap_enabled? && !(Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?) - %div - No authentication methods configured. diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb deleted file mode 100644 index 49e99e25c1d..00000000000 --- a/app/views/devise/shared/_links.erb +++ /dev/null @@ -1,19 +0,0 @@ -<%- if controller_name != 'sessions' %> - <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br /> -<% end -%> - -<%- if devise_mapping.registerable? && controller_name != 'registrations' && gitlab_config.signup_enabled %> - <%= link_to "Sign up", new_registration_path(resource_name) %><br /> -<% end -%> - -<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> -<%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn" %><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 -%> diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml deleted file mode 100644 index b647b906b71..00000000000 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -%p - %span.light - Sign in with - - providers = additional_providers - - providers.each do |provider| - %span.light - - if default_providers.include?(provider) - = link_to oauth_image_tag(provider), omniauth_authorize_path(resource_name, provider), class: 'oauth-image-link' - - else - = link_to provider.to_s.titleize, omniauth_authorize_path(resource_name, provider), class: "btn" diff --git a/app/views/devise/shared/_sign_in_link.html.haml b/app/views/devise/shared/_sign_in_link.html.haml deleted file mode 100644 index fafc4b82f53..00000000000 --- a/app/views/devise/shared/_sign_in_link.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -%p - %span.light - Already have login and password? - %strong - = link_to "Sign in", new_session_path(resource_name) diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml deleted file mode 100644 index c76574db457..00000000000 --- a/app/views/devise/shared/_signin_box.html.haml +++ /dev/null @@ -1,26 +0,0 @@ -.login-box - - if signup_enabled? - .login-heading - %h3 Existing user? Sign in - - else - .login-heading - %h3 Sign in - .login-body - - if ldap_enabled? - %ul.nav.nav-tabs - - @ldap_servers.each_with_index do |server, i| - %li{class: (:active if i.zero?)} - = link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab' - - if signin_enabled? - %li - = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab' - .tab-content - - @ldap_servers.each_with_index do |server, i| - %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero?)} - = render 'devise/sessions/new_ldap', server: server - - if signin_enabled? - %div#tab-signin.tab-pane - = render 'devise/sessions/new_base' - - - elsif signin_enabled? - = render 'devise/sessions/new_base' diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml deleted file mode 100644 index 9dc6aeffd59..00000000000 --- a/app/views/devise/shared/_signup_box.html.haml +++ /dev/null @@ -1,27 +0,0 @@ -.login-box - - if signin_enabled? - .login-heading - %h3 New user? Create an account - - else - .login-heading - %h3 Create an account - .login-body - = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| - .devise-errors - = devise_error_messages! - %div - = f.text_field :name, class: "form-control top", placeholder: "Name", required: true - %div - = f.text_field :username, class: "form-control middle", placeholder: "Username", required: true - %div - = f.email_field :email, class: "form-control middle", placeholder: "Email", required: true - .form-group.append-bottom-20#password-strength - = f.password_field :password, class: "form-control bottom", id: "user_password_sign_up", placeholder: "Password", required: true - %div - = f.submit "Sign up", class: "btn-create btn" - -.clearfix.prepend-top-20 - %p - %span.light Didn't receive a confirmation email? - = succeed '.' do - = link_to "Request a new one", new_confirmation_path(resource_name) diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb deleted file mode 100644 index f9277d1673f..00000000000 --- a/app/views/devise/unlocks/new.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -<h2>Resend unlock instructions</h2> - -<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> - - <div><%= f.label :email %><br /> - <%= f.email_field :email %></div> - - <div><%= f.submit "Resend unlock instructions" %></div> -<% end %> - -<%= render partial: "devise/shared/links" %> |