WIP skinning, replaces install runway item in packages tree with install starter kit/skin
[TFS Changeset #80464]
This commit is contained in:
@@ -614,6 +614,13 @@
|
||||
<Compile Include="umbraco\dashboard\StartupDashboardVideos.ascx.designer.cs">
|
||||
<DependentUpon>StartupDashboardVideos.ascx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\developer\Packages\StarterKits.aspx.cs">
|
||||
<DependentUpon>StarterKits.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\developer\Packages\StarterKits.aspx.designer.cs">
|
||||
<DependentUpon>StarterKits.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\dialogs\Preview.aspx.cs">
|
||||
<DependentUpon>Preview.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -1678,6 +1685,7 @@
|
||||
<Content Include="umbraco\dashboard\StartupDashboardKits.ascx" />
|
||||
<Content Include="umbraco\dashboard\StartupDashboardVideos.ascx" />
|
||||
<Content Include="umbraco\dashboard\zipupload.ascx" />
|
||||
<Content Include="umbraco\developer\Packages\StarterKits.aspx" />
|
||||
<Content Include="umbraco\dialogs\TemplateSkinning.aspx" />
|
||||
<Content Include="umbraco\helpRedirect.aspx" />
|
||||
<Content Include="umbraco\images\aboutNew.png" />
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -268,6 +268,8 @@
|
||||
<key alias="localPackage" version="4.0">Install local package</key>
|
||||
<key alias="scripts" version="4.0">Scripts</key>
|
||||
<key alias="scripting" version="4.3">Scripting Files</key>
|
||||
<key alias="installStarterKit" version="4.6">Install starter kit</key>
|
||||
<key alias="installSkin" version="4.6">Install skin</key>
|
||||
</area>
|
||||
<area alias="user">
|
||||
<key alias="username">Username</key>
|
||||
|
||||
@@ -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" %>
|
||||
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
|
||||
|
||||
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient" />
|
||||
|
||||
<script type="text/javascript">
|
||||
function showProgress(button, elementId) {
|
||||
var img = document.getElementById(elementId);
|
||||
img.style.visibility = "visible";
|
||||
button.style.display = "none";
|
||||
|
||||
}
|
||||
|
||||
|
||||
function InstallPackages(button, elementId) {
|
||||
showProgress(button, elementId);
|
||||
}
|
||||
</script>
|
||||
<style type="text/css">
|
||||
.declineStarterKits
|
||||
{
|
||||
display:none;
|
||||
}
|
||||
|
||||
#starterKits, #starterKitDesigns {list-style: none; margin: 0; padding: 0px;}
|
||||
#starterKits li, #starterKitDesigns li{float: left; margin: 15px; display: block; width: 130px; padding: 5px; border: 1px solid #efefef; text-align: center;}
|
||||
#starterKits li a, #starterKitDesigns li a{text-decoration: none; color: #999}
|
||||
#starterKits li span, #starterKitDesigns li span{display: block; text-align: center; padding-top: 10px;}
|
||||
#starterKits li div, #starterKitDesigns li div{display: none !Important;}
|
||||
#starterKits li img, #starterKitDesigns li img{border: none;}
|
||||
|
||||
|
||||
#starterKitDesc, #starterKitDesignDesc, #installingSkin, #installingStarterKit{clear: both; font-size: 1.5em; font-weight: bold; color: #999; padding: 10px;}
|
||||
|
||||
</style>
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
|
||||
<cc1:UmbracoPanel id="Panel1" Text="Starter kit" runat="server" Width="612px" Height="600px" hasMenu="false">
|
||||
<cc1:Feedback ID="fb" runat="server" />
|
||||
|
||||
<cc1:Pane id="StarterKitInstalled" Text="Install skin" runat="server">
|
||||
<h3>Starter kit already installed</h3>
|
||||
<p>Lorem ipsum</p>
|
||||
<asp:PlaceHolder ID="ph_skins" runat="server"></asp:PlaceHolder>
|
||||
</cc1:Pane>
|
||||
|
||||
|
||||
|
||||
<cc1:Pane id="StarterKitNotInstalled" Text="Install starter kit" runat="server">
|
||||
<h3>Starter kit info</h3>
|
||||
<p>Lorem ipsum</p>
|
||||
<asp:PlaceHolder ID="ph_starterkits" runat="server"></asp:PlaceHolder>
|
||||
</cc1:Pane>
|
||||
|
||||
|
||||
</cc1:UmbracoPanel>
|
||||
|
||||
|
||||
</asp:Content>
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
78
umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs
generated
Normal file
78
umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx.designer.cs
generated
Normal file
@@ -0,0 +1,78 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace umbraco.presentation.umbraco.developer.Packages {
|
||||
|
||||
|
||||
public partial class StarterKits {
|
||||
|
||||
/// <summary>
|
||||
/// JsInclude1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.UmbracoPanel Panel1;
|
||||
|
||||
/// <summary>
|
||||
/// fb control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Feedback fb;
|
||||
|
||||
/// <summary>
|
||||
/// StarterKitInstalled control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane StarterKitInstalled;
|
||||
|
||||
/// <summary>
|
||||
/// ph_skins control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.PlaceHolder ph_skins;
|
||||
|
||||
/// <summary>
|
||||
/// StarterKitNotInstalled control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane StarterKitNotInstalled;
|
||||
|
||||
/// <summary>
|
||||
/// ph_starterkits control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.PlaceHolder ph_starterkits;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user