summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Bolt <sebastian.bolt@gmx.de>2014-12-19 06:06:27 +0100
committerSebastian Bolt <sebastian.bolt@gmx.de>2015-02-04 22:27:38 +0100
commit7ffd2557fff720a5fe5c2a80393f51c60290e8c2 (patch)
tree2a55297b2538b7d7b9e94aae865e040753eae710
parentda14a605d5a02d68af44e0153b084d94b676bbff (diff)
downloadnextcloud-server-7ffd2557fff720a5fe5c2a80393f51c60290e8c2.tar.gz
nextcloud-server-7ffd2557fff720a5fe5c2a80393f51c60290e8c2.zip
changed image to classed div for spinner animation
-rw-r--r--core/css/styles.css4
-rw-r--r--core/js/setup.js4
-rw-r--r--core/templates/installation.php2
3 files changed, 9 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index 9604cb0fa4a..1d64d5a5ade 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 1eceb8ced70..9729e3862ac 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 9ef63dbfe8c..c08cfa22cde 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -146,6 +146,8 @@
</fieldset>
<?php endif; ?>
<?php endif; ?>
+
+ <div class="icon-loading-dark float-spinner">&nbsp;</div>
<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
<p id="sqliteInformation" class="info"><?php p($l->t('SQLite will be used as database. For larger installations we recommend to change this.'));?></p>