From 718830365134cb3f4a68fba03274801cada71fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 7 Mar 2013 13:48:02 +0100 Subject: [PATCH 1/3] let the home icon link to the files view in the trash bin --- apps/files_trashbin/index.php | 3 ++- .../templates/part.breadcrumb.php | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 apps/files_trashbin/templates/part.breadcrumb.php diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 779db9bc31c..2e4c4953a16 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -95,9 +95,10 @@ foreach (explode('/', $dir) as $i) { } } -$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); +$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir='); +$breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php') . '?dir='); $list = new OCP\Template('files_trashbin', 'part.list', ''); $list->assign('files', $files); diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php new file mode 100644 index 00000000000..2801e04e9ad --- /dev/null +++ b/apps/files_trashbin/templates/part.breadcrumb.php @@ -0,0 +1,20 @@ +
+ + + +
+ +
'> + t("Deleted Files")); ?> +
+ + +
svg" + data-dir=''> + +
+ Date: Thu, 7 Mar 2013 13:51:18 +0100 Subject: [PATCH 2/3] no dir parameter needed --- apps/files_trashbin/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 2e4c4953a16..2aa6b83613c 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -98,7 +98,7 @@ foreach (explode('/', $dir) as $i) { $breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir='); -$breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php') . '?dir='); +$breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php')); $list = new OCP\Template('files_trashbin', 'part.list', ''); $list->assign('files', $files); From ba9f5f58854872ceb619e0f7c6debdf051cc3108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 7 Mar 2013 14:54:59 +0100 Subject: [PATCH 3/3] add dirlisting var to file list --- apps/files_trashbin/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 2aa6b83613c..24ccd8c4609 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -105,6 +105,7 @@ $list->assign('files', $files); $list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir); $list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$dir); $list->assign('disableSharing', true); +$list->assign('dirlisting', $dirlisting); $tmpl->assign('dirlisting', $dirlisting); $list->assign('disableDownloadActions', true); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());