diff --git a/app/views/devise/sessions/new.slim b/app/views/devise/sessions/new.slim index cab2dac..990a2a5 100644 --- a/app/views/devise/sessions/new.slim +++ b/app/views/devise/sessions/new.slim @@ -9,61 +9,64 @@ ' upload. We just want to avoid publishing inappropriate images. p - ' If you decide to login you will be able to manage your own - ' uploads at any time. And others can see how much you contributed already. - ' In addition once your first screenshot is approved you will be able - ' to upload further screenshots without moderation. - ' We have made it easy for both you and us. There is no registration here. - ' Just use any of the below services to log in. + ' Currently this login page is only used for moderators who deal with + ' new uploads. It is planned however to allow login for everyone so that + ' you can manage your own uploads. + + / p + / ' If you decide to login you will be able to manage your own + / ' uploads at any time. And others can see how much you contributed already. + / ' In addition once your first screenshot is approved you will be able + / ' to upload further screenshots without moderation. + / ' We have made it easy for both you and us. There is no registration here. + / ' Just use any of the below services to log in. - 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. + / 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. -.grid-container - .text-center +/ .grid-container +/ .text-center - // Alternative way to display buttons without images. (Amazon wants their own button though.) - / p - / = link_to (fa_icon 'google', text: '- Login with Google'), user_google_oauth2_omniauth_authorize_path, class: 'button secondary large' - / p - / = link_to (fa_icon 'github', text: '- Login with Google'), user_google_oauth2_omniauth_authorize_path, class: 'button secondary large' +/ // Alternative way to display buttons without images. (Amazon wants their own button though.) +/ / p +/ / = link_to (fa_icon 'google', text: '- Login with Google'), user_google_oauth2_omniauth_authorize_path, class: 'button secondary large' +/ / p +/ / = link_to (fa_icon 'github', text: '- Login with Google'), user_google_oauth2_omniauth_authorize_path, class: 'button secondary large' - 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 +/ 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 - hr +hr -.grid-container - = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| - = f.hidden_field :provider, value: 'local' - .small-2.cell - b Admin only… - .small-5.cell - = f.email_field :email, autofocus: true, placeholder: 'email address' += form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| + = f.hidden_field :provider, value: 'local' - .small-4.cell - = f.password_field :password, autocomplete: "off", placeholder: 'password' + .grid-x.grid-padding-x.align-center + .cell.small-4 + h4.text-center Moderators + label for="sign-in-form-username" Login + = f.email_field :email, autofocus: true, placeholder: 'email address', class: 'sign-in-form-username' + label for="sign-in-form-password" Password + = f.password_field :password, autocomplete: "off", placeholder: 'password', class: 'sign-in-form-password' + = f.submit "Sign in", class: 'button' - .small-1.cell - = f.submit "Log in", class: 'button' - - / - if devise_mapping.rememberable? - / .small-6.cell - / = f.check_box :remember_me - / .small-6.cell - / = f.label :remember_me + / - if devise_mapping.rememberable? + / .small-6.cell + / = f.check_box :remember_me + / .small-6.cell + / = f.label :remember_me - / = render "devise/shared/links" + / = render "devise/shared/links"