From 88d06f54d3101725cec6f83495c1fedcde379200 Mon Sep 17 00:00:00 2001 From: PerPloug Date: Tue, 7 Sep 2010 14:15:35 +0000 Subject: [PATCH] couple of style tweaks for the installer [TFS Changeset #76919] --- umbraco/presentation/default.aspx.cs | 7 ++-- umbraco/presentation/install/default.aspx.cs | 15 ++++++--- .../steps/Definitions/InstallerControl.cs | 16 +++++++++ .../install/steps/Definitions/TheEnd.cs | 2 +- .../install/steps/Definitions/WebPi.cs | 33 +++++++++++++++++++ .../steps/Skinning/loadStarterKits.ascx | 2 +- .../steps/Skinning/loadStarterKits.ascx.cs | 6 ++++ .../presentation/install/steps/theend.ascx | 19 ++++++----- .../install/steps/theend.ascx.designer.cs | 3 +- umbraco/presentation/install/style.css | 6 +++- .../presentation/umbraco.presentation.csproj | 4 +++ 11 files changed, 92 insertions(+), 21 deletions(-) create mode 100644 umbraco/presentation/install/steps/Definitions/InstallerControl.cs create mode 100644 umbraco/presentation/install/steps/Definitions/WebPi.cs diff --git a/umbraco/presentation/default.aspx.cs b/umbraco/presentation/default.aspx.cs index f530c07bce..a6d60da4d2 100644 --- a/umbraco/presentation/default.aspx.cs +++ b/umbraco/presentation/default.aspx.cs @@ -190,14 +190,15 @@ namespace umbraco RequestInitEventArgs e = new RequestInitEventArgs(); e.Page = m_umbPage; - e.PageId = m_umbPage.PageID; + + if(m_umbPage != null) + e.PageId = m_umbPage.PageID; + e.Context = System.Web.HttpContext.Current; FireBeforeRequestInit(e); if (!e.Cancel) { - - if (!UmbracoSettings.EnableSplashWhileLoading || !content.Instance.isInitializing) { diff --git a/umbraco/presentation/install/default.aspx.cs b/umbraco/presentation/install/default.aspx.cs index 1d7b068b04..10d9b162c8 100644 --- a/umbraco/presentation/install/default.aspx.cs +++ b/umbraco/presentation/install/default.aspx.cs @@ -75,11 +75,17 @@ namespace umbraco.presentation.install protected void onNextCommand(object sender, CommandEventArgs e) { - string currentStep = (string)e.CommandArgument; - InstallerStep _s = InstallerSteps().GotoNextStep(currentStep); - Response.Redirect("?installStep=" + _s.Alias); + string currentStep = (string)e.CommandArgument; + GotoNextStep(currentStep); } + public void GotoNextStep(string currentStep) + { + InstallerStep _s = InstallerSteps().GotoNextStep(currentStep); + Response.Redirect("?installStep=" + _s.Alias); + } + + #region Web Form Designer generated code override protected void OnInit(EventArgs e) { @@ -136,7 +142,8 @@ namespace umbraco.presentation.install ics.Add(new install.steps.Definitions.Database()); ics.Add(new install.steps.Definitions.DefaultUser()); ics.Add( new install.steps.Definitions.Skinning() ); - ics.Add(new install.steps.Definitions.TheEnd()); + ics.Add(new install.steps.Definitions.WebPi()); + ics.Add(new install.steps.Definitions.TheEnd()); return ics; } /* diff --git a/umbraco/presentation/install/steps/Definitions/InstallerControl.cs b/umbraco/presentation/install/steps/Definitions/InstallerControl.cs new file mode 100644 index 0000000000..5a10915e42 --- /dev/null +++ b/umbraco/presentation/install/steps/Definitions/InstallerControl.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace umbraco.presentation.install.steps.Definitions +{ + public class InstallerControl : System.Web.UI.UserControl + { + public void NextStep() + { + _default p = (_default)this.Page; + p.GotoNextStep(helper.Request("installStep")); + } + } +} \ No newline at end of file diff --git a/umbraco/presentation/install/steps/Definitions/TheEnd.cs b/umbraco/presentation/install/steps/Definitions/TheEnd.cs index 112fe5ae92..ce645393f3 100644 --- a/umbraco/presentation/install/steps/Definitions/TheEnd.cs +++ b/umbraco/presentation/install/steps/Definitions/TheEnd.cs @@ -15,7 +15,7 @@ namespace umbraco.presentation.install.steps.Definitions public override string Name { - get { return "thats all folks"; } + get { return "Umbraco " + GlobalSettings.CurrentVersion + " is installed and ready for use"; } } public override string UserControl diff --git a/umbraco/presentation/install/steps/Definitions/WebPi.cs b/umbraco/presentation/install/steps/Definitions/WebPi.cs new file mode 100644 index 0000000000..8853b77806 --- /dev/null +++ b/umbraco/presentation/install/steps/Definitions/WebPi.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using umbraco.cms.businesslogic.installer; +using umbraco.BusinessLogic; + +namespace umbraco.presentation.install.steps.Definitions +{ + public class WebPi : InstallerStep + { + public override string Alias + { + get { return "webpi"; } + } + + public override string Name + { + get { return "Hi " + new User(0).Name + " you are running umbraco"; } + } + + public override string UserControl + { + get { return IO.SystemDirectories.Install + "/steps/skinning.ascx"; } + } + + public override bool Completed() + { + //this is always completed, we just want to be able to hook into directly after finishing web pi + return true; + } + } +} \ No newline at end of file diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx index 9fff15d0bf..237a2ccb83 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx @@ -27,7 +27,7 @@
Click a starterkit icon above to install it
- ...I prefer not to install a starter kit + I prefer not to install a starter kit diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs index de8b9a8dcb..ac9ee1d300 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.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); diff --git a/umbraco/presentation/install/steps/theend.ascx b/umbraco/presentation/install/steps/theend.ascx index 9eb7ccfc55..a4c839bd3b 100644 --- a/umbraco/presentation/install/steps/theend.ascx +++ b/umbraco/presentation/install/steps/theend.ascx @@ -5,21 +5,20 @@ function openDialog(diaTitle, diaDoc, dwidth, dheight, optionalParams) { theDialogWindow = window.open(diaDoc,'dialogpage', "width="+dwidth+"px,height="+dheight+"px"+optionalParams);// window.showModalDialog(diaDoc, "MyDialog", strFeatures); } - function runStarterKits() { openDialog('packager', 'http://packages.umbraco.org/packages/website-packages?callback=<%=Request.ServerVariables["SERVER_NAME"] + umbraco.IO.SystemDirectories.Umbraco + "/dialogs/packager.aspx" %>', 530, 550, ',scrollbars=yes'); } -

Umbraco <%=umbraco.GlobalSettings.CurrentVersion%> is installed and ready for use

- +

To finish the installation, you'll need to manually edit the /web.config file and update the AppSetting key umbracoConfigurationStatus in the bottom to the value of '<%=umbraco.GlobalSettings.CurrentVersion %>'.

+
@@ -36,18 +35,21 @@ you can find plenty of resources on our getting started pages. Receive security bulletins and our monthly newsletter with special offers. No spam, period. -
-
-
+ +
    +
    2. +
    3. +
+

- +

Browse your new site

-You installed Runway, so why not see how your new website looks. +You installed a starter package, so why not see what your new website looks like.
@@ -59,7 +61,6 @@ To manage your website, simply open the umbraco back office and start adding con

Further help and information

Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the umbraco terminology -