Merge remote-tracking branch 'origin/v8/8.8' into v8/8.9

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml

src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml

@@ -4,7 +4,6 @@
 @using Umbraco.Core.Composing
 @using Umbraco.Core.IO
 @using Umbraco.Web
-@using Umbraco.Core.Configuration
 
 @inherits WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 
@@ -72,16 +71,16 @@
                 </section>
 
             </div>
-            
+
             <umb-notifications></umb-notifications>
 
         </div>
-        
+
         <umb-tour
             ng-if="tour.show"
             model="tour">
         </umb-tour>
-        
+
         <!-- help dialog controller by the help button - this also forces the backoffice UI to shift 400px  -->
         <umb-drawer data-element="drawer" ng-if="drawer.show" model="drawer.model" view="drawer.view"></umb-drawer>
 
@@ -121,8 +120,15 @@
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
             @Html.AngularValueTinyMceAssets()
 
+            app.run(["iconHelper", function (iconHelper) {
+                @* We inject icons to the icon helper(service), since icons can only be loaded if user is authorized. By injecting these to the service they will not be requested as they will become cached. *@
+                iconHelper.defineIcon("icon-check", '@Html.Raw(Model.IconCheckData)');
+                iconHelper.defineIcon("icon-delete", '@Html.Raw(Model.IconDeleteData)');
+            }]);
+
             //required for the noscript trick
             document.getElementById("mainwrapper").style.display = "inherit";
+
         }
     </script>
 

src/Umbraco.Web.UI/config/umbracoSettings.config

@@ -259,7 +259,7 @@
       Defaults to "false".
     @keepAlivePingUrl
       The url of the KeepAlivePing action. By default, the url will use the umbracoApplicationUrl setting as the basis.
-      Change this setting to specify an alternative url to reach the KeepAlivePing action. eg http://localhost/api/keepalive/ping
+      Change this setting to specify an alternative url to reach the KeepAlivePing action. eg http://localhost/umbraco/api/keepalive/ping
       Defaults to "{umbracoApplicationUrl}/api/keepalive/ping".
   -->
   <keepAlive disableKeepAliveTask="false" keepAlivePingUrl="{umbracoApplicationUrl}/api/keepalive/ping" />