remove double sign_up

make sign_up same as apply
remove apply
This commit is contained in:
Torsten Ruger 2016-08-27 14:13:13 +03:00
parent 8b2bbb03d0
commit 13cc961167
5 changed files with 67 additions and 70 deletions

View File

@ -1,5 +1,63 @@
.authform
= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :role => 'form'}) do |f|
%h3 Start by signing up
= devise_error_messages!
= render :partial => "devise/registrations/form_body" , :locals => { :f => f }
- title! "Web Development Bootcamp: Apply"
- description! "Apply to Web Dev Camp, and 8 week course to learn web programming"
%section.padding-xxs
.container
.row
.col-lg-6.col-md-6.col-sm-6
.heading-title
%h1 The application process
%p
%ul
%li Be sure
%li Sign up
%li Take as much time as you need to fill out your resume info
%li Apply for a certain date (2 options) 1-3 month in the future
%li Supply more information if asked to
%li Skype interview
%li Confirmation
%li Ensure and transfer initial funds (two weeks for this)
%li Get ready
%li Fly over and get picked up
.heading-title
%h4 Next Courses
%p
%ul
-Course.all.limit(5).each do |course|
%li=course.full_name
.col-lg-6.col-md-6.col-sm-6
.row
.col-md-1
.col-md-10.auth_form_apply
- if current_user
%h2 Fill out your resume
%p
Your are signed in, head over to the
=link_to "resume" , resume_path
and fill in your details.Once that is done you can apply for a certain date.
- else
= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :role => 'form'}) do |f|
%h3 Start by signing up
= devise_error_messages!
= render :partial => "devise/registrations/form_body" , :locals => { :f => f }
.row
.col-lg-6.col-md-6.col-sm-6
.heading-title.heading-border-bottom
%h2 The course
%p
%ul
%li 8 weeks teaching, 6 days a week, 10 hours a day
%li three meals a day
%li shared accommodation
%li airport transfer
%li job application help
.col-lg-6.col-md-6.col-sm-6
.heading-title.heading-border-bottom
%h2 You need
%p
%ul
%li prepayment after confirmation, 2100€
%li final payment before course start, 6300€
%li a mac (powerbook / air) at least 10.9
%li warm clothes
%li a flight to Helsinki (possibly)

View File

@ -37,7 +37,8 @@
=link_to "Updated Privacy Policy" , page_path(:privacy)
%small 24 June 2016
%li
=link_to "Application process ready, first course in October" , page_path(:apply)
=link_to "Application process ready, first course 26.9" , new_user_registration_path
%small 20 May 2016
%li
=link_to "Web Dev on Facebook!" , "https://www.facebook.com/webdev.camp" , target: :blank

View File

@ -4,7 +4,7 @@
%ul#topMain.nav.nav-pills.nav-main
%li= link_to "Course" , page_path(:course)
%li= link_to "Camp" , page_path(:camp)
%li= link_to "Apply" , page_path(:apply)
%li= link_to "Apply" , new_user_registration_path
%li= link_to "Q & A" , page_path(:answers)
-if user_signed_in?
%li.visible-xs= sign_out_link

View File

@ -1,62 +0,0 @@
- title! "Web Development Bootcamp: Apply"
- description! "Apply to Web Dev Camp, and 8 week course to learn web programming"
%section.padding-xxs
.container
.row
.col-lg-6.col-md-6.col-sm-6
.heading-title
%h1 The application process
%p
%ul
%li Be sure
%li Sign up
%li Take as much time as you need to fill out your resume info
%li Apply for a certain date (2 options) 1-3 month in the future
%li Supply more information if asked to
%li Skype interview
%li Confirmation
%li Ensure and transfer initial funds (two weeks for this)
%li Get ready
%li Fly over and get picked up
.heading-title
%h4 Next Courses
%p
%ul
-Course.all.limit(5).each do |course|
%li=course.full_name
.col-lg-6.col-md-6.col-sm-6
.row
.col-md-1
.col-md-10
- if current_user
%h2 Fill out your resume
%p
Your are signed in, head over to the
=link_to "resume" , resume_path
and fill in your details.Once that is done you can apply for a certain date.
- else
= form_for(User.new, :as => :user, :url => secure_registration , :html => { :role => 'form'}) do |f|
%h2 Start by signing up
= render :partial => "devise/registrations/form_body" , :locals => { :f => f }
.row
.col-lg-6.col-md-6.col-sm-6
.heading-title.heading-border-bottom
%h2 The course
%p
%ul
%li 8 weeks teaching, 6 days a week, 10 hours a day
%li three meals a day
%li shared accommodation
%li airport transfer
%li job application help
.col-lg-6.col-md-6.col-sm-6
.heading-title.heading-border-bottom
%h2 You need
%p
%ul
%li prepayment after confirmation, 2100€
%li final payment before course start, 6300€
%li a mac (powerbook / air) at least 10.9
%li warm clothes
%li a flight to Helsinki (possibly)

View File

@ -2,7 +2,7 @@ module Features
module SessionHelpers
def sign_up_with(name , email, password, confirmation)
visit new_user_registration_path
within ".authform" do
within ".auth_form_apply" do
fill_in 'Name', with: name
fill_in 'Email', with: email
fill_in 'Password', with: password