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

CSS tweaks to fix scroll bars on large monitors. Also plugged in progress bar and progress messages on database install step in the installer.

Browse Source 
[TFS Changeset #81603]
This commit is contained in:
munkimagik
2010-12-07 16:17:20 +00:00
parent d1fd368fdd
commit e0c3ed98a5
3 changed files with 580 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
umbraco/presentation/install/css/all.css
View File

@@ -42,8 +42,8 @@ figure{display: block;}
position:absolute;
top:0;
left:0;
width:50%;
height:1250px;
width:1%;
height:1050px;
}
.bg-main {
position:absolute;
@@ -62,7 +62,7 @@ figure{display: block;}
top: 0;
left: 0;
width:100%;
height:1250px;
height:1050px;
}
.bg-main .color1 .bg-r,
.bg-main .color2 .bg-r,
@@ -73,7 +73,7 @@ figure{display: block;}
top: 0;
left: 50%;
width:50%;
height:1250px;
height:1050px;
}
.bg-main .color1 .bg-c,
.bg-main .color2 .bg-c,
@@ -84,7 +84,7 @@ figure{display: block;}
top: 0;
left: 0;
width:100%;
height:1250px;
height:1050px;
}
/* Color 1 */
@@ -114,7 +114,7 @@ figure{display: block;}
}
.wholder{
width:100%;
min-height:1200px;
min-height:1000px;
position:relative;
padding:0 0 50px;
}

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

File diff suppressed because one or more lines are too long

64
umbraco/presentation/install/steps/database.ascx
View File

@@ -107,7 +107,7 @@
<!-- btn box -->
<footer class="btn-box">
<div class="t">&nbsp;</div>
<asp:LinkButton runat="server" class="single-tab submit btn-install" onclick="saveDBConfig"><span>install</span</asp:LinkButton>
<asp:LinkButton runat="server" class="single-tab submit btn-install" onclick="saveDBConfig"><span>install</span> </asp:LinkButton>
</footer>
</div>
</div>
@@ -152,7 +152,7 @@
</div>
<span class="progress-bar-value">56%</span>
</div>
<strong>Installation complete</strong>
<strong></strong>
</div>
</div>
<!-- btn box -->
@@ -163,41 +163,37 @@
</div>
<script type="text/javascript">
var intervalId = 0;
var intervalId = 0;
var pBar = jQuery(".progress-bar").progressbar({value: 0});
jQuery(document).ready(function () {
jQuery(".progress-bar").progressbar("option", "value", 0);
intervalId = setInterval("updateProgressBar()", 1000);
jQuery.ajax({
type: 'POST',
contentType: 'application/json; charset=utf-8',
data: '{}',
dataType: 'json',
url: 'utills/p.aspx/installOrUpgrade',
success: function (result) {
clearInterval(intervalId);
jQuery(".btn-box").show();
}
});
});
function updateProgressBar() {
jQuery.getJSON('utills/p.aspx?feed=progress', function (data) {
alert(data.percentage);
jQuery(".progress-bar").progressbar("option", "value", data.percentage);
jQuery(".loader strong").text(data.description);
jQuery(document).ready(function () {
intervalId = setInterval("progressBarCallback()", 1000);
jQuery(".btn-box").hide();
jQuery.ajax({
type: 'POST',
contentType: 'application/json; charset=utf-8',
data: '{}',
dataType: 'json',
url: 'utills/p.aspx/installOrUpgrade'
});
});
}
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>
</asp:PlaceHolder>
@@ -214,7 +210,7 @@
</asp:PlaceHolder>
<asp:PlaceHolder ID="upgradeConfirm" runat="server" Visible="False">
<h1>
Database upgraded</h2>
Database upgraded</h1>
<div class="success">
<p>
Your database has been upgraded to the final version