From 689f232243c11dc4211d1daed353032ced0e7229 Mon Sep 17 00:00:00 2001
From: redmatrix <mike@macgirvin.com>
Date: Sun, 28 Aug 2016 19:36:14 -0700
Subject: move allowed email domains to admin->security page

---
 view/tpl/admin_security.tpl | 3 +++
 view/tpl/admin_site.tpl     | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 721b5f38f..409e9fc7d 100755
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
@@ -11,6 +11,9 @@
 	{{include file="field_checkbox.tpl" field=$content_security}}
 	{{include file="field_checkbox.tpl" field=$embed_sslonly}}
 
+	{{include file="field_textarea.tpl" field=$allowed_email}}
+	{{include file="field_textarea.tpl" field=$not_allowed_email}}	
+
 	{{include file="field_textarea.tpl" field=$whitelisted_sites}}
 	{{include file="field_textarea.tpl" field=$blacklisted_sites}}
 
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index d810e69f7..56e6087d6 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -62,8 +62,6 @@
 	{{include file="field_select.tpl" field=$register_policy}}
 	{{include file="field_checkbox.tpl" field=$invite_only}}
 	{{include file="field_select.tpl" field=$access_policy}}
-	{{include file="field_textarea.tpl" field=$allowed_email}}
-	{{include file="field_textarea.tpl" field=$not_allowed_email}}	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
 	<h3>{{$upload}}</h3>
-- 
cgit v1.2.3


From 4050ff7c1f5a1acd34f58af3d41d12be49331ac7 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 29 Aug 2016 12:48:16 +0200
Subject: make lock switching actually work with multiple acl forms

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

(limited to 'view/tpl')

diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index b851e391e..36edc3b44 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,7 +1,6 @@
 <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="sabreAction" value="mkcol"-->
 		<input type="hidden" name="folder" value="{{$folder}}" />
 		<input type="hidden" name="channick" value="{{$channick}}" />
 		<input type="hidden" name="return_url" value="{{$return_url}}" />
-- 
cgit v1.2.3