From 048a741a2cf41d6ae028e4b6694d7d0e0ea0c897 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Wed, 27 Aug 2014 11:51:13 +1000
Subject: [PATCH] Plugging final two registration pages into validation

---
 .../templates/registration/about.html.haml     | 18 +++++-------------
 .../templates/registration/social.html.haml    |  4 ++--
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/templates/registration/about.html.haml b/app/assets/javascripts/templates/registration/about.html.haml
index 3058843aa5..07e631345f 100644
--- a/app/assets/javascripts/templates/registration/about.html.haml
+++ b/app/assets/javascripts/templates/registration/about.html.haml
@@ -1,7 +1,7 @@
 .container#registration-about
   .header
     %h2 Nice one!
-    %h5 
+    %h5
       Now let's flesh out the details about
       %span.brick{"ng-show" => "enterprise.is_distributor"}
         {{ enterprise.name }}
@@ -9,24 +9,16 @@
         {{ enterprise.name }}
 
   %ng-include{ src: "'registration/steps.html'" }
-  %form
+  %form{ name: 'about', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "update('social',about)" } }
     .row
       .small-12.columns
         .alert-box.alert{"data-alert" => ""}
           {{ enterprise.name }} won't be visible on the Open Food Network until you enter a long and short description.
-          %a.close{:href => "#"} X
+          %a.close{:href => "#"} &times;
 
         .alert-box.info{"data-alert" => ""}
           {{ enterprise.name }} has been created on the Open Food Network. If you leave at any point from here onwards, your enterprise will be saved, and you can always login to the admin section to update or continue filling out your enterprise details.
-          %a.close{:href => "#"} X
-
-    .row.content
-      %ofn-inline-flash.turquoise.small-12.columns{ ng: { show: 'visible' } }
-        / %i.ofn-i_009-close.close-button{ ng: { click: 'closeFlash()' } }
-        / {{ enterprise.name }} has been created on the Open Food Network. If you leave at any point from here onwards, your enterprise will be saved, and you can always login to the admin section to update or continue filling out your enterprise details.
-      -# %ofn-inline-flash.brick.small-12.columns{ ng: { show: 'visible' } }
-      -#   %i.ofn-i_009-close.close-button{ ng: { click: 'closeFlash()' } }
-      -#   {{ enterprise.name }} won't be visible on the Open Food Network until you enter a long and short description.
+          %a.close{:href => "#"} &times;
 
       .small-12.large-8.columns
         .row
@@ -49,4 +41,4 @@
             %input.chunky.small-12.columns{ id: 'enterprise_acn', placeholder: "eg. 123 456 789", ng: { model: 'enterprise.acn' } }
     .row.buttons.pad-top
       .small-12.columns
-        %input.button.primary{ type: "button", value: "Continue", ng: { click: "update('social')" } }
+        %input.button.primary{ type: "submit", value: "Continue" }
diff --git a/app/assets/javascripts/templates/registration/social.html.haml b/app/assets/javascripts/templates/registration/social.html.haml
index b217ebcc60..2aa12bd08b 100644
--- a/app/assets/javascripts/templates/registration/social.html.haml
+++ b/app/assets/javascripts/templates/registration/social.html.haml
@@ -3,7 +3,7 @@
     %h2 Last step!
     %h5 How can people find {{ enterprise.name }} online?
   %ng-include{ src: "'registration/steps.html'" }
-  %form
+  %form{ name: 'social', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "update('finished',social)" } }
     .row.content
       .small-12.large-7.columns
         .row
@@ -32,4 +32,4 @@
       .small-12.columns
         %input.button.secondary{ type: "button", value: "Back", ng: { click: "select('about')" } }
         &nbsp;
-        %input.button.primary{ type: "button", value: "Continue", ng: { click: "update('finished')" } }
\ No newline at end of file
+        %input.button.primary{ type: "submit", value: "Continue" }
\ No newline at end of file