diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-02-18 19:42:18 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-02-18 19:42:18 +0100 |
| commit | 83bc951630c396cb0318d1b5c270a3c683fd4818 (patch) | |
| tree | d51aa420ba2bd6dc05ae1053afb22639cc9980fb | |
| parent | 8d09cc3b91a9689a6c95e06c8002288bdd8d5bbf (diff) | |
| parent | 7ffd2557fff720a5fe5c2a80393f51c60290e8c2 (diff) | |
| download | nextcloud-server-83bc951630c396cb0318d1b5c270a3c683fd4818.tar.gz nextcloud-server-83bc951630c396cb0318d1b5c270a3c683fd4818.zip | |
Merge pull request #12213 from sebomoto/add-loadfeedback
Add loadfeedback
| -rw-r--r-- | core/css/styles.css | 4 | ||||
| -rw-r--r-- | core/js/setup.js | 4 | ||||
| -rw-r--r-- | core/templates/installation.php | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index df4db4d745a..1371de91f31 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -36,7 +36,9 @@ body { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ } - +.float-spinner { + height: 32px; +} #nojavascript { position: fixed; diff --git a/core/js/setup.js b/core/js/setup.js index e65b795646e..95237165b40 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -51,6 +51,9 @@ $(document).ready(function() { // Save form parameters var post = $(this).serializeArray(); + // Show spinner while finishing setup + $('.float-spinner').show(250); + // Disable inputs $(':submit', this).attr('disabled','disabled').val($(':submit', this).data('finishing')); $('input', this).addClass('ui-state-disabled').attr('disabled','disabled'); @@ -91,6 +94,7 @@ $(document).ready(function() { $('#datadirContent').hide(250); $('#databaseBackend').hide(250); $('#databaseField').hide(250); + $('.float-spinner').hide(250); } $('#adminpass').strengthify({ diff --git a/core/templates/installation.php b/core/templates/installation.php index 4e9cde205d8..f8311fed009 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -145,6 +145,8 @@ script('core', [ </fieldset> <?php endif; ?> <?php endif; ?> + + <div class="icon-loading-dark float-spinner"> </div> <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> <fieldset id="sqliteInformation" class="warning"> |