aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-12-09 18:47:55 +0100
committerMax Kostikov <max@kostikov.co>2019-12-09 18:47:55 +0100
commit298acb96450e6282247fafecef49ffbb0174f5ea (patch)
treedeb91b84cff545a6af46cf9dc44f18273e23ae04 /view
parent258a4e5627caf8fd1b3d89596fada2bea1490c7a (diff)
parentc4f4edd743b79ec3f3bebecf786cbb6da8921ce9 (diff)
downloadvolse-hubzilla-298acb96450e6282247fafecef49ffbb0174f5ea.tar.gz
volse-hubzilla-298acb96450e6282247fafecef49ffbb0174f5ea.tar.bz2
volse-hubzilla-298acb96450e6282247fafecef49ffbb0174f5ea.zip
Merge branch 'dev' into 'dev'
directory: port censoring from zap and disable oembed in profile about See merge request hubzilla/core!1805
Diffstat (limited to 'view')
-rwxr-xr-xview/tpl/direntry.tpl3
1 files changed, 3 insertions, 0 deletions
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index f7ec7db23..175d813c5 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -7,6 +7,9 @@
{{if $entry.ignlink}}
<a class="directory-ignore btn btn-warning btn-sm" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
{{/if}}
+ {{if $entry.censor}}
+ <a class="directory-censor btn btn-danger btn-sm" href="{{$entry.censor}}"> {{$entry.censor_label}}</a>
+ {{/if}}
{{if $entry.connect}}
<a class="btn btn-success btn-sm" href="{{$entry.connect}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conn_label}}</a>
{{/if}}