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/breadcrumb.tpl | 11 ++ view/tpl/categories_widget.tpl | 6 +- view/tpl/cloud_actionspanel.tpl | 15 ++- view/tpl/cloud_directory.tpl | 290 ++++++++++++++++++++++++++++++++-------- view/tpl/field_select.tpl | 2 +- view/tpl/xchan_vcard.tpl | 31 +++-- 6 files changed, 281 insertions(+), 74 deletions(-) create mode 100644 view/tpl/breadcrumb.tpl (limited to 'view/tpl') diff --git a/view/tpl/breadcrumb.tpl b/view/tpl/breadcrumb.tpl new file mode 100644 index 000000000..205b712d9 --- /dev/null +++ b/view/tpl/breadcrumb.tpl @@ -0,0 +1,11 @@ + diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl index 1341c652c..fd27dca44 100755 --- a/view/tpl/categories_widget.tpl +++ b/view/tpl/categories_widget.tpl @@ -1,12 +1,12 @@

{{$title}}

{{$desc}}
- + - +
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 292452cca..65319379f 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -19,15 +19,16 @@
-
+
{{if $quota.limit || $quota.used}}
{{if $quota.warning}}{{$quota.warning}} {{/if}}{{if $quota.desc}}{{$quota.desc}}

{{/if}}
{{/if}}
- + - {{include file="field_checkbox.tpl" field=$notify}} +
+ You can select files via the upload button or drop them right here or into an existing folder. +
{{if $lockstate}} @@ -41,4 +42,10 @@
+{{if $breadcrumbs_html}} {{$aclselect}} +{{/if}} +{{if $breadcrumbs_html}} +{{$breadcrumbs_html}} +
+{{/if}} 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}}
diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 8c3776841..7cc624fab 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,4 +1,4 @@ -
+
-
- -
- - - - -
-
- {{if $lockstate}} - - {{/if}} - +
+
+ + + + + + +
+
+ {{if $lockstate}} + + {{/if}} + +
-
- -
+ +
+
+
-
- {{if $quota.limit || $quota.used}}
{{if $quota.warning}}{{$quota.warning}} {{/if}}{{if $quota.desc}}{{$quota.desc}}

{{/if}}
{{/if}} -
- - - - {{include file="field_checkbox.tpl" field=$notify}} -
- You can select files via the upload button or drop them right here or into an existing folder. -
-
-
- {{if $lockstate}} - - {{/if}} - +
+
+ {{if $quota.limit || $quota.used}}
{{if $quota.warning}}{{$quota.warning}} {{/if}}{{if $quota.desc}}{{$quota.desc}}

{{/if}}
{{/if}} + + + + + {{include file="field_checkbox.tpl" field=$notify}} +
+ You can select files via the upload button or drop them right here or into an existing folder.
-
- -
+
+
+ {{if $lockstate}} + + {{/if}} + +
+
+ +
+
+
{{if $breadcrumbs_html}} {{$aclselect}} -- cgit v1.2.3 From 8188a551f3bf9cb817338241985fe0bd45cafd43 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 15 Dec 2020 12:12:38 +0000 Subject: fix regression in files aclselect --- view/tpl/cloud_actionspanel.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index e9f7bbc38..039d19fac 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -48,7 +48,7 @@
-{{if $breadcrumbs_html}} +{{if $aclselect}} {{$aclselect}} {{/if}} {{if $breadcrumbs_html}} -- 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') 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') 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') 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}}
- - + +
@@ -172,23 +173,27 @@ Rename Move or copy Categories - {{if !$item.collection}} {{if $item.is_owner}} {{/if}} + {{if $item.collection}} + Download + {{else}} Download {{/if}} {{$delete}}
{{else}} - {{if ($is_admin || !$item.collection) && $item.attach_id}} + {{if $is_admin || $item.attach_id}}
- {{if !$item.collection}} + {{if $item.collection}} + Download + {{else}} Download {{/if}} {{if $is_admin}} -- cgit v1.2.3 From 98f3e4cbd39dca3c111a711b0aaaa53428eb14a6 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 2 Jan 2021 18:53:23 +0000 Subject: set is_owner does not need to be a per item flag. fix post button visible for collections --- view/tpl/cloud_directory.tpl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 5886391bb..84c9f2e86 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -35,8 +35,8 @@ {{$item.name}}
- {{if $item.is_owner}} - {{* add file tools here*}} + {{if $is_owner}} + {{* add file tools here *}} {{/if}}
{{/foreach}} @@ -160,25 +160,25 @@ {{/if}} - {{if ($item.is_owner || $item.is_creator) && $item.attach_id}} + {{if ($is_owner || $item.is_creator) && $item.attach_id}}
Info - {{if $item.is_owner}} + {{if $is_owner}} Adjust permissions {{/if}} Rename Move or copy Categories - {{if $item.is_owner}} - - {{/if}} {{if $item.collection}} Download {{else}} + {{if $is_owner}} + + {{/if}} Download {{/if}} {{$delete}} @@ -247,7 +247,7 @@ {{include file="field_input.tpl" field=$item.categories}}
- {{if $item.is_owner}} + {{if $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}} @@ -256,7 +256,7 @@ Cancel
- {{if $item.is_owner}} + {{if $is_owner}} -- cgit v1.2.3 From cff5859c595ae3d758072b11aa60190e210cb490 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 3 Jan 2021 14:28:02 +0000 Subject: mod cloud strings --- view/tpl/cloud_directory.tpl | 60 ++++++++++++++++++++++---------------------- view/tpl/js_strings.tpl | 9 +++++-- 2 files changed, 37 insertions(+), 32 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 84c9f2e86..c24e3c8aa 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -67,37 +67,37 @@
- +
- +
{{if $is_owner}}
{{if $is_owner}} - Adjust permissions + {{$adjust_permissions_label}} {{/if}} - Move or copy - Categories - Download - {{$delete}} + {{$move_copy_label}} + {{$categories_label}} + {{$download_label}} + {{$delete_label}}
{{else if $is_admin}}
- {{$admin_delete}} + {{$admin_delete_label}}
{{/if}} @@ -122,7 +122,7 @@ {{/if}}
{{if $is_owner}} @@ -131,7 +131,7 @@ {{/if}}
@@ -166,22 +166,22 @@
- Info + {{$info_label}} {{if $is_owner}} - Adjust permissions + {{$adjust_permissions_label}} {{/if}} - Rename - Move or copy - Categories + {{$rename_label}} + {{$move_copy_label}} + {{$categories_label}} {{if $item.collection}} - Download + {{$download_label}} {{else}} {{if $is_owner}} - + {{/if}} - Download + {{$download_label}} {{/if}} - {{$delete}} + {{$delete_label}}
{{else}} @@ -192,12 +192,12 @@
{{if $item.collection}} - Download + {{$download_label}} {{else}} - Download + {{$download_label}} {{/if}} {{if $is_admin}} - {{$admin_delete}} + {{$admin_delete_label}} {{/if}}
@@ -219,23 +219,23 @@
{{if ! $item.collection}}
- +
{{if $item.embed_bbcode}}
- +
{{/if}} {{/if}}
- +
@@ -253,7 +253,7 @@ {{/if}}
{{if $is_owner}} @@ -262,7 +262,7 @@ {{/if}}
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 58426e20c..291d78fb2 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -66,8 +66,13 @@ 'month' : "{{$month}}", 'week' : "{{$week}}", 'day' : "{{$day}}", - 'allday' : "{{$allday}}" + 'allday' : "{{$allday}}", + + // mod cloud + + 'download_info' : "{{$download_info}}" + }; - + -- cgit v1.2.3 From b2f6e5673d1fbf72695b5c64db7d5e51d59b9e2e Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 4 Jan 2021 10:58:41 +0000 Subject: some work on the tiles view --- view/tpl/cloud_directory.tpl | 66 +++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 35 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index c24e3c8aa..757239960 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,46 +1,42 @@ -
+
{{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 $parentpath}} +
+
+ +
+ +
+
+ .. +
+ +
{{/if}} + {{foreach $entries as $item}} +
+
+ +
+ {{if $item.photo_icon}} + {{$item.photo_icon}} + {{else}} + + {{/if}} +
+
+ {{$item.name}} +
+ +
-
- - {{$item.name}} - -
- {{if $is_owner}} - {{* add file tools here *}} - {{/if}} + {{/foreach}}
- {{/foreach}} -
{{else}} -- cgit v1.2.3 From 999aac19decad2dcca056b38cc7674f2be2fa497 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 4 Jan 2021 11:09:12 +0000 Subject: missing translateable string and adapt icons --- view/tpl/cloud_actionspanel.tpl | 2 +- view/tpl/cloud_header.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 039d19fac..8cab175ff 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -31,7 +31,7 @@ {{include file="field_checkbox.tpl" field=$notify}}
- You can select files via the upload button or drop them right here or into an existing folder. + {{$drop_area_label}}
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index 642fb1866..285363a12 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -1,6 +1,6 @@
- + {{if $actionspanel}} {{if $is_owner}}  {{$shared}} -- cgit v1.2.3 From e92f98d3c655335f5df1d557c7e023c4039a1eba Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 4 Jan 2021 11:14:01 +0000 Subject: rounded corners --- view/tpl/cloud_directory.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 757239960..6f4eb3255 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -24,7 +24,7 @@
{{if $item.photo_icon}} - {{$item.photo_icon}} + {{$item.photo_icon}} {{else}} {{/if}} -- cgit v1.2.3 From d4e97ab64c22fe319b024ec60563bcf727d154fb Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 4 Jan 2021 13:43:46 +0000 Subject: more work on tiles --- view/tpl/cloud_directory.tpl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 6f4eb3255..ac8304b96 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -7,11 +7,11 @@ {{if $parentpath}}
- -
- + +
+
-
+
..
@@ -20,16 +20,16 @@ {{/if}} {{foreach $entries as $item}}
-
- -
+
+ +
{{if $item.photo_icon}} - {{$item.photo_icon}} + {{$item.photo_icon}} {{else}} - + {{/if}}
-
+
{{$item.name}}
-- cgit v1.2.3