summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-11-27 23:07:19 +0100
committerMorris Jobke <morris.jobke@gmail.com>2013-11-27 23:07:19 +0100
commit55d7cf8ffd1170f2397fecefaeef5749bb182f32 (patch)
tree07becef3f0f8b4417c51e8d74bad4449d0d0160a
parentd9729168f94df89c28f2f456e6e7188127f30ab3 (diff)
downloadnextcloud-server-55d7cf8ffd1170f2397fecefaeef5749bb182f32.tar.gz
nextcloud-server-55d7cf8ffd1170f2397fecefaeef5749bb182f32.zip
improve encryption message
-rw-r--r--apps/files_encryption/js/detect-migration.js2
-rw-r--r--core/css/styles.css4
-rw-r--r--core/templates/login.php2
3 files changed, 6 insertions, 2 deletions
diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js
index ed548edcfa5..301e77f24f7 100644
--- a/apps/files_encryption/js/detect-migration.js
+++ b/apps/files_encryption/js/detect-migration.js
@@ -20,7 +20,7 @@ $(document).ready(function(){
if (response.data.migrationCompleted === false) {
var message = t('files_encryption', 'Initial encryption started... This can take some time. Please wait.');
$('#messageText').text(message);
- $('#message').removeClass('hidden').addClass('info');
+ $('#message').removeClass('hidden').addClass('update');
}
}
});
diff --git a/core/css/styles.css b/core/css/styles.css
index 5b8b39f9811..859f11ff0a8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -486,6 +486,10 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
color: #ccc;
}
+#body-login .update img.float-spinner {
+ float: left;
+}
+
#body-user .warning, #body-settings .warning {
margin-top: 8px;
padding: 5px;
diff --git a/core/templates/login.php b/core/templates/login.php
index 0c040dbdb18..b81128a3269 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -19,7 +19,7 @@
</div>
<?php endif; ?>
<p id="message" class="hidden">
- <img src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/>
+ <img class="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/>
<span id="messageText"></span>
</p>
<p class="infield grouptop">