summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-11-27 21:58:38 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-11-27 21:58:38 +0100
commite0924a5f070b7a22d57cebdc6379e385643ca400 (patch)
tree5a869ec6708b98f0cd2bc7b297f90f098bff9a2d
parent1536c7ea586be3f94bfc149fbb2c0c94ea1dbddc (diff)
downloadnextcloud-server-e0924a5f070b7a22d57cebdc6379e385643ca400.tar.gz
nextcloud-server-e0924a5f070b7a22d57cebdc6379e385643ca400.zip
switch to large spinner
-rw-r--r--apps/files_encryption/js/detect-migration.js4
-rw-r--r--core/css/styles.css5
-rw-r--r--core/img/loading-dark-small.gifbin1324 -> 0 bytes
3 files changed, 7 insertions, 2 deletions
diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js
index e726515abc2..dea723ff25f 100644
--- a/apps/files_encryption/js/detect-migration.js
+++ b/apps/files_encryption/js/detect-migration.js
@@ -7,7 +7,7 @@
$(document).ready(function(){
- $('form[name="login"]').on('submit', function(ev) {
+ $('form[name="login"]').on('submit', function() {
var user = $('#user').val();
var password = $('#password').val();
$.ajax({
@@ -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-small.gif') + '"/> ' + message);
+ $('p[id="message"]').html('<img src="' + OC.imagePath('core', 'loading-dark.gif') + '"/> ' + message);
$('p[id="message"]').removeClass('hidden').addClass('info');
}
}
diff --git a/core/css/styles.css b/core/css/styles.css
index 5c0aa1fedc2..5b8b39f9811 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -283,6 +283,11 @@ input[type="submit"].enabled {
opacity: .6;
}
+#body-login p#message img {
+ vertical-align: middle;
+ padding: 5px;
+}
+
#body-login div.buttons { text-align:center; }
#body-login p.info {
width: 22em;
diff --git a/core/img/loading-dark-small.gif b/core/img/loading-dark-small.gif
deleted file mode 100644
index 87fe79b8bb4..00000000000
--- a/core/img/loading-dark-small.gif
+++ /dev/null
Binary files differ