diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx index 39de696765..202e256622 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx @@ -87,6 +87,12 @@

Installation completed succesfully

+ + +

We can not install starterkits when the install directory is not present.

+
+ + diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs index fdfb4fd3b5..0352406992 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs @@ -9,8 +9,10 @@ using Umbraco.Web.UI.Pages; namespace Umbraco.Web.UI.Umbraco.Developer.Packages { + using System.IO; + public partial class StarterKits : UmbracoEnsuredPage - { + { protected void Page_Load(object sender, EventArgs e) { @@ -22,6 +24,16 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages private void ShowStarterKits() { + if (Directory.Exists(this.Server.MapPath(SystemDirectories.Install)) == false) + { + this.InstallationDirectoryNotAvailable.Visible = true; + StarterKitNotInstalled.Visible = false; + StarterKitInstalled.Visible = false; + + return; + } + + var starterkitsctrl = (LoadStarterKits)LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx"); starterkitsctrl.StarterKitInstalled += StarterkitsctrlStarterKitInstalled; @@ -29,6 +41,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages StarterKitNotInstalled.Visible = true; StarterKitInstalled.Visible = false; + InstallationDirectoryNotAvailable.Visible = true; } @@ -64,5 +77,5 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages installationCompleted.Visible = true; } - } + } } \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs index 67252e6b62..efc1a04906 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs @@ -10,8 +10,8 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { - public partial class StarterKits - { + public partial class StarterKits { + /// /// JsInclude1 control. /// @@ -20,7 +20,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { /// To modify move field declaration from designer file to code-behind file. /// protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; - + /// /// Panel1 control. /// @@ -29,7 +29,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { /// To modify move field declaration from designer file to code-behind file. /// protected global::umbraco.uicontrols.UmbracoPanel Panel1; - + /// /// fb control. /// @@ -38,7 +38,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { /// To modify move field declaration from designer file to code-behind file. /// protected global::umbraco.uicontrols.Feedback fb; - + /// /// StarterKitInstalled control. /// @@ -47,7 +47,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { /// To modify move field declaration from designer file to code-behind file. /// protected global::umbraco.uicontrols.Pane StarterKitInstalled; - + /// /// ph_skins control. /// @@ -56,7 +56,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.PlaceHolder ph_skins; - + /// /// StarterKitNotInstalled control. /// @@ -65,7 +65,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { /// To modify move field declaration from designer file to code-behind file. /// protected global::umbraco.uicontrols.Pane StarterKitNotInstalled; - + /// /// ph_starterkits control. /// @@ -74,7 +74,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.PlaceHolder ph_starterkits; - + /// /// installationCompleted control. /// @@ -83,5 +83,14 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { /// To modify move field declaration from designer file to code-behind file. /// protected global::umbraco.uicontrols.Pane installationCompleted; + + /// + /// InstallationDirectoryNotAvailable control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Pane InstallationDirectoryNotAvailable; } }