From 9f5e80e794c041dc30855b80a0cb420248c20a54 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 9 Jun 2017 18:07:41 +0200
Subject: [PATCH 1/5] Hijack the quota box in the files app

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 js/quota-files-sidebar.js          | 9 +++++++++
 js/{quota.js => quota-personal.js} | 0
 lib/AppInfo/Application.php        | 3 +++
 templates/quota.php                | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 js/quota-files-sidebar.js
 rename js/{quota.js => quota-personal.js} (100%)

diff --git a/js/quota-files-sidebar.js b/js/quota-files-sidebar.js
new file mode 100644
index 00000000..c1ee5f0b
--- /dev/null
+++ b/js/quota-files-sidebar.js
@@ -0,0 +1,9 @@
+$(document).ready(function () {
+
+	var $p = $('<p>');
+	$p.addClass('quotatext-additional').text(t('external', 'Do you need more space?'));
+	$('li#quota').on('click', function(e) {
+		OC.redirect(OC.generateUrl('/apps/external/1'));
+	});
+	$('li#quota div.quota-container').after($p);
+});
diff --git a/js/quota.js b/js/quota-personal.js
similarity index 100%
rename from js/quota.js
rename to js/quota-personal.js
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 8d68a614..9003f0a1 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -82,6 +82,9 @@ public function registerPersonalPage(array $sites) {
 		foreach ($sites as $site) {
 			if ($site['type'] === SitesManager::TYPE_QUOTA) {
 				\OCP\App::registerPersonal('external', 'personal');
+				\OC::$server->getEventDispatcher()->addListener('OCA\Files::loadAdditionalScripts', function() {
+					\OCP\Util::addScript('external', 'quota-files-sidebar');
+				});
 				return;
 			}
 		}
diff --git a/templates/quota.php b/templates/quota.php
index 24f0c3b0..33c3ec97 100644
--- a/templates/quota.php
+++ b/templates/quota.php
@@ -19,7 +19,7 @@
  *
  */
 
-script('external', 'quota');
+script('external', 'quota-personal');
 ?>
 <div id="quota_link" class="section hidden">
 	<?php foreach ($_['sites'] as $site) { ?>

From 127b5d03ddc0a903bd752ce7115d8e3995f47b64 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 12 Jun 2017 09:58:38 +0200
Subject: [PATCH 2/5] Send the info to the template and use it.

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 js/quota-files-sidebar.js   |  8 +++++---
 lib/AppInfo/Application.php | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/js/quota-files-sidebar.js b/js/quota-files-sidebar.js
index c1ee5f0b..3c53cc15 100644
--- a/js/quota-files-sidebar.js
+++ b/js/quota-files-sidebar.js
@@ -1,9 +1,11 @@
 $(document).ready(function () {
 
-	var $p = $('<p>');
-	$p.addClass('quotatext-additional').text(t('external', 'Do you need more space?'));
+	var $p = $('<p>'),
+		$quotaLink = $('#external_quota_link'),
+		$quotaName = $('#external_quota_name');
+	$p.addClass('quotatext-additional').text($quotaName.val());
 	$('li#quota').on('click', function(e) {
-		OC.redirect(OC.generateUrl('/apps/external/1'));
+		OC.redirect($quotaLink.val());
 	});
 	$('li#quota div.quota-container').after($p);
 });
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 9003f0a1..fdf4a8da 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -25,6 +25,7 @@
 use OCA\External\SitesManager;
 use OCP\AppFramework\App;
 use OCP\IServerContainer;
+use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
 
@@ -42,7 +43,7 @@ public function register() {
 		$sites = $sitesManager->getSitesToDisplay();
 
 		$this->registerNavigationEntries($server, $sites);
-		$this->registerPersonalPage($sites);
+		$this->registerPersonalPage($server, $sites);
 	}
 
 	/**
@@ -76,13 +77,21 @@ public function registerNavigationEntries(IServerContainer $server, array $sites
 	}
 
 	/**
+	 * @param IServerContainer $server
 	 * @param array[] $sites
 	 */
-	public function registerPersonalPage(array $sites) {
+	public function registerPersonalPage(IServerContainer $server, array $sites) {
 		foreach ($sites as $site) {
 			if ($site['type'] === SitesManager::TYPE_QUOTA) {
 				\OCP\App::registerPersonal('external', 'personal');
-				\OC::$server->getEventDispatcher()->addListener('OCA\Files::loadAdditionalScripts', function() {
+				\OC::$server->getEventDispatcher()->addListener('OCA\Files::loadAdditionalScripts', function(GenericEvent $event) use ($server, $site) {
+					$url = $server->getURLGenerator();
+
+					$hiddenFields = $event->getArgument('hiddenFields');
+					$hiddenFields['external_quota_link'] = $url->linkToRoute('external.site.showPage', ['id'=> $site['id']]);
+					$hiddenFields['external_quota_name'] = $site['name'];
+					$event->setArgument('hiddenFields', $hiddenFields);
+
 					\OCP\Util::addScript('external', 'quota-files-sidebar');
 				});
 				return;

From 6db8ab6333bca380b0bfc6ff4e0d9dee3451b4ef Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 13 Jun 2017 09:46:49 +0200
Subject: [PATCH 3/5] Revert "Allow multiple quota links"

This reverts commit c4835de08cbe8b83445bbc14d22662c1f43acbe4.
---
 lib/Controller/SiteController.php | 11 +++++------
 templates/quota.php               |  4 +---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/Controller/SiteController.php b/lib/Controller/SiteController.php
index 43ea2e98..5539fbfc 100644
--- a/lib/Controller/SiteController.php
+++ b/lib/Controller/SiteController.php
@@ -102,18 +102,17 @@ public function showPage($id) {
 	public function renderQuotaLink() {
 		$sites = $this->sitesManager->getSitesToDisplay();
 
-		$quotaLinks = [];
+		$quotaLink = [];
 		foreach ($sites as $site) {
 			if ($site['type'] === SitesManager::TYPE_QUOTA) {
-				$quotaLinks[] = [
-					'link' => $this->url->linkToRoute('external.site.showPage', ['id'=> $site['id']]),
-					'name' => $site['name'],
-				];
+				$quotaLink = $site;
+				break;
 			}
 		}
 
 		return new TemplateResponse('external', 'quota', [
-			'sites'			=> $quotaLinks,
+			'quotaLink'			=> $this->url->linkToRoute('external.site.showPage', ['id'=> $quotaLink['id']]),
+			'quotaName'			=> $quotaLink['name'],
 		], '');
 	}
 }
diff --git a/templates/quota.php b/templates/quota.php
index 33c3ec97..c2f9d826 100644
--- a/templates/quota.php
+++ b/templates/quota.php
@@ -22,7 +22,5 @@
 script('external', 'quota-personal');
 ?>
 <div id="quota_link" class="section hidden">
-	<?php foreach ($_['sites'] as $site) { ?>
-		<a class="button" href="<?php p($site['link']); ?>"><?php p($site['name']); ?></a>
-	<?php } ?>
+	<a class="button" href="<?php p($_['quotaLink']); ?>"><?php p($_['quotaName']); ?></a>
 </div>

From 995bb6822ae620ad97585f22b7035bb313f48324 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 13 Jun 2017 11:17:01 +0200
Subject: [PATCH 4/5] Fix trashbin with new position

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 js/quota-files-sidebar.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/quota-files-sidebar.js b/js/quota-files-sidebar.js
index 3c53cc15..153c5861 100644
--- a/js/quota-files-sidebar.js
+++ b/js/quota-files-sidebar.js
@@ -3,9 +3,10 @@ $(document).ready(function () {
 	var $p = $('<p>'),
 		$quotaLink = $('#external_quota_link'),
 		$quotaName = $('#external_quota_name');
-	$p.addClass('quotatext-additional').text($quotaName.val());
-	$('li#quota').on('click', function(e) {
+	$p.text($quotaName.val());
+	$('li#quota').on('click', function() {
 		OC.redirect($quotaLink.val());
 	});
 	$('li#quota div.quota-container').after($p);
+	$('li.nav-trashbin').attr('style', 'margin-bottom: 36px !important');
 });

From 2540c1db546af0b5021eec862b09c040c250217b Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 13 Jun 2017 22:49:18 -0500
Subject: [PATCH 5/5] Improve margin for overflow

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 js/quota-files-sidebar.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/js/quota-files-sidebar.js b/js/quota-files-sidebar.js
index 153c5861..5f0b2e93 100644
--- a/js/quota-files-sidebar.js
+++ b/js/quota-files-sidebar.js
@@ -9,4 +9,11 @@ $(document).ready(function () {
 	});
 	$('li#quota div.quota-container').after($p);
 	$('li.nav-trashbin').attr('style', 'margin-bottom: 36px !important');
+
+	if ($('li.nav-trashbin').exists()) {
+		$('#app-navigation > ul li:nth-last-child(2)').attr('style', 'margin-bottom: 124px !important');
+	} else {
+		$('#app-navigation > ul li:nth-last-child(1)').attr('style', 'margin-bottom: 80px !important');
+
+	}
 });