diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 22:36:47 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 22:36:47 +0100 |
| commit | 0219b8b3b95ba3b346107531721bea61a0c242da (patch) | |
| tree | 9b90e041a741001121805e69ac786005d4a9c1a0 | |
| parent | e0924a5f070b7a22d57cebdc6379e385643ca400 (diff) | |
| download | nextcloud-server-0219b8b3b95ba3b346107531721bea61a0c242da.tar.gz nextcloud-server-0219b8b3b95ba3b346107531721bea61a0c242da.zip | |
add spinner to the template so that it can be loaded in time
| -rw-r--r-- | apps/files_encryption/js/detect-migration.js | 2 | ||||
| -rw-r--r-- | core/templates/login.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js index dea723ff25f..e70159933c4 100644 --- a/apps/files_encryption/js/detect-migration.js +++ b/apps/files_encryption/js/detect-migration.js @@ -19,7 +19,7 @@ $(document).ready(function(){ success: function(response) { if (response.data.migrationCompleted === false) { var message = t('files_encryption', 'Initial encryption started... This can take some time. Please wait.'); - $('p[id="message"]').html('<img src="' + OC.imagePath('core', 'loading-dark.gif') + '"/> ' + message); + $('span[id="messageText"]').text(message); $('p[id="message"]').removeClass('hidden').addClass('info'); } } diff --git a/core/templates/login.php b/core/templates/login.php index c270963439c..0c040dbdb18 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -19,6 +19,8 @@ </div> <?php endif; ?> <p id="message" class="hidden"> + <img src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/> + <span id="messageText"></span> </p> <p class="infield grouptop"> <input type="text" name="user" id="user" placeholder="" |