diff --git a/app/assets/javascripts/darkswarm/controllers/registration_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/registration_controller.js.coffee index dc1bb2a80e..3e9dddb2d4 100644 --- a/app/assets/javascripts/darkswarm/controllers/registration_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/registration_controller.js.coffee @@ -4,8 +4,7 @@ Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, Enterpris $scope.enterprise = EnterpriseCreationService.enterprise $scope.create = EnterpriseCreationService.create - $scope.steps = ['details','address','contact','about'] - # ,'images','social' + $scope.steps = ['details','address','contact','about','images','social'] $scope.countries = availableCountries diff --git a/app/assets/javascripts/templates/registration.html.haml b/app/assets/javascripts/templates/registration.html.haml index dba05f3429..10a12d712e 100644 --- a/app/assets/javascripts/templates/registration.html.haml +++ b/app/assets/javascripts/templates/registration.html.haml @@ -3,6 +3,8 @@ %ng-include{ src: "'registration/introduction.html'" } %div{ ng: { repeat: 'step in steps', show: "currentStep() == step" } } %ng-include{ src: "'registration/'+ step + '.html'" } + %div{ ng: { show: "currentStep() == 'finished'" } } + %ng-include{ src: "'registration/finished.html'" } %a.close-reveal-modal{"ng-click" => "$close()"} %i.ofn-i_009-close diff --git a/app/assets/javascripts/templates/registration/about.html.haml b/app/assets/javascripts/templates/registration/about.html.haml index faed853791..1d6363c0c8 100644 --- a/app/assets/javascripts/templates/registration/about.html.haml +++ b/app/assets/javascripts/templates/registration/about.html.haml @@ -1,4 +1,4 @@ -.container#registration-contact +.container#registration-about .row.header %h2 Nice one! %h5 Now let's flesh out the details about {{ enterprise.name }}. @@ -30,6 +30,6 @@ .small-12.columns %label{ for: 'enterprise_acn' } ACN: %input.chunky.small-12.columns{ id: 'enterprise_acn', placeholder: "eg. 123 456 789", ng: { model: 'enterprise.acn' } } - .row + .row.buttons .small-12.columns - %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('images')" }, style: 'float:right' } \ No newline at end of file + %input.button.primary.right{ type: "button", value: "Continue", ng: { click: "select('images')" } } \ No newline at end of file diff --git a/app/assets/javascripts/templates/registration/address.html.haml b/app/assets/javascripts/templates/registration/address.html.haml index ffea2db77d..98a3ccd2a9 100644 --- a/app/assets/javascripts/templates/registration/address.html.haml +++ b/app/assets/javascripts/templates/registration/address.html.haml @@ -36,7 +36,7 @@ %label.indent-checkbox %input{ type: 'checkbox', id: 'enterprise_on_map', ng: { model: 'enterprise.on_map' } } Blur my location on the map (show an approximate, not exact pin) - .row + .row.buttons .small-12.columns - %input.button.primary{ type: "button", value: "Back", ng: { click: "select('details')" }, style: 'float:left' } - %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('contact')" }, style: 'float:right' } + %input.button.primary.left{ type: "button", value: "Back", ng: { click: "select('details')" } } + %input.button.primary.right{ type: "button", value: "Continue", ng: { click: "select('contact')" } } diff --git a/app/assets/javascripts/templates/registration/contact.html.haml b/app/assets/javascripts/templates/registration/contact.html.haml index 4ac93894c0..fe342d73e0 100644 --- a/app/assets/javascripts/templates/registration/contact.html.haml +++ b/app/assets/javascripts/templates/registration/contact.html.haml @@ -31,7 +31,7 @@ .small-12.columns %label.indent-checkbox %input{ type: 'checkbox', id: 'contact_phone_profile', ng: { model: 'enterprise.phone_in_profile' } }   Display phone in profile - .row + .row.buttons .small-12.columns - %input.button.primary{ type: "button", value: "Back", ng: { click: "select('address')" }, style: 'float:left' } - %input.button.primary{ type: "button", value: "Continue", ng: { click: "create()" }, style: 'float:right' } \ No newline at end of file + %input.button.primary.left{ type: "button", value: "Back", ng: { click: "select('address')" } } + %input.button.primary.right{ type: "button", value: "Continue", ng: { click: "create()" } } \ No newline at end of file diff --git a/app/assets/javascripts/templates/registration/details.html.haml b/app/assets/javascripts/templates/registration/details.html.haml index c662f37985..cad5449e6b 100644 --- a/app/assets/javascripts/templates/registration/details.html.haml +++ b/app/assets/javascripts/templates/registration/details.html.haml @@ -35,8 +35,8 @@ .small-10.columns %h6 I'm Both %span{ style: 'font-size: 80%'} Hey there, Jack-of-all-trades! Not only do you produce yummy things to eat and/or drink, you also want to connect directly to those who love buying your products! - .row + .row.buttons .small-12.columns - %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('address')" }, style: 'float:right' } + %input.button.primary.right{ type: "button", value: "Continue", ng: { click: "select('address')" } } \ No newline at end of file diff --git a/app/assets/javascripts/templates/registration/finished.html.haml b/app/assets/javascripts/templates/registration/finished.html.haml new file mode 100644 index 0000000000..b2150f8f1c --- /dev/null +++ b/app/assets/javascripts/templates/registration/finished.html.haml @@ -0,0 +1,14 @@ +.container#registration-finished + .row.header + %h2 Well done! + %h5 You have successfully completed the profile for {{ enterprise.name }}! + .row.content{ style: 'text-align: center'} + %h3 Why not check it out on the Open Food Network? + %a.button.primary{ type: "button", href: "/map" } Go to Map Page > + + %br + %br + + %h3 Next step - add some products: + %a.button.primary{ type: "button", href: "/admin/products/new" } Add a Product > + \ No newline at end of file diff --git a/app/assets/javascripts/templates/registration/images.html.haml b/app/assets/javascripts/templates/registration/images.html.haml new file mode 100644 index 0000000000..92c3c9f703 --- /dev/null +++ b/app/assets/javascripts/templates/registration/images.html.haml @@ -0,0 +1,11 @@ +.container#registration-images + .row.header + %h2 Thanks! + %h5 Let's upload some pretty pictures so your profile looks great! :) + %ng-include{ src: "'registration/steps.html'" } + .row.content + + .row.buttons + .small-12.columns + %input.button.primary.left{ type: "button", value: "Back", ng: { click: "select('about')" } } + %input.button.primary.right{ type: "button", value: "Continue", ng: { click: "select('social')" } } \ No newline at end of file diff --git a/app/assets/javascripts/templates/registration/social.html.haml b/app/assets/javascripts/templates/registration/social.html.haml new file mode 100644 index 0000000000..32ffb75c1a --- /dev/null +++ b/app/assets/javascripts/templates/registration/social.html.haml @@ -0,0 +1,11 @@ +.container#registration-social + .row.header + %h2 Last step! + %h5 How can people find {{ enterprise.name }} online? + %ng-include{ src: "'registration/steps.html'" } + .row.content + + .row.buttons + .small-12.columns + %input.button.primary.left{ type: "button", value: "Back", ng: { click: "select('images')" } } + %input.button.primary.right{ type: "button", value: "Continue", ng: { click: "select('finished')" } } \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/registration.css.sass b/app/assets/stylesheets/darkswarm/registration.css.sass index c48737f7e3..fcc64dbdb2 100644 --- a/app/assets/stylesheets/darkswarm/registration.css.sass +++ b/app/assets/stylesheets/darkswarm/registration.css.sass @@ -12,6 +12,12 @@ i font-size: 150% + .buttons + .right + float: right + .left + float: left + ofn-inline-flash display: block padding: 15px