Merge branch 'v8/dev' into v8/contrib

src/Umbraco.Web.UI.Client/src/views/common/tours/umbEmailMarketing/confirm/confirm.controller.js

@@ -0,0 +1,15 @@
+(function () {
+    "use strict";
+
+    function ConfirmController($scope, userService) {
+
+        var vm = this;
+        vm.userEmailAddress = "";
+
+        userService.getCurrentUser().then(function(user){
+            vm.userEmailAddress = user.email;
+        });
+    }
+
+    angular.module("umbraco").controller("Umbraco.Tours.UmbEmailMarketing.ConfirmController", ConfirmController);
+})();

src/Umbraco.Web.UI.Client/src/views/common/tours/umbEmailMarketing/confirm/confirm.html

@@ -0,0 +1,15 @@
+<div ng-controller="Umbraco.Tours.UmbEmailMarketing.ConfirmController as vm">
+
+    <umb-tour-step-header title="model.currentStep.title"></umb-tour-step-header>
+
+    <umb-tour-step on-close="model.completeTour()">
+        <p>We have sent a welcome email to your email address <strong>{{ vm.userEmailAddress }}</strong></p>
+    </umb-tour-step>
+
+    <umb-tour-step-footer>
+        <div class="flex justify-end">
+            <umb-button type="button" button-style="link" action="model.completeTour()" label-key="general_close" shortcut="esc"></umb-button>
+        </div>
+    </umb-tour-step-footer>
+
+</div>

src/Umbraco.Web.UI.Client/src/views/common/tours/umbEmailMarketing/emails/emails.controller.js

@@ -13,10 +13,7 @@
                 userService.addUserToEmailMarketing(user);
             });
 
-            // Mark Tour as complete
-            // This is also can help us indicate that the user accepted
-            // Where disabled is set if user closes modal or chooses NO
-            $scope.model.completeTour();
+            $scope.model.nextStep();
         }
     }
 

src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json

@@ -14,6 +14,10 @@
                 "content": "<p>Thank you for using Umbraco! Would you like to stay up-to-date with Umbraco product updates, security advisories, community news and special offers? Sign up for our newsletter and never miss out on the latest Umbraco news.</p> <p class='notice'>By signing up, you agree that we can use your info according to our <a href='https://umbraco.com/about-us/privacy/'>privacy policy</a>.</p>",
                 "view": "emails",
                 "type": "promotion"
+            },
+            {
+                "title": "Thank you for subscribing to our mailing list",
+                "view": "confirm"
             }
         ]
     },