aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-08-27 10:02:58 +0200
committerMario <mario@mariovavti.com>2018-08-27 10:02:58 +0200
commit4c1944a08dcaacf1d638af60cb1f7679cb88c192 (patch)
treea14eea0f66af3a524453edf4bdfec296262d53e3 /view/tpl
parent95f870f1b41ff243a03617b368c8606354de8273 (diff)
parenta0c2bbac9d96a5461b65b5e0ff733a2fcd193dd4 (diff)
downloadvolse-hubzilla-4c1944a08dcaacf1d638af60cb1f7679cb88c192.tar.gz
volse-hubzilla-4c1944a08dcaacf1d638af60cb1f7679cb88c192.tar.bz2
volse-hubzilla-4c1944a08dcaacf1d638af60cb1f7679cb88c192.zip
Merge branch 'extend-convitems-dropdown' into 'dev'
Extend cog dropdown & temp fix for feed display of corrupt mids See merge request hubzilla/core!1265
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/conv_item.tpl4
1 files changed, 4 insertions, 0 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index ac6af40e9..05c3d7ae0 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -175,6 +175,10 @@
{{if $item.drop.dropping}}
<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
{{/if}}
+ {{if $item.dropdown_extras}}
+ <div class="dropdown-divider"></div>
+ {{$item.dropdown_extras}}
+ {{/if}}
{{if $item.edpost && $item.dreport}}
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>