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

Merge f90aac3dc0 into e2a7e396a2

Browse source
This commit is contained in:
alator21 2017-03-28 14:57:36 +00:00 • committed by GitHub
commit b453b2edb6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/admin/events/reports.html.haml
View file

@ -46,7 +46,7 @@
%tr
- progress_status = event.progress_status
%td
= link_to event.title, edit_conference_program_proposal_path(@conference.short_title, event)
= link_to event.title, edit_admin_conference_program_event_path(@conference.short_title, event)
%br
.small (Presented by #{event.speaker_names})
@ -76,7 +76,7 @@
%tbody
- @events_missing_commercial.each do |event|
%tr
%td= link_to event.title, edit_conference_program_proposal_path(@conference.short_title, event)
%td= link_to event.title, edit_admin_conference_program_event_path(@conference.short_title, event)
%td #{event.speaker_names}
#requirements.tab-pane
@ -97,7 +97,7 @@
%tbody
- @events_with_requirements.each do |event|
%tr
%td= link_to event.title, edit_conference_program_proposal_path(@conference.short_title, event)
%td= link_to event.title, edit_admin_conference_program_event_path(@conference.short_title, event)
%td #{event.speaker_names}
%td= event.description
@ -122,6 +122,6 @@
%tr
%td= speaker.user.name
%td= @conference.user_registered?(speaker.user) ? 'Yes' : 'No'
%td= link_to speaker.event.title, edit_conference_program_proposal_path(@conference.short_title, speaker.event)
%td= link_to speaker.event.title, edit_admin_conference_program_event_path(@conference.short_title, speaker.event)
- event_start_time = speaker.event.time
%td= event_start_time.present? ? event_start_time : '-'

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

@ -7,9 +7,9 @@
Sign Up
.panel-body
= semantic_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
= f.input :username, input_html: { required: true }
= f.input :username, input_html: { required: true },hint: 'This is how the other users see you,not your real name.'
= f.input :email, input_html: { required: true }
= f.input :name, input_html: { required: true }
= f.input :name, input_html: { required: true },hint: 'This is your real name.'
= f.input :password, input_html: { required: true }
= f.input :password_confirmation, input_html: { required: true }
%p.text-right