aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/conv_list.tpl
diff options
context:
space:
mode:
authorWave <wave72@users.noreply.github.com>2015-11-06 09:09:58 +0100
committerWave <wave72@users.noreply.github.com>2015-11-06 09:09:58 +0100
commit30d083ac3cbdf36171cfee7b892271b9b587325c (patch)
treef2f63728f86f8336330d31ee8edf2fcd742dc71e /view/tpl/conv_list.tpl
parent50cf095c000813d0b1408d929c1fa7422b131a3d (diff)
parent4ca0c2cfd14df5e2b6e9c7f59a10628f7653d6a4 (diff)
downloadvolse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.tar.gz
volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.tar.bz2
volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.zip
Merge pull request #2 from redmatrix/master
Update to latest hubzilla
Diffstat (limited to 'view/tpl/conv_list.tpl')
-rwxr-xr-xview/tpl/conv_list.tpl19
1 files changed, 12 insertions, 7 deletions
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 65b695a70..53f65bc78 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -8,6 +8,11 @@
<a name="{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
+ {{if $item.photo}}
+ <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+ {{$item.photo}}
+ </div>
+ {{/if}}
<div class="wall-item-head">
<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
@@ -61,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}}
@@ -146,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}}
@@ -159,7 +165,6 @@
</button>
</div>
{{/if}}
-
{{if $item.responses }}
{{foreach $item.responses as $verb=>$response}}
{{if $response.count}}