From b337f4e5e490421d4a5398e85df0fc78f166fc4f Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Sat, 3 Nov 2012 07:18:12 +0600 Subject: [PATCH] Fixes issue with installing starter kits in the back office after upgrading the installer to install the starter kits properly. Not sure if this was actually working before 4.10 but in any case does work again now and installs them the correct way whilst waiting for the app pool to restart (we need to put this in place for the normal packages too!). Upgraded the StarterKits.aspx to have the correct code behind structure. Fixes issue with missing or invalid referenced images. --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 7 + .../Skinning/LoadStarterKits.ascx.designer.cs | 9 + .../steps/Skinning/loadStarterKitDesigns.ascx | 4 +- .../steps/Skinning/loadStarterKits.ascx | 5 +- .../developer/Packages/StarterKits.aspx | 50 ++++-- .../developer/Packages/StarterKits.aspx.cs | 11 ++ .../Packages/StarterKits.aspx.designer.cs | 15 ++ .../umbraco_client/Installer/css/all.css | 2 +- .../Installer/js/jquery.main.js | 5 +- src/Umbraco.Web/Umbraco.Web.csproj | 11 +- .../developer/Packages/StarterKits.aspx | 69 -------- .../developer/Packages/StarterKits.aspx.cs | 162 +++++++++++++----- .../Packages/StarterKits.aspx.designer.cs | 87 ---------- 13 files changed, 210 insertions(+), 227 deletions(-) create mode 100644 src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs create mode 100644 src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 19e5d15bfc..b3424a86ad 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -282,6 +282,13 @@ editMacro.aspx + + StarterKits.aspx + ASPXCodeBehind + + + StarterKits.aspx + ASPXCodeBehind diff --git a/src/Umbraco.Web.UI/install/steps/Skinning/LoadStarterKits.ascx.designer.cs b/src/Umbraco.Web.UI/install/steps/Skinning/LoadStarterKits.ascx.designer.cs index 45bce17cfb..f255e532ed 100644 --- a/src/Umbraco.Web.UI/install/steps/Skinning/LoadStarterKits.ascx.designer.cs +++ b/src/Umbraco.Web.UI/install/steps/Skinning/LoadStarterKits.ascx.designer.cs @@ -12,6 +12,15 @@ namespace Umbraco.Web.UI.Install.Steps.Skinning { public partial class LoadStarterKits { + /// + /// JsInclude1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; + /// /// LinkButton2 control. /// diff --git a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx b/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx index 10957ef2f7..c475c273e3 100644 --- a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx +++ b/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx @@ -26,8 +26,8 @@
  • - image description - image description + " alt="image description" width="152" height="129"> + " alt="image description" width="201" height="178">
    <%# ((Skin)Container.DataItem).Text %> diff --git a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKits.ascx b/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKits.ascx index 5188bf77a6..898803deec 100644 --- a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKits.ascx +++ b/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKits.ascx @@ -1,8 +1,11 @@ <%@ Control Language="C#" AutoEventWireup="True" CodeBehind="LoadStarterKits.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.Skinning.LoadStarterKits" %> <%@ Import Namespace="umbraco.cms.businesslogic.packager.repositories" %> +<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> + + <% if (!CannotConnect) { %> - - - - - - - -

    Available skins

    -

    You can choose from the following skins.

    - -     - - - - -

    Available starter kits

    -

    You can choose from the following starter kits, each having specific functionality.

    - -     - - -

    Installation completed succesfully

    -     -     - - -     \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs index d0fc0edf8c..e53e704762 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs @@ -9,63 +9,135 @@ using umbraco.IO; namespace umbraco.presentation.umbraco.developer.Packages { - public partial class StarterKits : UmbracoEnsuredPage - { - protected void Page_Load(object sender, EventArgs e) - { - if (!cms.businesslogic.skinning.Skinning.IsStarterKitInstalled()) - showStarterKits(); - else - showSkins((Guid)cms.businesslogic.skinning.Skinning.StarterKitGuid()); - } + public partial class StarterKits : UmbracoEnsuredPage + { + protected void Page_Load(object sender, EventArgs e) + { + if (!cms.businesslogic.skinning.Skinning.IsStarterKitInstalled()) + showStarterKits(); + else + showSkins((Guid)cms.businesslogic.skinning.Skinning.StarterKitGuid()); + } - private void showStarterKits() - { - install.steps.Skinning.loadStarterKits starterkitsctrl = - (install.steps.Skinning.loadStarterKits)new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx"); - starterkitsctrl.StarterKitInstalled+=new install.steps.Skinning.StarterKitInstalledEventHandler(starterkitsctrl_StarterKitInstalled); - - ph_starterkits.Controls.Add(starterkitsctrl); + private void showStarterKits() + { + install.steps.Skinning.loadStarterKits starterkitsctrl = + (install.steps.Skinning.loadStarterKits)new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx"); + starterkitsctrl.StarterKitInstalled += new install.steps.Skinning.StarterKitInstalledEventHandler(starterkitsctrl_StarterKitInstalled); - + ph_starterkits.Controls.Add(starterkitsctrl); - StarterKitNotInstalled.Visible = true; - StarterKitInstalled.Visible = false; - } - + StarterKitNotInstalled.Visible = true; + StarterKitInstalled.Visible = false; - public void showSkins(Guid starterKitGuid) - { + } - install.steps.Skinning.loadStarterKitDesigns ctrl = (install.steps.Skinning.loadStarterKitDesigns)new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx"); - ctrl.ID = "StarterKitDesigns"; - ctrl.StarterKitGuid = starterKitGuid; - ctrl.StarterKitDesignInstalled += new install.steps.Skinning.StarterKitDesignInstalledEventHandler(ctrl_StarterKitDesignInstalled); - ph_skins.Controls.Add(ctrl); - StarterKitNotInstalled.Visible = false; - StarterKitInstalled.Visible = true; + public void showSkins(Guid starterKitGuid) + { - } + install.steps.Skinning.loadStarterKitDesigns ctrl = (install.steps.Skinning.loadStarterKitDesigns)new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx"); + ctrl.ID = "StarterKitDesigns"; - void starterkitsctrl_StarterKitInstalled() - { - StarterKitNotInstalled.Visible = false; - StarterKitInstalled.Visible = false; + ctrl.StarterKitGuid = starterKitGuid; + ctrl.StarterKitDesignInstalled += new install.steps.Skinning.StarterKitDesignInstalledEventHandler(ctrl_StarterKitDesignInstalled); + ph_skins.Controls.Add(ctrl); - installationCompleted.Visible = true; - - } + StarterKitNotInstalled.Visible = false; + StarterKitInstalled.Visible = true; - void ctrl_StarterKitDesignInstalled() - { - StarterKitNotInstalled.Visible = false; - StarterKitInstalled.Visible = false; + } - installationCompleted.Visible = true; - } - } + void starterkitsctrl_StarterKitInstalled() + { + StarterKitNotInstalled.Visible = false; + StarterKitInstalled.Visible = false; + + installationCompleted.Visible = true; + + } + + void ctrl_StarterKitDesignInstalled() + { + StarterKitNotInstalled.Visible = false; + StarterKitInstalled.Visible = false; + + installationCompleted.Visible = true; + } + + /// + /// JsInclude1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; + + /// + /// Panel1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.UmbracoPanel Panel1; + + /// + /// fb control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Feedback fb; + + /// + /// StarterKitInstalled control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Pane StarterKitInstalled; + + /// + /// ph_skins control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ph_skins; + + /// + /// StarterKitNotInstalled control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Pane StarterKitNotInstalled; + + /// + /// ph_starterkits control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder ph_starterkits; + + /// + /// installationCompleted control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Pane installationCompleted; + } } \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs deleted file mode 100644 index 2b5787e1d5..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs +++ /dev/null @@ -1,87 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace umbraco.presentation.umbraco.developer.Packages { - - - public partial class StarterKits { - - /// - /// JsInclude1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; - - /// - /// Panel1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.UmbracoPanel Panel1; - - /// - /// fb control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Feedback fb; - - /// - /// StarterKitInstalled control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane StarterKitInstalled; - - /// - /// ph_skins control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_skins; - - /// - /// StarterKitNotInstalled control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane StarterKitNotInstalled; - - /// - /// ph_starterkits control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_starterkits; - - /// - /// installationCompleted control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane installationCompleted; - } -}