From 3b835d8076c844adde1014e994256740c790857b Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Wed, 20 Jun 2018 19:14:50 +0200
Subject: Js magic for deleted shares
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 apps/files/css/files.scss  | 3 +++
 apps/files/img/unshare.svg | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 apps/files/img/unshare.svg

(limited to 'apps/files')

diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 01703df5bf1..24ecbf399e3 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -105,6 +105,9 @@
 .nav-icon-trashbin {
 	background-image: url('../img/delete.svg?v=1');
 }
+.nav-icon-deletedshares {
+	background-image: url('../img/unshare.svg?v=1');
+}
 
 #app-navigation .nav-files a.nav-icon-files {
 	width: auto;
diff --git a/apps/files/img/unshare.svg b/apps/files/img/unshare.svg
new file mode 100644
index 00000000000..0c22ca64057
--- /dev/null
+++ b/apps/files/img/unshare.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m12.5 1a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 0.003906 0.12891l-4.9023 2.4512a2.5 2.5 0 0 0-1.6016-0.58008 2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 0.30469-0.021484l3.4395-1.7246-1.25-0.625a2.5 2.5 0 0 0 0.0058594-0.12891 2.5 2.5 0 0 0-0.0039062-0.12891l4.9023-2.4512a2.5 2.5 0 0 0 1.6016 0.58008 2.5 2.5 0 0 0 0.26562-0.013672l1.5625-0.7832a2.5 2.5 0 0 0 0.67188-1.7031 2.5 2.5 0 0 0-2.5-2.5zm0.25391 9.0156-3.7246 1.8672 0.97656 0.48828a2.5 2.5 0 0 0-0.005859 0.12891 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.2461-2.4844z"/><rect transform="rotate(-26.63)" x="-1.0586" y="11.891" width="11.687" height="2.0029" ry="0" style="paint-order:normal"/></svg>
-- 
cgit v1.2.3


From a1a845693ba5cf1622b60962f73d211a0807a390 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 26 Jun 2018 09:30:40 +0200
Subject: Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 apps/files/tests/Controller/ViewControllerTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'apps/files')

diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index a739e26bd90..eae627fd6a4 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -206,6 +206,17 @@ class ViewControllerTest extends TestCase {
 				'type' => 'link',
 				'classes' => '',
 			],
+			[
+				'id' => 'deletedshares',
+				'appname' => 'files_sharing',
+				'script' => 'list.php',
+				'order' => 18,
+				'name' => \OC::$server->getL10N('files_sharing')->t('Deleted shares'),
+				'active' => false,
+				'icon' => '',
+				'type' => 'link',
+				'classes' => '',
+			],
 			[
 				'id' => 'systemtagsfilter',
 				'appname' => 'systemtags',
@@ -269,6 +280,10 @@ class ViewControllerTest extends TestCase {
 						'id' => 'sharinglinks',
 						'content' => null,
 					],
+					[
+						'id' => 'deletedshares',
+						'content' => null,
+					],
 					[
 						'id' => 'systemtagsfilter',
 						'content' => null,
-- 
cgit v1.2.3