diff --git a/umbraco/cms/businesslogic/Packager/Installer.cs b/umbraco/cms/businesslogic/Packager/Installer.cs
index 98330a920c..ce4416bcca 100644
--- a/umbraco/cms/businesslogic/Packager/Installer.cs
+++ b/umbraco/cms/businesslogic/Packager/Installer.cs
@@ -189,6 +189,9 @@ namespace umbraco.cms.businesslogic.packager
string _packReadme = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/readme"));
string _packLicense = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/package/license "));
+ bool _enableSkins = bool.Parse(xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/enableSkins")));
+
+
//Create a new package instance to record all the installed package adds - this is the same format as the created packages has.
//save the package meta data
@@ -198,6 +201,8 @@ namespace umbraco.cms.businesslogic.packager
insPack.Data.Version = _packVersion;
insPack.Data.Readme = _packReadme;
insPack.Data.License = _packLicense;
+ insPack.Data.EnableSkins = _enableSkins;
+
insPack.Data.PackageGuid = guid; //the package unique key.
insPack.Data.RepositoryGuid = repoGuid; //the repository unique key, if the package is a file install, the repository will not get logged.
insPack.Save();
@@ -353,8 +358,10 @@ namespace umbraco.cms.businesslogic.packager
ArrayList allowed = new ArrayList();
foreach (XmlNode structure in n.SelectNodes("Structure/DocumentType")) {
DocumentType dtt = DocumentType.GetByAlias(xmlHelper.GetNodeValue(structure));
- allowed.Add(dtt.Id);
+ if(dtt != null)
+ allowed.Add(dtt.Id);
}
+
int[] adt = new int[allowed.Count];
for (int i = 0; i < allowed.Count; i++)
adt[i] = (int)allowed[i];
diff --git a/umbraco/cms/businesslogic/Packager/PackageInstance/PackageInstance.cs b/umbraco/cms/businesslogic/Packager/PackageInstance/PackageInstance.cs
index badfd3e366..72ad1b7b43 100644
--- a/umbraco/cms/businesslogic/Packager/PackageInstance/PackageInstance.cs
+++ b/umbraco/cms/businesslogic/Packager/PackageInstance/PackageInstance.cs
@@ -40,6 +40,7 @@ namespace umbraco.cms.businesslogic.packager
private string _repoGuid;
private string _packageGuid;
private bool _hasUpdate;
+ private bool _enableSkins = false;
private string _actions;
public int Id
@@ -63,6 +64,12 @@ namespace umbraco.cms.businesslogic.packager
set { _hasUpdate = value; }
}
+ public bool EnableSkins
+ {
+ get { return _enableSkins; }
+ set { _enableSkins = value; }
+ }
+
public String Name
{
get { return _name; }
diff --git a/umbraco/cms/businesslogic/Packager/data.cs b/umbraco/cms/businesslogic/Packager/data.cs
index 10675573a5..9b34849859 100644
--- a/umbraco/cms/businesslogic/Packager/data.cs
+++ b/umbraco/cms/businesslogic/Packager/data.cs
@@ -90,6 +90,7 @@ namespace umbraco.cms.businesslogic.packager
instance.Attributes.Append(xmlHelper.addAttribute(Source, "repositoryGuid", ""));
instance.Attributes.Append(xmlHelper.addAttribute(Source, "packageGuid", System.Guid.NewGuid().ToString()));
instance.Attributes.Append(xmlHelper.addAttribute(Source, "hasUpdate", "false"));
+ instance.Attributes.Append(xmlHelper.addAttribute(Source, "enableSkins", "false"));
XmlElement license = Source.CreateElement("license");
license.InnerText = "MIT license";
@@ -180,6 +181,7 @@ namespace umbraco.cms.businesslogic.packager
retVal.RepositoryGuid = safeAttribute("repositoryGuid", n);
retVal.PackageGuid = safeAttribute("packageGuid", n);
retVal.HasUpdate = bool.Parse(safeAttribute("hasUpdate",n));
+ retVal.EnableSkins = bool.Parse(safeAttribute("enableSkins", n));
retVal.License = safeNodeValue(n.SelectSingleNode("license"));
retVal.LicenseUrl = n.SelectSingleNode("license").Attributes.GetNamedItem("url").Value;
@@ -254,6 +256,7 @@ namespace umbraco.cms.businesslogic.packager
_xmlDef.Attributes.GetNamedItem("packageGuid").Value = package.PackageGuid;
_xmlDef.Attributes.GetNamedItem("hasUpdate").Value = package.HasUpdate.ToString();
+ _xmlDef.Attributes.GetNamedItem("enableSkins").Value = package.EnableSkins.ToString();
_xmlDef.SelectSingleNode("license").FirstChild.Value = package.License;
_xmlDef.SelectSingleNode("license").Attributes.GetNamedItem("url").Value = package.LicenseUrl;
diff --git a/umbraco/cms/businesslogic/installer/IInstallerStep.cs b/umbraco/cms/businesslogic/installer/IInstallerStep.cs
index e8c163a464..db5fea82b5 100644
--- a/umbraco/cms/businesslogic/installer/IInstallerStep.cs
+++ b/umbraco/cms/businesslogic/installer/IInstallerStep.cs
@@ -6,7 +6,9 @@ namespace umbraco.cms.businesslogic.installer
string Alias { get;}
bool Completed();
string Name { get;}
- string NextStep();
string UserControl {get;}
+
+ string NextButtonText { get; }
+ string NextButtonClientSideClick { get; }
}
}
diff --git a/umbraco/cms/businesslogic/installer/InstallerStep.cs b/umbraco/cms/businesslogic/installer/InstallerStep.cs
index f3a7f55cd9..abfc8e3971 100644
--- a/umbraco/cms/businesslogic/installer/InstallerStep.cs
+++ b/umbraco/cms/businesslogic/installer/InstallerStep.cs
@@ -5,7 +5,7 @@ using System.Text;
namespace umbraco.cms.businesslogic.installer
{
- public abstract class InstallerStep : umbraco.cms.businesslogic.installer.IInstallerStep
+ public abstract class InstallerStep : IInstallerStep
{
public abstract string Alias { get; }
public abstract string Name { get; }
@@ -17,8 +17,15 @@ namespace umbraco.cms.businesslogic.installer
public abstract bool Completed();
- public virtual string NextStep(){
- return "meh";
+ public virtual string NextButtonText
+ {
+ get { return "Next »"; }
}
+
+ public virtual string NextButtonClientSideClick
+ {
+ get { return "showProgress(this,'loadingBar'); return true;"; }
+ }
+
}
}
diff --git a/umbraco/cms/umbraco.cms.csproj b/umbraco/cms/umbraco.cms.csproj
index 6c1390bcaa..2c070da9cd 100644
--- a/umbraco/cms/umbraco.cms.csproj
+++ b/umbraco/cms/umbraco.cms.csproj
@@ -199,9 +199,7 @@
-
- Code
-
+
Code
diff --git a/umbraco/presentation/config/xsltExtensions.config b/umbraco/presentation/config/xsltExtensions.config
index ca4dd26e58..48c77ba0ff 100644
--- a/umbraco/presentation/config/xsltExtensions.config
+++ b/umbraco/presentation/config/xsltExtensions.config
@@ -2,4 +2,7 @@
+
+
+
diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx
index 610d4c9c80..a55747a2b1 100644
--- a/umbraco/presentation/install/default.aspx
+++ b/umbraco/presentation/install/default.aspx
@@ -24,7 +24,7 @@
-
+
+
\ No newline at end of file
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs
index e8ee36c952..de8b9a8dcb 100644
--- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs
+++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs
@@ -35,7 +35,6 @@ namespace umbraco.presentation.install.steps.Skinning
{
rep_starterKits.DataSource = repo.Webservice.StarterKits();
rep_starterKits.DataBind();
-
}
catch (Exception ex)
{
@@ -60,6 +59,7 @@ namespace umbraco.presentation.install.steps.Skinning
pl_loadStarterKits.Controls.Clear();
pl_loadStarterKits.Controls.Add(fb);
}
+
protected void SelectStarterKit(object sender, EventArgs e)
{
Guid kitGuid = new Guid(((LinkButton)sender).CommandArgument);
diff --git a/umbraco/presentation/install/steps/chooseStarterKit.ascx b/umbraco/presentation/install/steps/chooseStarterKit.ascx
new file mode 100644
index 0000000000..29df36905d
--- /dev/null
+++ b/umbraco/presentation/install/steps/chooseStarterKit.ascx
@@ -0,0 +1 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="chooseStarterKit.ascx.cs" Inherits="umbraco.presentation.install.steps.chooseStarterKit" %>
diff --git a/umbraco/presentation/install/steps/chooseStarterKit.ascx.cs b/umbraco/presentation/install/steps/chooseStarterKit.ascx.cs
new file mode 100644
index 0000000000..48e2e0d90e
--- /dev/null
+++ b/umbraco/presentation/install/steps/chooseStarterKit.ascx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace umbraco.presentation.install.steps
+{
+ public partial class chooseStarterKit : System.Web.UI.UserControl
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/umbraco/presentation/install/steps/chooseStarterKit.ascx.designer.cs b/umbraco/presentation/install/steps/chooseStarterKit.ascx.designer.cs
new file mode 100644
index 0000000000..d40308ac22
--- /dev/null
+++ b/umbraco/presentation/install/steps/chooseStarterKit.ascx.designer.cs
@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+//
+// 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.install.steps
+{
+
+
+ public partial class chooseStarterKit
+ {
+ }
+}
diff --git a/umbraco/presentation/install/steps/chooseStarterKitDesign.ascx b/umbraco/presentation/install/steps/chooseStarterKitDesign.ascx
new file mode 100644
index 0000000000..b2d4763e29
--- /dev/null
+++ b/umbraco/presentation/install/steps/chooseStarterKitDesign.ascx
@@ -0,0 +1 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="chooseStarterKitDesign.ascx.cs" Inherits="umbraco.presentation.install.steps.chooseStarterKitDesign" %>
diff --git a/umbraco/presentation/install/steps/chooseStarterKitDesign.ascx.cs b/umbraco/presentation/install/steps/chooseStarterKitDesign.ascx.cs
new file mode 100644
index 0000000000..11d52afb89
--- /dev/null
+++ b/umbraco/presentation/install/steps/chooseStarterKitDesign.ascx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace umbraco.presentation.install.steps
+{
+ public partial class chooseStarterKitDesign : System.Web.UI.UserControl
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/umbraco/presentation/install/steps/chooseStarterKitDesign.ascx.designer.cs b/umbraco/presentation/install/steps/chooseStarterKitDesign.ascx.designer.cs
new file mode 100644
index 0000000000..2b11aeea63
--- /dev/null
+++ b/umbraco/presentation/install/steps/chooseStarterKitDesign.ascx.designer.cs
@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+//
+// 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.install.steps
+{
+
+
+ public partial class chooseStarterKitDesign
+ {
+ }
+}
diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx
index f1a731f335..db0d219ab4 100644
--- a/umbraco/presentation/install/steps/database.ascx
+++ b/umbraco/presentation/install/steps/database.ascx
@@ -1,6 +1,8 @@
<%@ Control Language="c#" AutoEventWireup="True" Codebehind="database.ascx.cs" Inherits="umbraco.presentation.install.steps.detect"
TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
-Step 2/5: Database configuration
+
+
+Database configuration
diff --git a/umbraco/presentation/install/steps/defaultUser.ascx b/umbraco/presentation/install/steps/defaultUser.ascx
index 1f5e7da947..19cd6b287a 100644
--- a/umbraco/presentation/install/steps/defaultUser.ascx
+++ b/umbraco/presentation/install/steps/defaultUser.ascx
@@ -1,14 +1,9 @@
<%@ Control Language="c#" AutoEventWireup="True" Codebehind="defaultUser.ascx.cs" Inherits="umbraco.presentation.install.steps.defaultUser" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
-Step 4/5: Check umbraco security
- umbraco creates a default user with a login ('admin') and password ('default') . It's important that the password is
- changed to something unique.
+ Please configure the password for the default umbraco administrator.
-
- This step will check the default user's password and suggest if it needs to be changed.
-
diff --git a/umbraco/presentation/install/steps/defaultUser.ascx.cs b/umbraco/presentation/install/steps/defaultUser.ascx.cs
index 1eced9f1d1..e0c0d1f299 100644
--- a/umbraco/presentation/install/steps/defaultUser.ascx.cs
+++ b/umbraco/presentation/install/steps/defaultUser.ascx.cs
@@ -19,9 +19,6 @@ namespace umbraco.presentation.install.steps
protected void Page_Load(object sender, System.EventArgs e)
{
- // Disable back/forward buttons
- Page.FindControl("next").Visible = false;
-
BusinessLogic.User u = BusinessLogic.User.GetUser(0);
if (u.NoConsole || u.Disabled)
diff --git a/umbraco/presentation/install/steps/defaultUser.ascx.designer.cs b/umbraco/presentation/install/steps/defaultUser.ascx.designer.cs
index 55e3994fcd..74a8cdf941 100644
--- a/umbraco/presentation/install/steps/defaultUser.ascx.designer.cs
+++ b/umbraco/presentation/install/steps/defaultUser.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/umbraco/presentation/install/style.css b/umbraco/presentation/install/style.css
index ae26476ac3..925f6483a9 100644
--- a/umbraco/presentation/install/style.css
+++ b/umbraco/presentation/install/style.css
@@ -23,4 +23,16 @@
#buttons{text-align: center; position: relative; border-top: 1px solid #eaeaea; margin-top: 40px;}
#buttons img{margin: auto; margin-top: 15px;}
#buttons .next{position: absolute; top: 10px; right: 10px;}
-
\ No newline at end of file
+
+
+ #starterKits{list-style: none; margin: 0; padding: 10px;}
+ #starterKits li{float: left; margin: 20px; display: block; width: 20%; padding: 5px; border: 1px solid #efefef; text-align: center;}
+ #starterKits li a{text-decoration: none; color: #999}
+ #starterKits li span{display: block; text-align: center; padding-top: 10px;}
+ #starterKits li div{display: none !Important;}
+ #starterKits li img{border: none;}
+
+ #starterKitDesc{clear: both; font-size: 1.5em; font-weight: bold; color: #999; padding: 10px; text-align: center;}
+ #declineStarterKits{display: block; font-size: 1em; padding: 20px;}
+
+ #loadingBar{display: none;}
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index 4312cf9d9b..cedad15561 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -186,6 +186,20 @@
Properties\SolutionInfo.cs
+
+ chooseStarterKit.ascx
+ ASPXCodeBehind
+
+
+ chooseStarterKit.ascx
+
+
+ chooseStarterKitDesign.ascx
+ ASPXCodeBehind
+
+
+ chooseStarterKitDesign.ascx
+
database.ascx
ASPXCodeBehind
@@ -1554,7 +1568,10 @@
+
+
+