aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-03 06:33:11 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-03 06:33:11 -0400
commit2db86b950e78cb01cde659f424c9c01f79edc7a4 (patch)
treee57d9a81e15428395c171e17c5b0a05961a876ba /view/tpl
parent9619d02be988a5af7746fa5524b17e645f99d40d (diff)
parentdccdeedb75874ac8a244770cc3be0bf9ee71a0cd (diff)
downloadvolse-hubzilla-2db86b950e78cb01cde659f424c9c01f79edc7a4.tar.gz
volse-hubzilla-2db86b950e78cb01cde659f424c9c01f79edc7a4.tar.bz2
volse-hubzilla-2db86b950e78cb01cde659f424c9c01f79edc7a4.zip
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/admin_security.tpl4
-rw-r--r--view/tpl/sources_edit.tpl1
-rw-r--r--view/tpl/sources_new.tpl1
-rw-r--r--view/tpl/zcard_embed.tpl8
4 files changed, 13 insertions, 1 deletions
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 3823d8235..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}}
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" >
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>
+