aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/conv_list.tpl
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-01 15:52:35 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-01 15:52:35 -0800
commitd3183467e06d6d7a04221c63d26173f97217cc43 (patch)
tree1da3ddc58b87a0afdfa0bf262c2d0950a192ccce /view/tpl/conv_list.tpl
parentb62614bbd48151837e29ab56a53e683d2f4dcb01 (diff)
parent618155e6ab1a76b5aaa667aa41a1668ce8f73a20 (diff)
downloadvolse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.tar.gz
volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.tar.bz2
volse-hubzilla-d3183467e06d6d7a04221c63d26173f97217cc43.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl/conv_list.tpl')
-rwxr-xr-xview/tpl/conv_list.tpl14
1 files changed, 7 insertions, 7 deletions
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index a3fb642ce..53f65bc78 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -66,11 +66,6 @@
<span class="tag">{{$item.folders}}</span>
</div>
{{/if}}
- {{if $item.attachments}}
- <div class="body-tags" id="item-attachments">
- <span class='tag'>{{$item.attachments}}</span>
- </div>
- {{/if}}
<div class="clear"></div>
</div>
{{/if}}
@@ -151,7 +146,13 @@
</ul>
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
- <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}">
+ <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
+ {{if $item.attachments}}
+ <div class="btn-group">
+ <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+ <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+ </div>
+ {{/if}}
<div class="wall-item-list-comments btn-group">
<button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;">
{{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}}
@@ -164,7 +165,6 @@
</button>
</div>
{{/if}}
-
{{if $item.responses }}
{{foreach $item.responses as $verb=>$response}}
{{if $response.count}}