yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added progressbars to skins and starterkits, altho that part has problems, as the counter resets when the app-pool resets due to starter-kit dlls

Browse Source 
[TFS Changeset #81610]
This commit is contained in:
PerPloug
2010-12-07 21:08:15 +00:00
parent e0c3ed98a5
commit a7b0695ced
6 changed files with 68 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
umbraco/cms/umbraco.cms.csproj
View File

@@ -104,8 +104,7 @@
<Reference Include="HtmlAgilityPack">
<HintPath>..\..\foreign dlls\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\..\foreign dlls\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="System">

36
umbraco/presentation/install/default.aspx
View File

@@ -84,41 +84,7 @@
</div>
</section>
<!-- lightbox -->
<div class="lightbox" id="lightbox">
<a href="#" class="btn-close btn-close-box">close</a>
<div class="t">&nbsp;</div>
<div class="c">
<div class="heading">
<strong class="title">Name of skin</strong>
<span class="create">Created by: <a href="#">Cogworks</a></span>
</div>
<div class="carusel">
<ul>
<li><img src="images/img09.jpg" alt="image description"></li>
<li><img src="images/img10.jpg" alt="image description"></li>
<li><img src="images/img11.jpg" alt="image description"></li>
</ul>
</div>
<footer class="btn-box">
<a href="#single-tab4" class="single-tab btn-install btn-close-box">Install</a>
</footer>
</div>
<div class="b">&nbsp;</div>
</div>
<!-- bg page -->
<div class="bg-main">

5
umbraco/presentation/install/js/jquery.main.js
View File

@@ -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;

3
umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
View File

@@ -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();
}

5
umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs
View File

@@ -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);

55
umbraco/presentation/install/steps/skinning.ascx
View File

@@ -6,11 +6,18 @@
<ContentTemplate>
<script type="text/javascript">
var intervalId = 0;
jQuery(document).ready(function () {
jQuery('.zoom-list a.selectStarterKit').click(function () {
jQuery('.main-tabinfo').hide();
jQuery('#starterkitname').html( jQuery('span', this).html() );
jQuery('#single-tab1').show();
//fire off the progressbar
intervalId = setInterval("progressBarCallback()", 1000);
return true;
});
});
@@ -29,12 +36,34 @@
jQuery('#browseSkins').hide();
jQuery('#installingSkin').show();
//fire off the progressbar
intervalId = setInterval("progressBarCallback()", 1000);
jQuery('#skinname').html(jQuery('span', this).html());
return true;
});
}
}
function progressBarCallback() {
jQuery.getJSON('utills/p.aspx?feed=progress', function (data) {
updateProgressBar(data.percentage);
updateStatusMessage(data.message)
if (data.error != "") {
clearInterval(intervalId);
updateStatusMessage(data.error);
}
if (data.percentage == 100) {
clearInterval(intervalId);
jQuery(".btn-box").show();
}
});
}
</script>
</script>
@@ -102,4 +131,28 @@
<strong>Starting installation...</strong>
</div>
</div>
</div>
<!-- lightbox -->
<div class="lightbox" id="lightbox">
<a href="#" class="btn-close btn-close-box">close</a>
<div class="t">&nbsp;</div>
<div class="c">
<div class="heading">
<strong class="title">Name of skin</strong>
<span class="create">Created by: <a href="#">Cogworks</a></span>
</div>
<div class="carusel">
<ul>
<li><img src="images/img09.jpg" alt="image description"></li>
<li><img src="images/img10.jpg" alt="image description"></li>
<li><img src="images/img11.jpg" alt="image description"></li>
</ul>
</div>
<footer class="btn-box" style="display: none;">
<a href="#single-tab4" class="single-tab btn-install btn-close-box">Install</a>
</footer>
</div>
<div class="b">&nbsp;</div>
</div>