From 95bfc74b3f18e8c2cfbfafbe540ccbd2796bdcc6 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Wed, 20 Aug 2014 14:02:18 +1000
Subject: [PATCH] No need to deal with locations in registration

---
 .../services/registration_service.js.coffee         | 13 +++++--------
 .../templates/registration/contact.html.haml        |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/registration_service.js.coffee b/app/assets/javascripts/darkswarm/services/registration_service.js.coffee
index 903454911d..025c403358 100644
--- a/app/assets/javascripts/darkswarm/services/registration_service.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/registration_service.js.coffee
@@ -1,8 +1,6 @@
-Darkswarm.factory "RegistrationService", (Navigation, $modal, $location)->
+Darkswarm.factory "RegistrationService", (Navigation, $modal, Loading)->
 
   new class RegistrationService
-    current_step: 'introduction'
-
     constructor: ->
       @open()
 
@@ -10,17 +8,16 @@ Darkswarm.factory "RegistrationService", (Navigation, $modal, $location)->
       @modalInstance = $modal.open
         templateUrl: 'registration.html'
         windowClass: "login-modal large"
+        backdrop: 'static'
       @modalInstance.result.then @close, @close
-      @select @current_step
+      @select 'introduction'
 
     select: (step)=>
       @current_step = step
-      Navigation.navigate '/' + @current_step
-
-    active: Navigation.active
     
     currentStep: =>
       @current_step
 
     close: ->
-      Navigation.navigate "/"
\ No newline at end of file
+      Loading.message = "Taking you back to the home page"
+      Navigation.go "/"
\ No newline at end of file
diff --git a/app/assets/javascripts/templates/registration/contact.html.haml b/app/assets/javascripts/templates/registration/contact.html.haml
index f7d0959590..4a35e8dbef 100644
--- a/app/assets/javascripts/templates/registration/contact.html.haml
+++ b/app/assets/javascripts/templates/registration/contact.html.haml
@@ -33,5 +33,5 @@
           %label{ for: 'contact_display_profile' } 
             %input{ type: 'checkbox', id: 'contact_phone_profile', ng: { model: 'enterprise.contact.phone_in_profile' } } &nbsp; Display phone in profile
   .row
-    %input.button.primary{ type: "button", value: "Back", ng: { click: "select('details')" }, style: 'float:left' }
+    %input.button.primary{ type: "button", value: "Back", ng: { click: "select('address')" }, style: 'float:left' }
     %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('contact')" }, style: 'float:right' }
\ No newline at end of file