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

Fix #1409. Add a label for email_public and hide openids when they are not present

Browse source
This commit is contained in:
msdundar 2017-03-26 02:30:24 +03:00
parent a6cdd93a66
commit a659cb615a
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/devise/ichain_sessions/new.html.haml
View file

@ -10,11 +10,8 @@
= f.input :url, as: :hidden, input_html: { value: @back_url } = f.input :url, as: :hidden, input_html: { value: @back_url }
= f.input :context, as: :hidden, input_html: { value: @context } = f.input :context, as: :hidden, input_html: { value: @context }
= f.input :proxypath, as: :hidden, input_html: { value: @proxypath } = f.input :proxypath, as: :hidden, input_html: { value: @proxypath }
= f.input :username, input_html: { autofocus: true } = f.input :username, input_html: { autofocus: true }
= f.input :password, as: :password = f.input :password, as: :password
%p.text-right %p.text-right
= f.action :submit, as: :button, label: 'Sign In', button_html: { class: 'btn btn-success' } = f.action :submit, as: :button, label: 'Sign In', button_html: { class: 'btn btn-success' }
= render partial: 'devise/shared/help' = render partial: 'devise/shared/help'

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

@ -2,21 +2,22 @@
.row .row
.col-md-12 .col-md-12
.page-header .page-header
%h1 Edit your Account %h1 Edit Your Account
.row .row
.col-md-12 .col-md-12
= semantic_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| = semantic_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
= f.input :username, required: false, input_html: { autocomplete: 'off' } = f.input :username, required: false, input_html: { autocomplete: 'off' }
= f.input :email, required: false, input_html: { autocomplete: 'off' } = f.input :email, required: false, input_html: { autocomplete: 'off' }
= f.input :email_public = f.input :email_public, label: "Make my email public"
= f.input :password, hint: "(Leave blank if you don't want to change it)", input_html: { autocomplete: 'off' } = f.input :password, hint: "(Leave blank if you don't want to change it)", input_html: { autocomplete: 'off' }
= f.input :password_confirmation, input_html: { autocomplete: 'off' } = f.input :password_confirmation, input_html: { autocomplete: 'off' }
= f.inputs name: 'OpenID' do = f.inputs name: 'OpenID' do
%h4 - if @openids.present?
Currently the following openIDs are associated with your account %h4
- @openids.each do |openid| Currently the following openIDs are associated with your account
%li= "#{openid.provider}:#{openid.email}" - @openids.each do |openid|
%br %li= "#{openid.provider}:#{openid.email}"
%br
%h4 %h4
To add an openID with a different email address to your account, sign in with your To add an openID with a different email address to your account, sign in with your
openID while logged in to OSEM openID while logged in to OSEM