aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-08-30 06:14:22 -0400
committerAndrew Manning <tamanning@zoho.com>2016-08-30 06:14:22 -0400
commitad5c93d6738d705b9ca196cc7481c26a3a9b9962 (patch)
treeca090d4dcb461dc46ba79d726c39cda388deeef6 /view/tpl
parentb05474fc30cad393bd4fbf244d2afbbbe2e5f86e (diff)
parent202b757bc46d17b324f79751ce754e16ba737386 (diff)
downloadvolse-hubzilla-ad5c93d6738d705b9ca196cc7481c26a3a9b9962.tar.gz
volse-hubzilla-ad5c93d6738d705b9ca196cc7481c26a3a9b9962.tar.bz2
volse-hubzilla-ad5c93d6738d705b9ca196cc7481c26a3a9b9962.zip
Merge remote-tracking branch 'upstream/dev' into website-export
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/admin_security.tpl3
-rwxr-xr-xview/tpl/admin_site.tpl2
-rw-r--r--view/tpl/cloud_actionspanel.tpl1
3 files changed, 3 insertions, 3 deletions
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>
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}}" />