yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP installer refactor, adds final skin step (customize) to installer

Browse Source 
[TFS Changeset #76962]
This commit is contained in:
starfighter83
2010-09-08 07:45:17 +00:00
parent 3eab36a3ab
commit 7737059326
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
umbraco/presentation/install/steps/Skinning/customizeSkin.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="customizeSkin.ascx.cs" Inherits="umbraco.presentation.install.steps.Skinning.customizeSkin" %>
<p>
Site and starter kit installed,click <a href="<%= umbraco.GlobalSettings.Path %>/canvas.aspx" target="_blank">here</a> to customize the skin.
Skin installed,click <a href="<%= umbraco.GlobalSettings.Path %>/canvas.aspx?redir=<%= HttpRuntime.AppDomainAppVirtualPath %>" target="_blank">here</a> to customize the skin.
</p>

1
umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
View File

@@ -32,6 +32,7 @@
<div id="starterKitDesignDesc">Click a skin icon above to install it</div>
<asp:LinkButton runat="server" CssClass="declineStarterKits" ID="declineStarterKitDesigns" OnClientClick="return confirm('Are you sure you do not want to install a skin?');" OnClick="NextStep">I prefer not to install a skin</asp:LinkButton>
</FooterTemplate>
</asp:Repeater>

13
umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
View File

@@ -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();

5
umbraco/presentation/install/steps/skinning.ascx.cs
View File

@@ -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"));