Merge pull request #28 from sparkbox/welcome-form-fields

Welcome form fields
Merge branch 'welcome-form-fields'
Merge pull request #29 from sparkbox/welcome-form-fields
Merge branch 'master' of github.com:sparkbox/apprentice-application
Added new routes to post form and moved the form_for into a partial _form.html.erb. Also included a debug renderer to see what controller and action is being requested.
Merge pull request #30 from sparkbox/welcome-form-fields

work:removed < /br> tags from index.html.erb, reworking styles for inputs.
Removed return line in welcome controller so entries will be saved to the database. Added redirect so on confirm/send on first page, form moves to a /welcome/:id. Had to be verbose and literally add welcome_path(@apprenticeform) to welcome controller. Also added a new controller for demographics.
Merge pull request #31 from sparkbox/welcome-form-fields

work: layout is cleaned up. working on styling date fields next.
Added new routes to post form and moved the form_for into a partial _form.html.erb. Also included a debug renderer to see what controller and action is being requested.
Removed return line in welcome controller so entries will be saved to the database. Added redirect so on confirm/send on first page, form moves to a /welcome/:id. Had to be verbose and literally add welcome_path(@apprenticeform) to welcome controller. Also added a new controller for demographics.
Merge branch 'sign-up' of github.com:sparkbox/apprentice-application into sign-up
Merge pull request #32 from sparkbox/welcome-form-fields

Looking good!
Playing around with routes. So far, confirm on 1st page moves to index.[:id] instead of index/[:id] which I would prefer. 2nd page renders using a partial at the moment but loops back to /welcome on confirm which needs to be fixed.
Added new routes to move from root or #index to step_two to step_three and so on. Currently I'm stuck at step 3 as it routes to #create from step 2. It ideally should route to a new controller's index i.e. Personality index. Step 3 also needs a confirm button.
App now loops back to the first page at /welcome with the action #create. Ideally want the last page to move to a confirmation page. Still need to figure out why after step 2 form redirects_to create instead of index.
Removed/Commented out model validation so that form moves through the different steps of the wizard. Need to figure out how to save an object and have it remember/save fields from previous steps.
Merge branch 'master' of github.com:sparkbox/apprentice-application into sign-up

Conflicts:
	app/assets/stylesheets/apprentices.css.scss
	app/views/layouts/application.html.erb
	app/views/welcome/index.html.erb
Merge pull request #33 from sparkbox/sign-up

Conflicts resolved!
Updated views so form fields pull from partials and do not need to be hardcoded.
Merge branch 'master' of github.com:sparkbox/apprentice-application into sign-up