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

Fixes scrollbar and database val msg

Browse Source
This commit is contained in:
perploug
2014-03-06 12:27:46 +01:00
parent d08f08ffaf
commit 4aa3e1368a
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/installer/installer.service.js
View File

@@ -59,7 +59,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
var pct = "100%";
var f = _.find(steps, function(item, index) {
if(item.name == next){
pct = Math.floor((index / steps.length * 100)) + "%";
pct = Math.floor((index+1 / steps.length * 100)) + "%";
return true;
}else{
return false;
@@ -250,7 +250,6 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
if (desc) {
service.status.feedback = desc;
}
processInstallStep();
}
}
@@ -293,6 +292,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
service.status.loading = false;
service.status.configuring = true;
service.status.feedback = undefined;
service.status.fact = undefined;
if(factTimer){
clearInterval(factTimer);

15
src/Umbraco.Web.UI.Client/src/installer/steps/database.html
View File

@@ -116,16 +116,13 @@
<input type="submit" ng-disabled="myForm.$invalid || checking"
value="Continue" class="btn btn-success" />
<br/>
<span class="inline-help" ng-if="checking" ng-animate="'fade'">
Validating your database connection
</span>
<span class="inline-help error" ng-if="invalidDbDns" ng-animate="'fade'">
Could not connect to the database, please correct your connection details
</span>
<span class="inline-help" ng-if="checking" ng-animate="'fade'">
Validating your database connection...
</span>
<span class="inline-help error" ng-if="invalidDbDns" ng-animate="'fade'">
Could not connect to database
</span>
</div>
</div>
</div>