gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show Help Link even when openID is disabled. Put sign_in data under .container

Browse source
This commit is contained in:
Stella Rouzi 2015-04-06 14:55:16 +03:00
parent 3bd82039ad
commit 30b9d8cf96
2 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/devise/registrations/new.html.haml
View file

@ -14,6 +14,13 @@
= f.input :password_confirmation = f.input :password_confirmation
%p.text-right %p.text-right
= f.action :submit, as: :button, label: 'Sign Up', button_html: {class: 'btn btn-success' } = f.action :submit, as: :button, label: 'Sign Up', button_html: {class: 'btn btn-success' }
.row
.col-md-12
%p.text-right
%a.small{"data-toggle" => "collapse", "data-target" => "#devise-help"}
Need Help?
#devise-help.collapse
= render 'devise/shared/links'
- unless omniauth_configured.empty? - unless omniauth_configured.empty?
.row .row
.col-md-4 .col-md-4
@ -27,8 +34,3 @@
.col-md-12 .col-md-12
#openidlinks #openidlinks
= render 'devise/shared/openid' = render 'devise/shared/openid'
%p.text-right
%a.small{"data-toggle" => "collapse", "data-target" => "#devise-help"}
Need Help?
#devise-help.collapse
= render 'devise/shared/links'

57
app/views/devise/sessions/new.html.haml
View file

@ -1,34 +1,37 @@
.row .container
.col-md-6.col-md-offset-3 .row
.panel.panel-default .col-md-6.col-md-offset-3
.panel-heading .panel.panel-default
%h3.panel-title .panel-heading
Sign In %h3.panel-title
.panel-body Sign In
= semantic_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| .panel-body
= f.input :login = semantic_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
= f.input :password = f.input :login
- if devise_mapping.rememberable? = f.input :password
%p.text-right.small - if devise_mapping.rememberable?
= f.label 'Remember me' %p.text-right.small
= f.check_box :remember_me = f.label 'Remember me'
%p.text-right = f.check_box :remember_me
= f.action :submit, as: :button, label: 'Sign In', button_html: {class: 'btn btn-success'} %p.text-right
- unless omniauth_configured.empty? = f.action :submit, as: :button, label: 'Sign In', button_html: {class: 'btn btn-success'}
.row
.col-md-4
%hr
.col-md-4
%h4.text-center
or sign in using
.col-md-4
%hr
.row .row
.col-md-12 .col-md-12
#openidlinks
= render 'devise/shared/openid'
%p.text-right %p.text-right
%a.small{"data-toggle" => "collapse", "data-target" => "#devise-help"} %a.small{"data-toggle" => "collapse", "data-target" => "#devise-help"}
Need Help? Need Help?
#devise-help.collapse #devise-help.collapse
= render 'devise/shared/links' = render 'devise/shared/links'
- unless omniauth_configured.empty?
.row
.col-md-4
%hr
.col-md-4
%h4.text-center
or sign in using
.col-md-4
%hr
.row
.col-md-12
#openidlinks
= render 'devise/shared/openid'