[Pkg-owncloud-commits] [owncloud] 220/239: add spinner to the template so that it can be loaded in time

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 0219b8b3b95ba3b346107531721bea61a0c242da
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Nov 27 22:36:47 2013 +0100

    add spinner to the template so that it can be loaded in time
---
 apps/files_encryption/js/detect-migration.js | 2 +-
 core/templates/login.php                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js
index dea723f..e701599 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 c270963..0c040db 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=""

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git