[Pkg-owncloud-commits] [owncloud] 222/239: improve encryption message

[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 55d7cf8ffd1170f2397fecefaeef5749bb182f32
Author: Morris Jobke <morris.jobke at gmail.com>
Date:   Wed Nov 27 23:07:19 2013 +0100

    improve encryption message
---
 apps/files_encryption/js/detect-migration.js | 2 +-
 core/css/styles.css                          | 4 ++++
 core/templates/login.php                     | 2 +-
 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 ed548ed..301e77f 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 5b8b39f..859f11f 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 0c040db..b81128a 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">

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