harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make attachments appear in a dropdown in wall-item-tools-left

Browse Source
This commit is contained in:
Mario Vavti 2015-10-31 00:38:01 +01:00
parent f8b767ed32
commit 5920a96da7
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/text.php
View File

@ -1233,7 +1233,7 @@ function theme_attachments(&$item) {
if($label == ' ')
$label = t('Unknown Attachment');
$title = t('Attachment') . ' - ' . (($r['length']) ? userReadableSize($r['length']) : t('Size Unknown'));
$title = t('Size') . ' ' . (($r['length']) ? userReadableSize($r['length']) : t('unknown'));
require_once('include/identity.php');
if(is_foreigner($item['author_xchan']))

19
view/tpl/conv_item.tpl
View File

@ -69,11 +69,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}}
@ -157,9 +152,15 @@
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
{{if $item.responses }}
<div class="wall-item-tools-left{{if $item.responses.count > 1}} btn-group{{/if}}">
{{foreach $item.responses as $verb=>$response}}
{{if $item.responses || $item.attachments}}
<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.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}}
{{foreach $item.responses as $verb=>$response}}
{{if $response.count}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
@ -188,7 +189,7 @@
{{/if}}
</div>
{{/if}}
{{/foreach}}
{{/foreach}}
</div>
{{/if}}
<div class="clear"></div>

14
view/tpl/conv_list.tpl
View File

@ -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}}

2
view/tpl/item_attach.tpl
View File

@ -1,5 +1,5 @@
{{if $attaches}}
{{foreach $attaches as $a}}
<a href="{{$a.url}}" title="{{$a.title}}" class="btn btn-xs btn-default"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a></li>
{{/foreach}}
{{/if}}