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 ++++++++++++
 view/tpl/zcard_embed.tpl    |  8 ++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 view/tpl/zcard_embed.tpl

(limited to 'view')

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}}
 
diff --git a/view/tpl/zcard_embed.tpl b/view/tpl/zcard_embed.tpl
new file mode 100644
index 000000000..7981e3b0b
--- /dev/null
+++ b/view/tpl/zcard_embed.tpl
@@ -0,0 +1,8 @@
+<div class="hz_card {{$size}}">
+	<div class="hz_cover_photo" style="max-width: 100;"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" />
+		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 18px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.xchan_name}}</div>
+		<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 10px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.channel_addr}}</div>
+	</div>
+	<div style="position:relative;top: -75px;left: 20px;background-color: white;border: 1px solid #ddd;padding: 3px;width: 80px;height: 80px;"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div>
+</div>
+
-- 
cgit v1.2.3


From a10fe5f13e67faa33a72caa33c49c36113213ffe Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 1 May 2016 22:45:38 -0700
Subject: a couple of bugfixes from earlier checkins and implementation of
 source tags

---
 view/tpl/sources_edit.tpl | 1 +
 view/tpl/sources_new.tpl  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'view')

diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl
index a5b384ca3..61f6e8cb0 100644
--- a/view/tpl/sources_edit.tpl
+++ b/view/tpl/sources_edit.tpl
@@ -7,6 +7,7 @@
 <input type="hidden" name="source" value="{{$id}}" />
 <input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
 {{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$tags}}
 {{include file="field_textarea.tpl" field=$words}}
 
 <div class="sources-submit-wrapper" >
diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl
index 3c8a54373..bbc22df84 100644
--- a/view/tpl/sources_new.tpl
+++ b/view/tpl/sources_new.tpl
@@ -6,6 +6,7 @@
 <form action="sources" method="post">
 <input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
 {{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$tags}}
 {{include file="field_textarea.tpl" field=$words}}
 
 <div class="sources-submit-wrapper" >
-- 
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')

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