From 2a154f8c9a772d61e7dabb5e3fd110ba00cc6007 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 14 Dec 2020 11:02:20 +0000 Subject: merge branch files_ng into dev --- view/tpl/cloud_directory.tpl | 290 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 232 insertions(+), 58 deletions(-) (limited to 'view/tpl/cloud_directory.tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 90347d274..618de418f 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,84 +1,258 @@ -
-{{if $tiles}} +
+ {{if $tiles}} {{* this is needed to append the upload files in the right order *}}
{{if $parentpath}}
- -
-
- -
-
.. -
+
+ +
+ +
+ +
+
+ .. +
{{/if}} {{foreach $entries as $item}}
-
- {{if $item.photo_icon}} - - {{else}} -
- {{/if}} - -
-
- {{$item.displayName}} - -
- {{if $item.is_owner}} - - {{/if}} +
+ {{if $item.photo_icon}} + + {{else}} +
+ +
+ {{/if}} +
+
+ + {{$item.name}} + +
+ {{if $item.is_owner}} + {{* add file tools here*}} + {{/if}}
{{/foreach}}
-{{else}} + {{else}} - - - - + + + + + + - {{if $parentpath}} - - - - - - - + {{if $parentpath}} + + + + - {{/if}} + + + + {{/if}} + {{if $channel_id && $is_owner && $entries.0}} + + + + + + + + + {{/if}} {{* this is needed to append the upload files in the right order *}} - {{foreach $entries as $item}} - - - - {{if $item.is_owner}} - - - - - - {{else}} - {{if $is_admin || $item.is_creator}} - {{/if}} - - - + {{foreach $entries as $item}} + + + + + + + + {{/if}} + + - - + + - - {{/foreach}} + {{/foreach}}
{{$name}}{{*{{$type}}*}}{{* multi tool checkbox *}}{{* icon *}}{{$name}}{{* categories *}}{{* lock icon *}}{{* tools icon *}} {{$size}} {{$lastmod}}
{{*{{$parentpath.icon}}*}}..{{*[{{$parent}}]*}}
..
{{* this is for display consistency *}}
+
+ +
+ 		+
+ +
+ 		+ {{if $is_owner}} +
+ +
+ {{if $is_owner}} + Adjust permissions + {{/if}} + Move or copy + Categories + {{$delete}} +
+
+ {{else if $is_admin}} +
+ +
+ {{$admin_delete}} +
+
+ {{/if}} +
+
+ + + +
+ {{include file="field_select.tpl" field=$newfolder}} + {{include file="field_checkbox.tpl" field=$copy}} +
+
+ {{include file="field_input.tpl" field=$categories}} +
+
+ {{if $is_owner}} + {{include file="field_checkbox.tpl" field=$recurse}} + {{/if}} +
+ +
+ {{if $is_owner}} + + {{/if}} + +
+
+
+
+
{{$item.displayName}}{{$item.attachIcon}}{{else}}{{/if}}{{*{{$item.type}}*}}{{$item.sizeFormatted}}{{$item.lastmodified}}
+ {{if $channel_id && $is_owner}} +
+ +
+ {{/if}} + 		{{$item.name}}{{$item.terms}}{{if $item.lockstate == 'lock'}}{{/if}} + {{if ($item.is_owner || $item.is_creator) && $item.attach_id}} +
+ +
+ {{if $item.is_owner}} + Adjust permissions + {{/if}} + Rename + Move or copy + Categories + {{if !$item.collection}} + {{if $item.is_owner}} + + {{/if}} + Download + {{/if}} + {{$delete}} +
+
+ {{else}} + {{if ($is_admin || !$item.collection) && $item.attach_id}} +
+ +
+ {{if !$item.collection}} + Download + {{/if}} + {{if $is_admin}} + {{$admin_delete}} + {{/if}} +
+
+ {{/if}} + 		{{$item.size_formatted}}{{$item.last_modified}}
+
+ + + +
+ {{include file="field_input.tpl" field=$item.newfilename}} +
+
+ {{include file="field_select.tpl" field=$item.newfolder}} + {{include file="field_checkbox.tpl" field=$item.copy}} +
+
+ {{include file="field_input.tpl" field=$item.categories}} +
+
+ {{if $item.is_owner}} + {{if !$item.collection}}{{include file="field_checkbox.tpl" field=$item.notify}}{{/if}} + {{if $item.collection}}{{include file="field_checkbox.tpl" field=$item.recurse}}{{/if}} + {{/if}} +
+ +
+ {{if $item.is_owner}} + + {{/if}} + +
+
+
+ +
+
{{/if}}
-- cgit v1.2.3 From 27df896a9cb1f713c49e290f2a4e7d9860aff1d5 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 16 Dec 2020 08:26:19 +0000 Subject: files_ng: implement lockview --- view/tpl/cloud_directory.tpl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'view/tpl/cloud_directory.tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 618de418f..6f70c6bfe 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -152,7 +152,12 @@ {{$item.name}} {{$item.terms}} - {{if $item.lockstate == 'lock'}}{{/if}} + + {{if $item.lockstate == 'lock'}} + + + {{/if}} + {{if ($item.is_owner || $item.is_creator) && $item.attach_id}}
-- cgit v1.2.3 From b4b566318a0e52b6396445ddc21c20c0abcc8ce4 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 16 Dec 2020 16:57:56 +0000 Subject: files_ng: fix regression in finding the right path in certain situations and add a info panel with attach and zrl bbcode --- view/tpl/cloud_directory.tpl | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'view/tpl/cloud_directory.tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 6f70c6bfe..8fe31767c 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -165,6 +165,7 @@
+ Info {{if $item.is_owner}} Adjust permissions {{/if}} @@ -210,6 +211,23 @@
{{include file="field_input.tpl" field=$item.newfilename}}
+
+ {{if ! $item.collection}} +
+ + +
+ {{/if}} +
+ + +
+
+ +
+
{{include file="field_select.tpl" field=$item.newfolder}} {{include file="field_checkbox.tpl" field=$item.copy}} @@ -238,22 +256,6 @@
- -- cgit v1.2.3 From b2e80efe3f42c6329be7356580d62ea3525717b8 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 17 Dec 2020 10:04:24 +0000 Subject: files_ng: provide bbcode snippets in the info panel --- view/tpl/cloud_directory.tpl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'view/tpl/cloud_directory.tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 8fe31767c..a6993fe97 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -214,13 +214,19 @@
{{if ! $item.collection}}
- - + +
+ {{if $item.embed_bbcode}} +
+ + +
+ {{/if}} {{/if}}
- - + +