From 6f778c26d15c2b339768c17a950dad4e9cce044e Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Tue, 16 Oct 2012 01:33:35 +0500 Subject: [PATCH] Initial commit of refactoring of package installer for the installer process. Converted a few webforms pages/controls to the new format, created new JS class to manage the installation, created new MVC controller for managing the ajax installation --- src/Umbraco.Core/Properties/AssemblyInfo.cs | 2 + src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 13 + src/Umbraco.Web.UI/Web.config | 507 ++++++++---------- src/Umbraco.Web.UI/install/Default.aspx.cs | 11 + .../install/Default.aspx.designer.cs | 15 + src/Umbraco.Web.UI/install/default.aspx | 11 +- .../steps/Skinning/LoadStarterKits.ascx.cs | 28 + .../Skinning/LoadStarterKits.ascx.designer.cs | 15 + .../steps/Skinning/loadStarterKits.ascx | 136 +++-- .../Installer/js/PackageInstaller.js | 39 ++ .../ApplicationContextExtensions.cs | 34 ++ .../Install/InstallPackageController.cs | 172 ++++++ src/Umbraco.Web/Umbraco.Web.csproj | 28 +- src/Umbraco.Web/WebBootManager.cs | 11 +- .../umbraco.presentation/install/default.aspx | 147 ----- .../install/default.aspx.cs | 245 +++++---- .../install/default.aspx.designer.cs | 51 -- .../steps/Skinning/loadStarterKits.ascx | 73 --- .../steps/Skinning/loadStarterKits.ascx.cs | 246 +++++---- .../Skinning/loadStarterKits.ascx.designer.cs | 51 -- .../install/steps/database.ascx | 2 +- 21 files changed, 954 insertions(+), 883 deletions(-) create mode 100644 src/Umbraco.Web.UI/install/Default.aspx.cs create mode 100644 src/Umbraco.Web.UI/install/Default.aspx.designer.cs create mode 100644 src/Umbraco.Web.UI/install/steps/Skinning/LoadStarterKits.ascx.cs create mode 100644 src/Umbraco.Web.UI/install/steps/Skinning/LoadStarterKits.ascx.designer.cs create mode 100644 src/Umbraco.Web.UI/umbraco_client/Installer/js/PackageInstaller.js create mode 100644 src/Umbraco.Web/ApplicationContextExtensions.cs create mode 100644 src/Umbraco.Web/Install/InstallPackageController.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/install/default.aspx delete mode 100644 src/Umbraco.Web/umbraco.presentation/install/default.aspx.designer.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKits.ascx delete mode 100644 src/Umbraco.Web/umbraco.presentation/install/steps/Skinning/loadStarterKits.ascx.designer.cs diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs index 0074388eca..b087eff745 100644 --- a/src/Umbraco.Core/Properties/AssemblyInfo.cs +++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs @@ -32,4 +32,6 @@ using System.Runtime.InteropServices; [assembly: InternalsVisibleTo("Umbraco.Tests")] [assembly: InternalsVisibleTo("Umbraco.Core")] +[assembly: InternalsVisibleTo("Umbraco.Web.UI")] + [assembly: InternalsVisibleTo("Our.Umbraco.AmazonS3FileSystem")] diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 2d54905f9e..40ecd9f3bf 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -259,6 +259,18 @@ Properties\SolutionInfo.cs + + ASPXCodeBehind + + + default.aspx + + + ASPXCodeBehind + + + loadStarterKits.ascx + ASPXCodeBehind @@ -599,6 +611,7 @@ + diff --git a/src/Umbraco.Web.UI/Web.config b/src/Umbraco.Web.UI/Web.config index 3422403616..d6123d5e25 100644 --- a/src/Umbraco.Web.UI/Web.config +++ b/src/Umbraco.Web.UI/Web.config @@ -1,282 +1,251 @@  - -
- -
-
- - -
- - -
-
-
-
-
- - - -
-
- - - - - - - - - - - + +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/install/Default.aspx.cs b/src/Umbraco.Web.UI/install/Default.aspx.cs new file mode 100644 index 0000000000..113f37f692 --- /dev/null +++ b/src/Umbraco.Web.UI/install/Default.aspx.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace Umbraco.Web.UI.Install +{ + public partial class Default : global::umbraco.presentation.install._default + { + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/install/Default.aspx.designer.cs b/src/Umbraco.Web.UI/install/Default.aspx.designer.cs new file mode 100644 index 0000000000..815300e77f --- /dev/null +++ b/src/Umbraco.Web.UI/install/Default.aspx.designer.cs @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// 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.Web.UI.Install { + + + public partial class Default { + } +} diff --git a/src/Umbraco.Web.UI/install/default.aspx b/src/Umbraco.Web.UI/install/default.aspx index 1c632a8428..5b955e83eb 100644 --- a/src/Umbraco.Web.UI/install/default.aspx +++ b/src/Umbraco.Web.UI/install/default.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="c#" CodeBehind="default.aspx.cs" AutoEventWireup="True" Inherits="umbraco.presentation.install._default" EnableViewState="False" %> +<%@ Page Language="c#" CodeBehind="Default.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Install.Default" EnableViewState="False" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> <%@ Register Src="~/install/Title.ascx" TagPrefix="umb1" TagName="PageTitle" %> @@ -15,12 +15,15 @@ - + + + - + + -
-
 
-
-
- <%# ((Package)Container.DataItem).Text %> contains the following functionality -
-
- <%# ((Package)Container.DataItem).Description %> -
-
-
 
-
- - - - -
  • - + + + + + - - + + - -
    -

    Oops...the installer can't connect to the repository

    - Starter Kits could not be fetched from the repository as there was no connection - which can occur if you are using a proxy server or firewall with certain configurations, + +
    +

    Oops...the installer can't connect to the repository

    + Starter Kits could not be fetched from the repository as there was no connection - which can occur if you are using a proxy server or firewall with certain configurations, or if you are not currently connected to the internet.
    - Click Continue to complete the installation then navigate to the Developer section of your Umbraco installation + Click Continue to complete the installation then navigate to the Developer section of your Umbraco installation where you will find the Starter Kits listed in the Packages tree. -
    - +
    + -