diff --git a/umbraco/cms/umbraco.cms.csproj b/umbraco/cms/umbraco.cms.csproj index 74fa1a1722..e8ea11eba1 100644 --- a/umbraco/cms/umbraco.cms.csproj +++ b/umbraco/cms/umbraco.cms.csproj @@ -104,8 +104,7 @@ ..\..\foreign dlls\HtmlAgilityPack.dll - - False + ..\..\foreign dlls\ICSharpCode.SharpZipLib.dll diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx index 4e2df548ab..c420cf41e0 100644 --- a/umbraco/presentation/install/default.aspx +++ b/umbraco/presentation/install/default.aspx @@ -84,41 +84,7 @@ - - +
diff --git a/umbraco/presentation/install/js/jquery.main.js b/umbraco/presentation/install/js/jquery.main.js index ac200fb61c..e776ce97a4 100644 --- a/umbraco/presentation/install/js/jquery.main.js +++ b/umbraco/presentation/install/js/jquery.main.js @@ -16,6 +16,9 @@ function initProgressBar() { updateProgressBar(0); } + + + function updateProgressBar(percent) { jQuery('.loader').each(function () { var set = jQuery(this); @@ -32,6 +35,8 @@ function updateStatusMessage(message) { jQuery(".loader > strong").text(message); } + + function initButtonHover() { if (typeof document.body.style.maxHeight == 'undefined') ie6 = true; else ie6 = false; diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs index c69f948fa9..7bf3bffc2e 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs @@ -36,6 +36,9 @@ namespace umbraco.presentation.install.steps.Skinning { try { + //clear progress bar cache + Helper.clearProgress(); + rep_starterKitDesigns.DataSource = repo.Webservice.Skins(StarterKitGuid.ToString()); rep_starterKitDesigns.DataBind(); } diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs index 68b9f011d8..bba69111b2 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs @@ -35,6 +35,9 @@ namespace umbraco.presentation.install.steps.Skinning { base.OnInit(e); + //clear progressbar cache + Helper.clearProgress(); + if (repo.HasConnection()) { try @@ -68,7 +71,7 @@ namespace umbraco.presentation.install.steps.Skinning protected void SelectStarterKit(object sender, EventArgs e) { - Helper.clearProgress(); + Guid kitGuid = new Guid(((LinkButton)sender).CommandArgument); diff --git a/umbraco/presentation/install/steps/skinning.ascx b/umbraco/presentation/install/steps/skinning.ascx index a70e3fdfcf..2e1e22b534 100644 --- a/umbraco/presentation/install/steps/skinning.ascx +++ b/umbraco/presentation/install/steps/skinning.ascx @@ -6,11 +6,18 @@ @@ -102,4 +131,28 @@ Starting installation...
+ + + + \ No newline at end of file