diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.html b/src/Umbraco.Web.UI.Client/src/installer/installer.html index 601b2e8852..5af94e2a23 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.html +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.html @@ -9,29 +9,23 @@ - -
+
+ 
+        {{installer | json}}
+
+ +
- - - - + + - + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js index 12b316904e..1852b5e749 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js @@ -12,7 +12,6 @@ angular.module("umbraco.install").factory('installerService', function($q, $time status : _status, getSteps : function(){ var deferred = $q.defer(); - var s = [ { name: "User", @@ -39,6 +38,7 @@ angular.module("umbraco.install").factory('installerService', function($q, $time }, init : function(){ + if(!_status.all){ service.getSteps().then(function(steps){ service.status.steps = steps; @@ -46,6 +46,7 @@ angular.module("umbraco.install").factory('installerService', function($q, $time service.gotoStep(0); }); } + }, gotoStep : function(index){ diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/Views/Install/Index.cshtml b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Views/Install/Index.cshtml index 0da4766895..d4d1bf55e6 100644 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/Views/Install/Index.cshtml +++ b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Views/Install/Index.cshtml @@ -3,6 +3,42 @@ @{ Layout = null; } + + + + + + + + Install Umbraco + + + + + + + + +
+ +
+
+
+ + + + + + + + @@ -12,15 +48,8 @@
- Hello world + Hello @ViewBag.UmbracoBaseFolder
- + diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs index a4520c4c4e..e6fdcd6c1e 100644 --- a/src/Umbraco.Web/Install/Controllers/InstallController.cs +++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs @@ -64,6 +64,9 @@ namespace Umbraco.Web.Install.Controllers //gen the install base url ViewBag.InstallApiBaseUrl = Url.GetUmbracoApiService("GetSetup", "InstallApi", "install").TrimEnd("GetSetup"); + + //get the base umbraco folder + ViewBag.UmbracoBaseFolder = SystemDirectories.Umbraco; return View(); }