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

Merge pull request #639 from differentreality/devise_partials

Browse source 
Move common views to partial
This commit is contained in:
Stella Rouzi 2015-06-12 12:30:51 +03:00
commit 0013a3a814
19 changed files with 180 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/views/conference_registrations/_form.html.haml
View file

@ -19,9 +19,8 @@
.tab-content
.tab-pane.active{role: 'tabpanel', id: 'signup'}
= semantic_form_for(@registration, url: conference_conference_registrations_path(@conference.short_title)) do |f|
- if !current_user
= f.fields_for :user do |u|
= render partial: 'devise/shared/sign_up_fields', locals: { u: u}
= render partial: 'devise/shared/sign_up_form_embedded'
- if @conference.questions.any?
= render partial: 'questions', locals: { f: f }
- if @conference.events.workshops.any?
@ -38,29 +37,4 @@
- else
=f.action :submit, button_html: { value: 'Register', class: 'btn btn-primary', id: 'register' }
.tab-pane{role: 'tabpanel', id: 'signin'}
- if !CONFIG['authentication']['ichain']['enabled']
= form_tag(new_user_session_path, class: 'form-horizontal') do
%legend
%span
Sign In
.form-group
%label{for: "user[login]", class: 'col-sm-2 control-label'}
Username
.col-sm-10
= text_field_tag 'user[login]', nil, placeholder: 'Username', class: 'form-control', required: 'required'
.form-group
%label{for: "user[password]", class: 'col-sm-2 control-label'}
Password
.col-sm-10
= password_field_tag 'user[password]', nil, placeholder: 'Password', class: 'form-control', required: 'required'
.form-group
.col-sm-12
%button.btn.btn-success.pull-right
Sign in
- unless omniauth_configured.empty?
.form-group
%hr
%p.text-center
or sign in using
.text-center
= render 'devise/shared/openid'
= render partial: 'devise/shared/sign_in_form_embedded'

14
app/views/devise/confirmations/new.html.haml Normal file
View file

@ -0,0 +1,14 @@
.container
.row
.col-md-6.col-md-offset-3
.panel.panel-default
.panel-heading
%h3.panel-title
Resend confirmation instructions
.panel-body
= semantic_form_for(resource, as: resource_name, url: confirmation_path(resource_name), method: :post) do |f|
= f.input :email, input_html: { autofocus: true, required: true }
%p.text-right
= f.action :submit, as: :button, label: 'Submit', button_html: { class: 'btn btn-success' }
= render partial: 'devise/shared/help'

16
app/views/devise/passwords/edit.html.haml Normal file
View file

@ -0,0 +1,16 @@
.container
.row
.col-md-6.col-md-offset-3
.panel.panel-default
.panel-heading
%h3.panel-title
Change your password
.panel-body
= semantic_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
= f.hidden_field :reset_password_token
= f.input :password, input_html: { autofocus: true, required: true, autocomplete: "off"}, label: 'New password'
= f.input :password_confirmation, input_html: { required: true, autocomplete: "off" }, label: 'New password confirmation'
%p.text-right
= f.action :submit, as: :button, label: 'Change my password', button_html: { class: 'btn btn-success' }
= render partial: 'devise/shared/help'

14
app/views/devise/passwords/new.html.haml Normal file
View file

@ -0,0 +1,14 @@
.container
.row
.col-md-6.col-md-offset-3
.panel.panel-default
.panel-heading
%h3.panel-title
Forgot your password?
.panel-body
= semantic_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
= f.input :email, input_html: { autofocus: true, required: true}
%p.text-right
= f.action :submit, as: :button, label: 'Send me reset password instructions', button_html: { class: 'btn btn-success' }
= render partial: 'devise/shared/help'

2
app/views/devise/registrations/edit.html.haml
View file

@ -21,7 +21,7 @@
openID while logged in to OSEM
- if User.omniauth_providers.present?
#openidlinks
= render 'devise/shared/openid'
= render 'devise/shared/openid_links'
= f.inputs name: 'Confirmation' do
= f.input :current_password, input_html: {autocomplete: 'off'},
hint: '(we need your current password to confirm password, email or username changes)'

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

@ -7,24 +7,13 @@
Sign Up
.panel-body
= semantic_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
= render partial: 'devise/shared/sign_up_fields', locals: { u: f}
= f.input :username, input_html: { required: true }
= f.input :email, input_html: { required: true }
= f.input :name, input_html: { required: true }
= f.input :password, input_html: { required: true }
= f.input :password_confirmation, input_html: { required: true }
%p.text-right
= f.action :submit, as: :button, label: 'Sign Up', button_html: {class: 'btn btn-success' }
- unless omniauth_configured.empty?
.row
.col-md-4
%hr
.col-md-4
%h4.text-center
or sign up using
.col-md-4
%hr
.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'
= f.action :submit, as: :button, label: 'Sign Up', button_html: { class: 'btn btn-success' }
= render partial: 'devise/shared/openid'
= render partial: 'devise/shared/help'

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

@ -1,34 +1,19 @@
.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
.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'
.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'}
= render partial: 'devise/shared/openid'
= render partial: 'devise/shared/help'

5
app/views/devise/shared/_help.html.haml Normal file
View file

@ -0,0 +1,5 @@
%p.text-right
%a.small.btn.btn-default.btn-xs{"data-toggle" => "collapse", "data-target" => "#devise-help"}
Need Help?
#devise-help.collapse
= render 'devise/shared/links'

2
app/views/devise/shared/_links.html.haml
View file

@ -2,7 +2,7 @@
= link_to "Forgot your password?", new_password_path(resource_name)
%br
- if devise_mapping.confirmable? && controller_name != 'confirmations' && controller_name == 'passwords'
- if devise_mapping.confirmable? && controller_name != 'confirmations'
= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
%br

20
app/views/devise/shared/_openid.html.haml
View file

@ -1,7 +1,13 @@
.btn-group.btn-group-lg
- omniauth_configured.each do |provider|
= link_to user_omniauth_authorize_path(provider),
class: "btn btn-success btn-lg",
id: "omniauth-#{provider}",
title: "Your #{provider} login" do
%i{:class => "fa fa-#{provider}"}
- 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 partial: 'devise/shared/openid_links'

7
app/views/devise/shared/_openid_links.html.haml Normal file
View file

@ -0,0 +1,7 @@
.text-center
.btn-group.btn-group-lg
- omniauth_configured.each do |provider|
= link_to user_omniauth_authorize_path(provider), class: "btn btn-success btn-lg",
id: "omniauth-#{provider}",
title: "Your #{provider} login" do
%i{:class => "fa fa-#{provider}"}

25
app/views/devise/shared/_sign_in_form_embedded.html.haml Normal file
View file

@ -0,0 +1,25 @@
- if !CONFIG['authentication']['ichain']['enabled']
= form_tag(new_user_session_path, class: 'form-horizontal') do
%legend
%span
Sign In
.form-group
%label{for: "user[login]", class: 'col-sm-2 control-label'}
Username
.col-sm-10
= text_field_tag 'user[login]', nil, placeholder: 'Username', class: 'form-control', required: 'required'
.form-group
%label{for: "user[password]", class: 'col-sm-2 control-label'}
Password
.col-sm-10
= password_field_tag 'user[password]', nil, placeholder: 'Password', class: 'form-control', required: 'required'
.form-group
.col-sm-12
%button.btn.btn-success.pull-right
Sign in
= render partial: 'devise/shared/openid'
%p.text-right
%a.small.btn.btn-default{"data-toggle" => "collapse", "data-target" => "#devise-help-sign-in"}
Need Help?
#devise-help-sign-in.collapse
= render partial: 'devise/shared/links'

4
app/views/devise/shared/_sign_up_fields.html.haml
View file

@ -1,4 +0,0 @@
= u.input :username, input_html: {required: 'required', autocomplete: 'off'}
= u.input :email, input_html: {required: 'required', autocomplete: 'off'}
= u.input :password, input_html: {required: 'required', autocomplete: 'off', id: 'password_inline'}
= u.input :password_confirmation, :required => true, input_html: {required: 'required', autocomplete: 'off'}

8
app/views/devise/shared/_sign_up_form_embedded.html.haml Normal file
View file

@ -0,0 +1,8 @@
- unless current_user
= semantic_fields_for @user do |u|
= u.input :username, input_html: { required: 'required', autocomplete: 'off' }
= u.input :email, input_html: { required: 'required', autocomplete: 'off' }
= u.input :password, input_html: { required: 'required', autocomplete: 'off', id: 'password_inline' }
= u.input :password_confirmation, input_html: { required: 'required', autocomplete: 'off' }
= render partial: 'devise/shared/openid'
= render partial: 'devise/shared/help'

7
app/views/layouts/_navigation.html.haml
View file

@ -60,11 +60,12 @@
.divider
%h6.text-center
or
= render 'devise/shared/openid'
= render 'devise/shared/openid_links'
%p.text-right
%a.small{"data-toggle" => "collapse", "data-target" => "#navbar-devise-help"}
%br
%a.small.btn.btn-xs.btn-default{"data-toggle" => "collapse", "data-target" => "#navbar-devise-help"}
Need Help?
#navbar-devise-help.collapse
= link_to "Forgot your password?", new_password_path(User.new)
= render 'devise/shared/links'
%li.hidden-lg
= link_to('Sign In', new_user_session_path)

33
app/views/proposal/new.html.haml
View file

@ -22,9 +22,8 @@
= semantic_form_for(@event, url: @url) do |f|
- unless current_user
= semantic_fields_for @user do |u|
= render partial: 'devise/shared/sign_up_fields', locals: { u: u }
= render partial: 'devise/shared/sign_up_form_embedded'
= f.inputs name: 'Proposal Information' do
= f.input :title, as: :string, required: true
= f.input :event_type_id, as: :select,
@ -64,30 +63,4 @@
%p.text-right
= f.action :submit, :as => :button, :button_html => {:class => "btn btn-success"}, label: 'Create Proposal'
.tab-pane{role: 'tabpanel', id: 'signin'}
- if !CONFIG['authentication']['ichain']['enabled']
= form_tag(new_user_session_path, class: 'form-horizontal') do
%legend
%span
Sign In
.form-group
%label{for: "user[login]", class: 'col-sm-2 control-label'}
Username
.col-sm-10
= text_field_tag 'user[login]', nil, placeholder: 'Username', class: 'form-control', required: 'required'
.form-group
%label{for: "user[password]", class: 'col-sm-2 control-label'}
Password
.col-sm-10
= password_field_tag 'user[password]', nil, placeholder: 'Password', class: 'form-control', required: 'required'
.form-group
.col-sm-12
%button.btn.btn-success.pull-right
Sign in
- unless omniauth_configured.empty?
.form-group
%hr
%p.text-center
or sign in using
.text-center
= render 'devise/shared/openid'
= render partial: 'devise/shared/sign_in_form_embedded'