From ccd89bef0704e2a195f69c3833cf6d8cd5453f77 Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Tue, 23 Nov 2010 09:34:07 +0000 Subject: [PATCH] WIP skinning, replaces install runway item in packages tree with install starter kit/skin [TFS Changeset #80464] --- .../presentation/umbraco.presentation.csproj | 8 ++ .../umbraco/Trees/loadPackager.cs | 16 ++-- .../presentation/umbraco/config/lang/en.xml | 2 + .../developer/Packages/StarterKits.aspx | 63 +++++++++++++++ .../developer/Packages/StarterKits.aspx.cs | 44 +++++++++++ .../Packages/StarterKits.aspx.designer.cs | 78 +++++++++++++++++++ 6 files changed, 204 insertions(+), 7 deletions(-) create mode 100644 umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx create mode 100644 umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.cs create mode 100644 umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index 0874714733..b009a25886 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -614,6 +614,13 @@ StartupDashboardVideos.ascx + + StarterKits.aspx + ASPXCodeBehind + + + StarterKits.aspx + Preview.aspx ASPXCodeBehind @@ -1678,6 +1685,7 @@ + diff --git a/umbraco/presentation/umbraco/Trees/loadPackager.cs b/umbraco/presentation/umbraco/Trees/loadPackager.cs index edebc83ece..ace7b2d45f 100644 --- a/umbraco/presentation/umbraco/Trees/loadPackager.cs +++ b/umbraco/presentation/umbraco/Trees/loadPackager.cs @@ -71,8 +71,8 @@ namespace umbraco public void Render(ref XmlDocument Tree) { XmlElement root = Tree.DocumentElement; - - string[,] items = { { "BrowseRepository.aspx", "Install from repository" }, { "CreatePackage.aspx", "Createdjjj Packages" }, { "installedPackages.aspx", "Installedjj packages" }, { "boost.aspx", "Boost" }, { "installer.aspx", "Install local package" } }; + + string[,] items = { { "BrowseRepository.aspx", "Install from repository" }, { "CreatePackage.aspx", "Createdjjj Packages" }, { "installedPackages.aspx", "Installedjj packages" }, { "StarterKits.aspx", "Starter kit" }, { "installer.aspx", "Install local package" } }; for (int i = 0; i <= items.GetUpperBound(0); i++) @@ -161,17 +161,19 @@ namespace umbraco treeElement.SetAttribute("text", ui.Text("treeHeaders", "localPackage")); break; - case "boost.aspx": + case "StarterKits.aspx": treeElement.SetAttribute("src", ""); - treeElement.SetAttribute("nodeType", "packagesBoost"); + treeElement.SetAttribute("nodeType", "starterKits"); //treeElement.SetAttribute("menu", "L"); treeElement.SetAttribute("action", "javascript:openPackageCategory('" + items[i, 0] + "');"); treeElement.SetAttribute("icon", "nitros.gif"); treeElement.SetAttribute("openIcon", "nitros.gif"); - treeElement.SetAttribute("text", ui.Text("treeHeaders", "runwayModules")); - if (!cms.businesslogic.packager.InstalledPackage.isPackageInstalled("ae41aad0-1c30-11dd-bd0b-0800200c9a66")) - treeElement.SetAttribute("text", ui.Text("treeHeaders", "runway")); + treeElement.SetAttribute("text", ui.Text("treeHeaders", "installStarterKit")); + + if (cms.businesslogic.skinning.Skinning.IsStarterKitInstalled()) + treeElement.SetAttribute("text", ui.Text("treeHeaders", "installSkin")); + break; default: diff --git a/umbraco/presentation/umbraco/config/lang/en.xml b/umbraco/presentation/umbraco/config/lang/en.xml index 94044a32a0..e02f317c30 100644 --- a/umbraco/presentation/umbraco/config/lang/en.xml +++ b/umbraco/presentation/umbraco/config/lang/en.xml @@ -268,6 +268,8 @@ Install local package Scripts Scripting Files + Install starter kit + Install skin Username diff --git a/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx b/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx new file mode 100644 index 0000000000..3fcd041ba8 --- /dev/null +++ b/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx @@ -0,0 +1,63 @@ +<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Install starter kit" CodeBehind="StarterKits.aspx.cs" Inherits="umbraco.presentation.umbraco.developer.Packages.StarterKits" %> +<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> +<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> + + + + + + + + + + + + + + +

Starter kit already installed

+

Lorem ipsum

+ + + + + + +

Starter kit info

+

Lorem ipsum

+ + + + + + + + \ No newline at end of file diff --git a/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.cs b/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.cs new file mode 100644 index 0000000000..3dc8b6d798 --- /dev/null +++ b/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using umbraco.IO; + +namespace umbraco.presentation.umbraco.developer.Packages +{ + public partial class StarterKits : System.Web.UI.Page + { + 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() + { + ph_starterkits.Controls.Add(new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx")); + + 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; + + ph_skins.Controls.Add(ctrl); + + StarterKitNotInstalled.Visible = false; + StarterKitInstalled.Visible = true; + + } + } +} \ No newline at end of file diff --git a/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs b/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs new file mode 100644 index 0000000000..9d6fd33140 --- /dev/null +++ b/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// 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; + } +}