diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index 53c0e0419d..ab840b4fa2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -14,9 +14,42 @@ function startUpVideosDashboardController($scope, xmlhelper, $log, $http) { }); }; } + angular.module("umbraco").controller("Umbraco.Dashboard.StartupVideosController", startUpVideosDashboardController); +function startUpDynamicContentController(dashboardResource, assetsService) { + var vm = this; + vm.loading = true; + vm.showDefault = false; + + //proxy remote css through the local server + assetsService.loadCss( dashboardResource.getRemoteDashboardCssUrl("content") ); + dashboardResource.getRemoteDashboardContent("content").then( + function (data) { + + vm.loading = false; + + //test if we have received valid data + //we capture it like this, so we avoid UI errors - which automatically triggers ui based on http response code + if (data && data.sections) { + vm.dashboard = data; + } else{ + vm.showDefault = true; + } + + }, + + function (exception) { + console.error(exception); + vm.loading = false; + vm.showDefault = true; + }); +} + +angular.module("umbraco").controller("Umbraco.Dashboard.StartUpDynamicContentController", startUpDynamicContentController); + + function FormsController($scope, $route, $cookieStore, packageResource, localizationService) { $scope.installForms = function(){ $scope.state = localizationService.localize("packager_installStateDownloading"); diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html index ff933a415e..90d9b48969 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html @@ -1,44 +1,84 @@ +
-
-

Welcome to The Friendly CMS

-

Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible:

+ -
-
- - Umbraco.TV - Hours of Umbraco Video Tutorials - +
+ +
+
+ +
+
- -

Umbraco.TV - Learn from the source!

-
+ +
+
-

- Umbraco.TV will help you go from zero to Umbraco - hero at a pace that suits you. Our easy to follow - online training videos will give you the fundamental - knowledge to start building awesome Umbraco websites. -

+ +
+
+
+
+
+ +
+
+ +
+
+
+ + +
+ -
- - Our Umbraco - + +
+

Welcome to The Friendly CMS

+

Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible:

- -

Our Umbraco - The Friendliest Community

-
+
+
+ + Umbraco.TV - Hours of Umbraco Video Tutorials + -

- Our Umbraco - the official community site is your one - stop for everything Umbraco. Whether you need a - question answered or looking for cool plugins, the - worlds best community is just a click away. -

-
-
-
+ +

Umbraco.TV - Learn from the source!

+
+ +

+ Umbraco.TV will help you go from zero to Umbraco + hero at a pace that suits you. Our easy to follow + online training videos will give you the fundamental + knowledge to start building awesome Umbraco websites. +

+
+ +
+ + + Our Umbraco + + + +

Our Umbraco - The Friendliest Community

+
+ +

+ Our Umbraco - the official community site is your one + stop for everything Umbraco. Whether you need a + question answered or looking for cool plugins, the + worlds best community is just a click away. +

+ +
+
+
+ +
\ No newline at end of file