diff --git a/app/views/devise/sessions/new.slim b/app/views/devise/sessions/new.slim index 8c05d51..cf9ba23 100644 --- a/app/views/devise/sessions/new.slim +++ b/app/views/devise/sessions/new.slim @@ -1,58 +1,55 @@ -// Login form +// Login form (sign_in) .row - .small-6.columns.small-centered + .small-8.columns.small-centered div.callout.primary p - ' This site yet only uses user accounts for moderators to manage screenshots. - ' It is planned however to allow you to register and manager your own uploads - ' more easily. Please have a little patience - thanks. + ' You are not required to log in to upload new screenshots. + ' It makes it easier to keep track of your uploads though. + ' And others can see how much you contributed already. + ' Please use any of the below services to log you in. + ' You do not need to create an account at this site. - h2 Login (Moderators only) - = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| - .small-6.columns - = f.label :email - .small-6.columns - = f.email_field :email, autofocus: true + p + ' If you are associated to the Debian project you will + ' automatically be recognized if you have a certificate + ' from the + a href='https://sso.debian.org/' Debian SSO + ' installed in your browser. - .small-6.columns - = f.label :password - .small-6.columns - = f.password_field :password, autocomplete: "off" +.row + .text-center + p + = link_to image_tag('/images/sso/google.png'), user_google_oauth2_omniauth_authorize_path + p + = link_to image_tag('/images/sso/github.png'), user_github_omniauth_authorize_path + p + = link_to image_tag('/images/sso/stackexchange.png'), user_stackexchange_omniauth_authorize_path + p + = link_to image_tag('/images/sso/launchpad.png'), user_launchpad_omniauth_authorize_path + p + = link_to image_tag('/images/sso/amazon.png'), user_amazon_omniauth_authorize_path - / - if devise_mapping.rememberable? - / .small-6.columns - / = f.check_box :remember_me - / .small-6.columns - / = f.label :remember_me + hr + +.row + = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| + .small-2.columns + b Admin only… + .small-5.columns + = f.email_field :email, autofocus: true, placeholder: 'email address' + .small-4.columns + = f.password_field :password, autocomplete: "off", placeholder: 'password' + + .small-1.columns = f.submit "Log in", class: 'button' - / = render "devise/shared/links" + / - if devise_mapping.rememberable? + / .small-6.columns + / = f.check_box :remember_me + / .small-6.columns + / = f.label :remember_me -/ h1 Experimental SSL certificate Debian SSO auth -/ -/ = link_to 'log in using your secure certificate', users_debian_sso_path -/ = link_to "Sign in with Launchpad", user_launchpad_omniauth_authorize_path -/ = link_to "Sign in with Google", user_google_oauth2_omniauth_authorize_path - -= link_to "Sign in with Launchpad", user_launchpad_omniauth_authorize_path -= link_to "Sign in with StackExchange", user_stackexchange_omniauth_authorize_path -= link_to "Sign in with Google", user_google_oauth2_omniauth_authorize_path -= link_to "Sign in with Amazon", user_amazon_omniauth_authorize_path -= link_to "Sign in with Github", user_github_omniauth_authorize_path - -/ div -/ = link_to image_tag('/images/sso/google.png'), user_google_oauth2_omniauth_authorize_path - -/ div -/ = link_to "google new", user_google_omniauth_authorize_path - -/ -/ div -/ = link_to image_tag('/images/sso/amazon.png'), user_amazon_omniauth_authorize_path -/ -/ div -/ stackexchange -/ + / = render "devise/shared/links"