From 2a154f8c9a772d61e7dabb5e3fd110ba00cc6007 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 14 Dec 2020 11:02:20 +0000
Subject: merge branch files_ng into dev

---
 view/tpl/cloud_actionspanel.tpl | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'view/tpl/cloud_actionspanel.tpl')

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 @@
 	</form>
 	<div class="clear"></div>
 </div>
-<div id="files-upload-tools" class="section-content-tools-wrapper">
+<div id="files-upload-tools" class="section-content-tools-wrapper ">
 	{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}</div>{{/if}}
 	<form id="ajax-upload-files" method="post" action="#" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<input type="hidden" name="directory" value="{{$path}}" />
+		<input id="file-folder"type="hidden" name="folder" value="{{$folder}}" />
 		<input type="hidden" name="channick" value="{{$channick}}" />
 		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		<!--label for="files-upload">{{$upload_header}}</label>
-		<input class="form-group pull-left" id="files-upload" type="file" name="files[]" multiple -->
 		{{include file="field_checkbox.tpl" field=$notify}}
+		<div class="cloud-index attach-drop attach-drop-zone text-center p-4 mb-3" data-folder="{{$folder}}">
+			<span class="text-muted">You can select files via the upload button or drop them right here or into an existing folder.</span>
+		</div>
 		<div class="pull-right btn-group">
 			<div class="btn-group">
 				{{if $lockstate}}
@@ -41,4 +42,10 @@
 	</form>
 	<div class="clear"></div>
 </div>
+{{if $breadcrumbs_html}}
 {{$aclselect}}
+{{/if}}
+{{if $breadcrumbs_html}}
+{{$breadcrumbs_html}}
+<hr class="m-0">
+{{/if}}
-- 
cgit v1.2.3


From 70e529ef5d9574d32386d939c6581d84d4aaf94d Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 14 Dec 2020 11:17:36 +0000
Subject: add another parent element to wrap the tools

---
 view/tpl/cloud_actionspanel.tpl | 84 ++++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

(limited to 'view/tpl/cloud_actionspanel.tpl')

diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 65319379f..e9f7bbc38 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,46 +1,52 @@
 <input id="invisible-cloud-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
-<div id="files-mkdir-tools" class="section-content-tools-wrapper">
-	<label for="files-mkdir">{{$folder_header}}</label>
-	<form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<input type="hidden" name="folder" value="{{$folder}}" />
-		<input type="hidden" name="channick" value="{{$channick}}" />
-		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		<input id="files-mkdir" type="text" name="filename" class="form-control form-group">
-		<div class="pull-right btn-group">
-			<div class="btn-group">
-				{{if $lockstate}}
-				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
-					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
+<div id="files-mkdir-tools">
+	<div class="section-content-tools-wrapper">
+		<label for="files-mkdir">{{$folder_header}}</label>
+		<form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+			<input type="hidden" name="folder" value="{{$folder}}" />
+			<input type="hidden" name="channick" value="{{$channick}}" />
+			<input type="hidden" name="return_url" value="{{$return_url}}" />
+			<input id="files-mkdir" type="text" name="filename" class="form-control form-group">
+			<div class="pull-right btn-group">
+				<div class="btn-group">
+					{{if $lockstate}}
+					<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
+						<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
+					</button>
+					{{/if}}
+					<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
+				</div>
 			</div>
-		</div>
-	</form>
-	<div class="clear"></div>
+		</form>
+		<div class="clear"></div>
+	</div>
+	<hr class="m-0">
 </div>
-<div id="files-upload-tools" class="section-content-tools-wrapper ">
-	{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}</div>{{/if}}
-	<form id="ajax-upload-files" method="post" action="#" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<input id="file-folder"type="hidden" name="folder" value="{{$folder}}" />
-		<input type="hidden" name="channick" value="{{$channick}}" />
-		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		{{include file="field_checkbox.tpl" field=$notify}}
-		<div class="cloud-index attach-drop attach-drop-zone text-center p-4 mb-3" data-folder="{{$folder}}">
-			<span class="text-muted">You can select files via the upload button or drop them right here or into an existing folder.</span>
-		</div>
-		<div class="pull-right btn-group">
-			<div class="btn-group">
-				{{if $lockstate}}
-				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
-					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button id="upload-submit" class="btn btn-primary btn-sm pull-right">{{$upload_submit}}</button>
+<div id="files-upload-tools">
+	<div class="section-content-tools-wrapper ">
+		{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}</div>{{/if}}
+		<form id="ajax-upload-files" method="post" action="#" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+			<input id="file-folder"type="hidden" name="folder" value="{{$folder}}" />
+			<input type="hidden" name="channick" value="{{$channick}}" />
+			<input type="hidden" name="return_url" value="{{$return_url}}" />
+			{{include file="field_checkbox.tpl" field=$notify}}
+			<div class="cloud-index attach-drop attach-drop-zone text-center p-4 mb-3" data-folder="{{$folder}}">
+				<span class="text-muted">You can select files via the upload button or drop them right here or into an existing folder.</span>
 			</div>
-		</div>
-	</form>
-	<div class="clear"></div>
+			<div class="pull-right btn-group">
+				<div class="btn-group">
+					{{if $lockstate}}
+					<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
+						<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
+					</button>
+					{{/if}}
+					<button id="upload-submit" class="btn btn-primary btn-sm pull-right">{{$upload_submit}}</button>
+				</div>
+			</div>
+		</form>
+		<div class="clear"></div>
+	</div>
+	<hr class="m-0">
 </div>
 {{if $breadcrumbs_html}}
 {{$aclselect}}
-- 
cgit v1.2.3


From 8188a551f3bf9cb817338241985fe0bd45cafd43 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
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/cloud_actionspanel.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 @@
 	</div>
 	<hr class="m-0">
 </div>
-{{if $breadcrumbs_html}}
+{{if $aclselect}}
 {{$aclselect}}
 {{/if}}
 {{if $breadcrumbs_html}}
-- 
cgit v1.2.3


From 999aac19decad2dcca056b38cc7674f2be2fa497 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 4 Jan 2021 11:09:12 +0000
Subject: missing translateable string and adapt icons

---
 view/tpl/cloud_actionspanel.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/cloud_actionspanel.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 @@
 			<input type="hidden" name="return_url" value="{{$return_url}}" />
 			{{include file="field_checkbox.tpl" field=$notify}}
 			<div class="cloud-index attach-drop attach-drop-zone text-center p-4 mb-3" data-folder="{{$folder}}">
-				<span class="text-muted">You can select files via the upload button or drop them right here or into an existing folder.</span>
+				<span class="text-muted">{{$drop_area_label}}</span>
 			</div>
 			<div class="pull-right btn-group">
 				<div class="btn-group">
-- 
cgit v1.2.3