From 30a6ae3daa42da8d1d9560fcc4c706b3e41c4d80 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 28 Apr 2016 20:17:05 -0700
Subject: This setting isn't implemented so remove the UI until it is.

---
 view/tpl/admin_security.tpl | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 691db2d88..3823d8235 100755
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
@@ -15,9 +15,6 @@
 	{{include file="field_textarea.tpl" field=$whitelisted_channels}}
 	{{include file="field_textarea.tpl" field=$blacklisted_channels}}
 
-
-	{{include file="field_checkbox.tpl" field=$embed_coop}}
-
 	{{include file="field_textarea.tpl" field=$embed_allow}}
 	{{include file="field_textarea.tpl" field=$embed_deny}}
 
-- 
cgit v1.2.3


From cd518625bf561f1ed42db0b78030b74c32435136 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 1 May 2016 19:19:17 -0700
Subject: some much needed work on oembed security

---
 view/tpl/admin_security.tpl | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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

diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 3823d8235..39f389e54 100755
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
@@ -15,6 +15,18 @@
 	{{include file="field_textarea.tpl" field=$whitelisted_channels}}
 	{{include file="field_textarea.tpl" field=$blacklisted_channels}}
 
+	{{if $embedhelp1}}
+	<div class="section-content-info-wrapper">{{$embedhelp1}}</div>
+	{{/if}}
+
+	<div style="margin-left: 15px; margin-bottom: 10px;">
+	<div class="descriptive-text">{{$embedhelp2}}</div>
+	<div style="margin-left: 15px;">
+	<div class="descriptive-text">{{$embedhelp3}}</div>
+	</div>
+	<div class="descriptive-text">{{$embedhelp4}}</div>
+	</div>
+
 	{{include file="field_textarea.tpl" field=$embed_allow}}
 	{{include file="field_textarea.tpl" field=$embed_deny}}
 
-- 
cgit v1.2.3


From b371c028ad31180b4c73f92b45c4ca8f5fff259e Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 2 May 2016 22:28:27 -0700
Subject: more security stuff

---
 view/tpl/admin_security.tpl | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

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

diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 39f389e54..721b5f38f 100755
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
@@ -7,7 +7,9 @@
 
 
 	{{include file="field_checkbox.tpl" field=$block_public}}
-
+	{{include file="field_checkbox.tpl" field=$transport_security}}
+	{{include file="field_checkbox.tpl" field=$content_security}}
+	{{include file="field_checkbox.tpl" field=$embed_sslonly}}
 
 	{{include file="field_textarea.tpl" field=$whitelisted_sites}}
 	{{include file="field_textarea.tpl" field=$blacklisted_sites}}
@@ -15,18 +17,6 @@
 	{{include file="field_textarea.tpl" field=$whitelisted_channels}}
 	{{include file="field_textarea.tpl" field=$blacklisted_channels}}
 
-	{{if $embedhelp1}}
-	<div class="section-content-info-wrapper">{{$embedhelp1}}</div>
-	{{/if}}
-
-	<div style="margin-left: 15px; margin-bottom: 10px;">
-	<div class="descriptive-text">{{$embedhelp2}}</div>
-	<div style="margin-left: 15px;">
-	<div class="descriptive-text">{{$embedhelp3}}</div>
-	</div>
-	<div class="descriptive-text">{{$embedhelp4}}</div>
-	</div>
-
 	{{include file="field_textarea.tpl" field=$embed_allow}}
 	{{include file="field_textarea.tpl" field=$embed_deny}}
 
-- 
cgit v1.2.3