diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-31 00:38:01 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-31 00:38:01 +0100 |
| commit | 5920a96da7f71b45b7d386d27da2c130e3ddb23f (patch) | |
| tree | b007b7b5dfb640eba778c77dee8a9729c7811606 | |
| parent | f8b767ed32391763a3abb7bbc38422d7b8cb5991 (diff) | |
| download | volse-hubzilla-5920a96da7f71b45b7d386d27da2c130e3ddb23f.tar.gz volse-hubzilla-5920a96da7f71b45b7d386d27da2c130e3ddb23f.tar.bz2 volse-hubzilla-5920a96da7f71b45b7d386d27da2c130e3ddb23f.zip | |
make attachments appear in a dropdown in wall-item-tools-left
| -rw-r--r-- | include/text.php | 2 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 19 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 14 | ||||
| -rw-r--r-- | view/tpl/item_attach.tpl | 2 |
4 files changed, 19 insertions, 18 deletions
diff --git a/include/text.php b/include/text.php index 5df7bb4a1..c2573da0c 100644 --- a/include/text.php +++ b/include/text.php @@ -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'])) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 760d64db0..4782f827b 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -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> 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}} diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl index 7638f39e7..67accc1ec 100644 --- a/view/tpl/item_attach.tpl +++ b/view/tpl/item_attach.tpl @@ -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> {{$a.label}}</a> +<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="{{$a.icon}} attach-icons"></i> {{$a.label}}</a></li> {{/foreach}} {{/if}} |