diff --git a/umbraco/presentation/install/default.aspx.cs b/umbraco/presentation/install/default.aspx.cs index 1c3c63b7c4..fc40dedc01 100644 --- a/umbraco/presentation/install/default.aspx.cs +++ b/umbraco/presentation/install/default.aspx.cs @@ -68,6 +68,12 @@ namespace umbraco.presentation.install Response.Redirect("?installStep=" + _s.Alias); } + public void GotoLastStep() + { + InstallerStep _s = InstallerSteps().Get("theend"); + Response.Redirect("?installStep=" + _s.Alias); + } + #region Web Form Designer generated code override protected void OnInit(EventArgs e) diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx index 8934aa36b8..98060d41be 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx @@ -52,4 +52,12 @@ + + + + + \ No newline at end of file diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs index c338143941..79d8404fd8 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs @@ -75,11 +75,17 @@ namespace umbraco.presentation.install.steps.Skinning uicontrols.Feedback fb = new global::umbraco.uicontrols.Feedback(); fb.type = global::umbraco.uicontrols.Feedback.feedbacktype.error; fb.Text = "No connection to repository. Starter Kits could not be fetched from the repository as there was no connection to: '" + repo.RepositoryUrl + "'"; - - pl_loadStarterKits.Controls.Clear(); - pl_loadStarterKits.Controls.Add(fb); + + pl_starterKitsConnectionError.Controls.Add(fb); + pl_starterKitsConnectionError.Visible = true; } + protected void gotoLastStep(object sender, EventArgs e) + { + Helper.RedirectToLastStep(this.Page); + } + + protected void SelectStarterKit(object sender, EventArgs e) { diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.designer.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.designer.cs index 0baff2140d..fd34b26f8d 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.designer.cs +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.designer.cs @@ -29,5 +29,23 @@ namespace umbraco.presentation.install.steps.Skinning { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Repeater rep_starterKits; + + /// + /// pl_starterKitsConnectionError control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder pl_starterKitsConnectionError; + + /// + /// LinkButton1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton LinkButton1; } } diff --git a/umbraco/presentation/install/utills/Helper.cs b/umbraco/presentation/install/utills/Helper.cs index 9b3937b0c0..119794976e 100644 --- a/umbraco/presentation/install/utills/Helper.cs +++ b/umbraco/presentation/install/utills/Helper.cs @@ -12,6 +12,13 @@ namespace umbraco.presentation.install { d.GotoNextStep(d.step.Value); } + public static void RedirectToLastStep(Page page) + { + _default d = (_default)page; + d.GotoLastStep(); + } + + private static int m_Percentage = -1; public static int Percentage { get { return m_Percentage; } set { m_Percentage = value; } }