mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12213 from sebomoto/add-loadfeedback 

Add loadfeedback
This commit is contained in:
Jan-Christoph Borchardt 2015-02-18 19:42:18 +01:00
parent 8d09cc3b91 7ffd2557ff
commit 83bc951630
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/css/styles.css
View File

@ -36,7 +36,9 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
} }
.float-spinner {
height: 32px;
}
#nojavascript { #nojavascript {
position: fixed; position: fixed;

4
core/js/setup.js
View File

@ -51,6 +51,9 @@ $(document).ready(function() {
// Save form parameters // Save form parameters
var post = $(this).serializeArray(); var post = $(this).serializeArray();
// Show spinner while finishing setup
$('.float-spinner').show(250);
// Disable inputs // Disable inputs
$(':submit', this).attr('disabled','disabled').val($(':submit', this).data('finishing')); $(':submit', this).attr('disabled','disabled').val($(':submit', this).data('finishing'));
$('input', this).addClass('ui-state-disabled').attr('disabled','disabled'); $('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
@ -91,6 +94,7 @@ $(document).ready(function() {
$('#datadirContent').hide(250); $('#datadirContent').hide(250);
$('#databaseBackend').hide(250); $('#databaseBackend').hide(250);
$('#databaseField').hide(250); $('#databaseField').hide(250);
$('.float-spinner').hide(250);
} }
$('#adminpass').strengthify({ $('#adminpass').strengthify({

2
core/templates/installation.php
View File

@ -146,6 +146,8 @@ script('core', [
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
<div class="icon-loading-dark float-spinner">&nbsp;</div>
<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
<fieldset id="sqliteInformation" class="warning"> <fieldset id="sqliteInformation" class="warning">
<legend><?php p($l->t('Performance Warning'));?></legend> <legend><?php p($l->t('Performance Warning'));?></legend>