summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files_encryption/js/detect-migration.js2
-rw-r--r--core/templates/login.php2
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=""