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

Merge 30b9d8cf96 into d3e0066f88

Browse source
This commit is contained in:
Stella Rouzi 2015-04-23 14:56:39 +00:00
commit 53d52e01b9
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

@ -10,6 +10,13 @@
= render partial: 'devise/shared/sign_up_fields', locals: { u: f}
%p.text-right
= 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?
.row
.col-md-4
@ -23,8 +30,3 @@
.col-md-12
#openidlinks
= 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
.col-md-6.col-md-offset-3
.panel.panel-default
.panel-heading
%h3.panel-title
Sign In
.panel-body
= semantic_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
= f.input :login
= f.input :password
- if devise_mapping.rememberable?
%p.text-right.small
= f.label 'Remember me'
= f.check_box :remember_me
%p.text-right
= f.action :submit, as: :button, label: 'Sign In', button_html: {class: 'btn btn-success'}
- unless omniauth_configured.empty?
.row
.col-md-4
%hr
.col-md-4
%h4.text-center
or sign in using
.col-md-4
%hr
.container
.row
.col-md-6.col-md-offset-3
.panel.panel-default
.panel-heading
%h3.panel-title
Sign In
.panel-body
= semantic_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
= f.input :login
= f.input :password
- if devise_mapping.rememberable?
%p.text-right.small
= f.label 'Remember me'
= f.check_box :remember_me
%p.text-right
= f.action :submit, as: :button, label: 'Sign In', button_html: {class: 'btn btn-success'}
.row
.col-md-12
#openidlinks
= 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'
- 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'