changed image to classed div for spinner animation

diff --git a/core/css/styles.css b/core/css/styles.css
index 9604cb0fa4a325ff2e34c18e054db883c4f4d000..1d64d5a5ade0be870c6865c77f615a297aca9d33 100644 (file)
--- 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 1eceb8ced7030cc77c209600a1ce572ff3787f6a..9729e3862ac5990bac4f793175401c9666b8c607 100644 (file)
--- 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 9ef63dbfe8c88bb03127652416bd5966f71cee65..c08cfa22cdebedcf0c05f3b3802682784c1add40 100644 (file)
--- 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>