From d6fb2afa8580b7d12b1f0cfc2bb8fb29e01a087f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 25 Nov 2013 23:49:05 +0100
Subject: show a message at the log-in screen if inital encryption take place

---
 apps/files_encryption/js/detect-migration.js | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 apps/files_encryption/js/detect-migration.js

(limited to 'apps/files_encryption/js')

diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js
new file mode 100644
index 00000000000..eadcd237078
--- /dev/null
+++ b/apps/files_encryption/js/detect-migration.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2013
+ *  Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+
+$(document).ready(function(){
+	$('form[name="login"]').on('submit', function(ev) {
+		var user = $('#user').val();
+		var password = $('#password').val();
+		$.ajax({
+			type: 'GET',
+			url: OC.linkTo('files_encryption', 'ajax/getMigrationStatus.php'),
+			dataType: 'json',
+			data: {user: user, password: password},
+			async: false,
+			success: function(response) {
+				if (response.data.migrationCompleted === false) {
+					var message = t('files_encryption', 'Initial encryption started... This can take some time. Please wait.');
+					$('p[name="message"]').html('<img src="' + OC.imagePath('core', 'loading-small.gif') + '"/>  ' + message);
+					$('p[name="message"]').removeClass('hidden').addClass('info');
+				}
+			}
+		});
+	});
+
+});
-- 
cgit v1.2.3


From 0617e06f69bdfbfb71733b5c4dcc1532b0823a51 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 26 Nov 2013 11:38:49 +0100
Subject: use POST instead of GET

---
 apps/files_encryption/ajax/getMigrationStatus.php | 4 ++--
 apps/files_encryption/js/detect-migration.js      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'apps/files_encryption/js')

diff --git a/apps/files_encryption/ajax/getMigrationStatus.php b/apps/files_encryption/ajax/getMigrationStatus.php
index f912a238caa..a28ebfac7f7 100644
--- a/apps/files_encryption/ajax/getMigrationStatus.php
+++ b/apps/files_encryption/ajax/getMigrationStatus.php
@@ -10,8 +10,8 @@ use OCA\Encryption\Util;
 
 \OCP\JSON::checkAppEnabled('files_encryption');
 
-$user = isset($_GET['user']) ? $_GET['user'] : '';
-$password = isset($_GET['password']) ? $_GET['password'] : '';
+$user = isset($_POST['user']) ? $_POST['user'] : '';
+$password = isset($_POST['password']) ? $_POST['password'] : '';
 
 $migrationCompleted = true;
 
diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js
index eadcd237078..2ee105cbfaf 100644
--- a/apps/files_encryption/js/detect-migration.js
+++ b/apps/files_encryption/js/detect-migration.js
@@ -11,7 +11,7 @@ $(document).ready(function(){
 		var user = $('#user').val();
 		var password = $('#password').val();
 		$.ajax({
-			type: 'GET',
+			type: 'POST',
 			url: OC.linkTo('files_encryption', 'ajax/getMigrationStatus.php'),
 			dataType: 'json',
 			data: {user: user, password: password},
-- 
cgit v1.2.3


From c7e1fe50c23771995bebf218c18deaf12ba628ca Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 26 Nov 2013 17:14:16 +0100
Subject: added a small version of the dark loading gif, looks nicer on the
 blue background

---
 apps/files_encryption/js/detect-migration.js |   2 +-
 core/img/loading-dark-small.gif              | Bin 0 -> 1324 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 core/img/loading-dark-small.gif

(limited to 'apps/files_encryption/js')

diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js
index 2ee105cbfaf..2cf6a61d145 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[name="message"]').html('<img src="' + OC.imagePath('core', 'loading-small.gif') + '"/>  ' + message);
+					$('p[name="message"]').html('<img src="' + OC.imagePath('core', 'loading-dark-small.gif') + '"/>  ' + message);
 					$('p[name="message"]').removeClass('hidden').addClass('info');
 				}
 			}
diff --git a/core/img/loading-dark-small.gif b/core/img/loading-dark-small.gif
new file mode 100644
index 00000000000..87fe79b8bb4
Binary files /dev/null and b/core/img/loading-dark-small.gif differ
-- 
cgit v1.2.3


From 1536c7ea586be3f94bfc149fbb2c0c94ea1dbddc Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 27 Nov 2013 17:01:21 +0100
Subject: switch from "name" attribute to "id"

---
 apps/files_encryption/js/detect-migration.js | 4 ++--
 core/templates/login.php                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'apps/files_encryption/js')

diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js
index 2cf6a61d145..e726515abc2 100644
--- a/apps/files_encryption/js/detect-migration.js
+++ b/apps/files_encryption/js/detect-migration.js
@@ -19,8 +19,8 @@ $(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[name="message"]').html('<img src="' + OC.imagePath('core', 'loading-dark-small.gif') + '"/>  ' + message);
-					$('p[name="message"]').removeClass('hidden').addClass('info');
+					$('p[id="message"]').html('<img src="' + OC.imagePath('core', 'loading-dark-small.gif') + '"/>  ' + message);
+					$('p[id="message"]').removeClass('hidden').addClass('info');
 				}
 			}
 		});
diff --git a/core/templates/login.php b/core/templates/login.php
index 214fda3b61e..c270963439c 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -18,7 +18,7 @@
 				<small><?php p($l->t('Please contact your administrator.')); ?></small>
 			</div>
 		<?php endif; ?>
-		<p name="message" class="hidden">
+		<p id="message" class="hidden">
 		</p>
 		<p class="infield grouptop">
 			<input type="text" name="user" id="user" placeholder=""
-- 
cgit v1.2.3


From e0924a5f070b7a22d57cebdc6379e385643ca400 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 27 Nov 2013 21:58:38 +0100
Subject: switch to large spinner

---
 apps/files_encryption/js/detect-migration.js |   4 ++--
 core/css/styles.css                          |   5 +++++
 core/img/loading-dark-small.gif              | Bin 1324 -> 0 bytes
 3 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 100644 core/img/loading-dark-small.gif

(limited to 'apps/files_encryption/js')

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
Binary files a/core/img/loading-dark-small.gif and /dev/null differ
-- 
cgit v1.2.3


From 0219b8b3b95ba3b346107531721bea61a0c242da Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 27 Nov 2013 22:36:47 +0100
Subject: 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(-)

(limited to 'apps/files_encryption/js')

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=""
-- 
cgit v1.2.3


From d9729168f94df89c28f2f456e6e7188127f30ab3 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 27 Nov 2013 22:42:03 +0100
Subject: some small js fixes

---
 apps/files_encryption/js/detect-migration.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'apps/files_encryption/js')

diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js
index e70159933c4..ed548edcfa5 100644
--- a/apps/files_encryption/js/detect-migration.js
+++ b/apps/files_encryption/js/detect-migration.js
@@ -19,8 +19,8 @@ $(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.');
-					$('span[id="messageText"]').text(message);
-					$('p[id="message"]').removeClass('hidden').addClass('info');
+					$('#messageText').text(message);
+					$('#message').removeClass('hidden').addClass('info');
 				}
 			}
 		});
-- 
cgit v1.2.3


From 55d7cf8ffd1170f2397fecefaeef5749bb182f32 Mon Sep 17 00:00:00 2001
From: Morris Jobke <morris.jobke@gmail.com>
Date: Wed, 27 Nov 2013 23:07:19 +0100
Subject: 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(-)

(limited to 'apps/files_encryption/js')

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">
-- 
cgit v1.2.3