diff --git a/umbraco/presentation/install/steps/Skinning/customizeSkin.ascx b/umbraco/presentation/install/steps/Skinning/customizeSkin.ascx
index a72c9ac89d..fd8bb54370 100644
--- a/umbraco/presentation/install/steps/Skinning/customizeSkin.ascx
+++ b/umbraco/presentation/install/steps/Skinning/customizeSkin.ascx
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="customizeSkin.ascx.cs" Inherits="umbraco.presentation.install.steps.Skinning.customizeSkin" %>
- Site and starter kit installed,click here to customize the skin.
+ Skin installed,click here to customize the skin.
\ No newline at end of file
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
index 566ae65d57..9c0aa62c3b 100644
--- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
+++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
@@ -32,6 +32,7 @@
Click a skin icon above to install it
+ I prefer not to install a skin
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
index 3411fc56fc..b49632eafd 100644
--- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
+++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
@@ -25,6 +25,12 @@ namespace umbraco.presentation.install.steps.Skinning
}
+ protected void NextStep(object sender, EventArgs e)
+ {
+ _default p = (_default)this.Page;
+ p.GotoNextStep(helper.Request("installStep"));
+ }
+
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
@@ -80,6 +86,13 @@ namespace umbraco.presentation.install.steps.Skinning
library.RefreshContent();
+ try
+ {
+ GlobalSettings.ConfigurationStatus = GlobalSettings.CurrentVersion;
+ Application["umbracoNeedConfiguration"] = false;
+ }
+ catch { }
+
try
{
((skinning)Parent.Parent.Parent).showCustomizeSkin();
diff --git a/umbraco/presentation/install/steps/skinning.ascx.cs b/umbraco/presentation/install/steps/skinning.ascx.cs
index c106b4f76e..a9a3500333 100644
--- a/umbraco/presentation/install/steps/skinning.ascx.cs
+++ b/umbraco/presentation/install/steps/skinning.ascx.cs
@@ -38,6 +38,8 @@ namespace umbraco.presentation.install.steps
public void showStarterKitDesigns(Guid starterKitGuid)
{
Skinning.loadStarterKitDesigns ctrl = (Skinning.loadStarterKitDesigns)new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx");
+ ctrl.ID = "StarterKitDesigns";
+
ctrl.StarterKitGuid = starterKitGuid;
ph_starterKitDesigns.Controls.Add(ctrl);
@@ -45,14 +47,11 @@ namespace umbraco.presentation.install.steps
pl_starterKit.Visible = false;
pl_starterKitDesign.Visible = true;
- Page.FindControl("next").Visible = true;
- ((Button)Page.FindControl("next")).Text = "...I prefer not to install a skin";
}
public void showCustomizeSkin()
{
Page.FindControl("next").Visible = true;
- ((Button)Page.FindControl("next")).Text = "next";
ph_customizeDesig.Controls.Add(new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/customizeSkin.ascx"));