From 72ace9697c0951b3379a88c3cb639e1c9abe0170 Mon Sep 17 00:00:00 2001
From: fnuesse <fnuesse@techfak.uni-bielefeld.de>
Date: Fri, 1 Jun 2018 20:29:43 +0200
Subject: Added FavoritesQuickaccess-Sidebar

Added FavoritesQuickaccess-Sidebar

Added Files-FavoritesQuickaccess-Toggle

Fixed CSS for SpacerElement

Removed Unnessessary Alerts and added Translations

Tried fixing initial Quick-Access Checkboxstate

Signed-off-by: fnuesse <fnuesse@techfak.uni-bielefeld.de>

Tried fixing initial Quick-Access Checkboxstate

Changed double-Quotes to single-Quotes

Revert webdavurl which was changed by mistake

Revert quota-icon which was changed by mistake

Changed the Folderhandling from custom-designed to nextcloud-NavigationManager-handling

Signed-off-by: fnuesse <fnuesse@techfak.uni-bielefeld.de>

Moved CSS-Spacerclass to apps.scss for global usage

Signed-off-by: fnuesse <felix.nuesse@t-online.de>

Renamed settings-caption in apps.scss to app-navigation-caption

Signed-off-by: fnuesse <felix.nuesse@t-online.de>

Removed old input-tag for showQuickAccess-state

Signed-off-by: fnuesse <felix.nuesse@t-online.de>

Removed old spacer element in files.scss

Signed-off-by: fnuesse <felix.nuesse@t-online.de>

Changed style of favorites-sublist and disabled the ability to disable files-quickaccess

Signed-off-by: fnuesse <felix.nuesse@t-online.de>
---
 apps/files/lib/Controller/ViewController.php | 58 ++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 8 deletions(-)

(limited to 'apps/files/lib/Controller/ViewController.php')

diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 7cb0f112f72..54602839eb0 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -159,6 +159,7 @@ class ViewController extends Controller {
 		// FIXME: Make non static
 		$storageInfo = $this->getStorageInfo();
 
+
 		\OCA\Files\App::getNavigationManager()->add(
 			[
 				'id' => 'favorites',
@@ -169,18 +170,59 @@ class ViewController extends Controller {
 			]
 		);
 
+
+
+		$user = $this->userSession->getUser()->getUID();
+
+		$tagger=\OC::$server->getTagManager();
+
+
+		$helper= new \OCA\Files\Activity\Helper($tagger);
+		$favElements = $helper->getFavoriteFilePaths($this->userSession->getUser()->getUID());
+		$favItems = $favElements['items'];
+
+		$key='show_Quick_Access';
+
+		if($this->config->getUserValue($user,$this->appName,$key,true) && sizeof($favElements['folders'])>0){
+			/*$nav->assign('showQuickAccess', 1);
+			\OCA\Files\App::getNavigationManager()->add(
+				[
+					'id' => 'Spacer',
+					'classes' => 'app-navigation-caption',
+					'order' => 6,
+					'name' => $this->l10n->t('Quick-Access')
+				]
+			);*/
+
+		$i=0;
+		foreach($favElements['folders'] as $elem){
+
+			\OCA\Files\App::getNavigationManager()->add(
+				[
+					'id' => substr( $elem, strrpos($elem,'/')+1, strlen($elem)),
+					'href' => \OC::$WEBROOT.'/index.php/apps/files/?dir='.$elem,
+					'order' => 7+$i,
+					'classes' => 'app-navigation-subelement',
+					'name' => substr( $elem, strrpos($elem,'/')+1, strlen($elem)),
+					'icon' => 'files'
+				]
+			);
+			$i++;
+		}
+		}
+
+
+
 		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
 		usort($navItems, function($item1, $item2) {
 			return $item1['order'] - $item2['order'];
 		});
-		$nav->assign('navigationItems', $navItems);
 
-		$webdavurl = $this->urlGenerator->linkTo('', 'remote.php') .
-			'/dav/files/' .
-			$this->userSession->getUser()->getUID() .
-			'/';
-		$webdavurl = $this->urlGenerator->getAbsoluteURL($webdavurl);
-		$nav->assign('webdavurl', $webdavurl);
+
+
+
+
+		$nav->assign('navigationItems', $navItems);
 
 		$nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
 		if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
@@ -215,7 +257,6 @@ class ViewController extends Controller {
 		$params['ownerDisplayName'] = $storageInfo['ownerDisplayName'];
 		$params['isPublic'] = false;
 		$params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
-		$user = $this->userSession->getUser()->getUID();
 		$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
 		$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
 		$showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
@@ -234,6 +275,7 @@ class ViewController extends Controller {
 		$policy->addAllowedFrameDomain('\'self\'');
 		$response->setContentSecurityPolicy($policy);
 
+
 		return $response;
 	}
 
-- 
cgit v1.2.3