diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index da9aee87b..be7448a33 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -526,7 +526,7 @@ class Conversation $live_update_div = '' . "\r\n"; } - $page_dropping = $this->session->getLocalUserId() && $this->session->getLocalUserId() == $uid; + $page_dropping = $this->session->getLocalUserId() && $this->session->getLocalUserId() == $uid && $mode != 'search'; if (!$update) { $_SESSION['return_path'] = $this->args->getQueryString(); diff --git a/view/theme/frio/templates/conversation.tpl b/view/theme/frio/templates/conversation.tpl new file mode 100644 index 000000000..492c005b8 --- /dev/null +++ b/view/theme/frio/templates/conversation.tpl @@ -0,0 +1,30 @@ +{{$live_update nofilter}} +{{foreach $threads as $thread}} +
+ {{foreach $thread.items as $item}} + {{if $item.comment_firstcollapsed}} +
+ {{$thread.num_comments}} + {{$thread.hide_text}} +
+ {{/if}} + + {{include file="{{$item.template}}"}} + + {{/foreach}} +
+{{/foreach}} + +{{if !$update}} +
+ {{if $dropping}} + +
+ {{/if}} +{{/if}} diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl index 7d381282c..62a357fa6 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -1,302 +1,299 @@ - - - +
+
+ {{* Put additional actions in a top-right dropdown menu *}} + + {{* The avatar picture and the photo-menu *}} +
+ + +
-
- - - - -
-
- {{* Put additional actions in a top-right dropdown menu *}} - + {{* contact info header*}} + - - {{* The avatar picture and the photo-menu *}} -
- - -
- - - {{* contact info header*}} - + {{* @todo $item.created have to be inserted *}} + +
+ + {{* contact info header for smartphones *}} + - {{* contact info header for smartphones *}} - +
-
+
-
- - {{* item content *}} -
- {{if $item.title}} -

{{$item.title}}


 - {{/if}} - -
{{$item.body_html nofilter}}
-
- - -
-
-
- {{if !$item.suppress_tags}} - {{foreach $item.hashtags as $tag}} - {{$tag nofilter}} - {{/foreach}} - - {{foreach $item.mentions as $tag}} - {{$tag nofilter}} - {{/foreach}} + {{* item content *}} +
+ {{if $item.title}} +

{{$item.title}}


 {{/if}} - {{foreach $item.folders as $cat}} - {{$cat.name}}{{if $cat.removeurl}} (x) {{/if}} - {{/foreach}} +
{{$item.body_html nofilter}}
+
- {{foreach $item.categories as $cat}} - {{$cat.name}}{{if $cat.removeurl}} (x) {{/if}} - {{/foreach}} -
- {{if $item.edited}}
{{$item.edited['label']}} ({{$item.edited['relative']}})
{{/if}} + +
+
+
+ {{if !$item.suppress_tags}} + {{foreach $item.hashtags as $tag}} + {{$tag nofilter}} + {{/foreach}} + + {{foreach $item.mentions as $tag}} + {{$tag nofilter}} + {{/foreach}} + {{/if}} + + {{foreach $item.folders as $cat}} + {{$cat.name}}{{if $cat.removeurl}} (x) {{/if}} + {{/foreach}} + + {{foreach $item.categories as $cat}} + {{$cat.name}}{{if $cat.removeurl}} (x) {{/if}} + {{/foreach}}
- + {{if $item.edited}}
{{$item.edited['label']}} ({{$item.edited['relative']}})
{{/if}} +
+ -

- {{* Action buttons to interact with the item (like: like, dislike, share and so on *}} - - +

+ {{* Action buttons to interact with the item (like: like, dislike, share and so on *}} + + - {{if $item.threaded}}{{/if}} + {{if $item.threaded}}{{/if}} - {{* Buttons for like and dislike *}} - {{if $item.vote}} - {{if $item.vote.like}} - - {{/if}} - {{if $item.vote.like AND $item.vote.dislike}} - • - {{/if}} - - {{if $item.vote.dislike}} - - {{/if}} - {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}} - • - {{/if}} + {{* Buttons for like and dislike *}} + {{if $item.vote}} + {{if $item.vote.like}} + + {{/if}} + {{if $item.vote.like AND $item.vote.dislike}} + • {{/if}} - {{* Button to open the comment text field *}} - {{if $item.comment_html}} - + {{if $item.vote.dislike}} + {{/if}} - - {{* Button for sharing the item *}} - {{if $item.vote}} - {{if $item.vote.share}} - {{if $item.vote.like OR $item.vote.dislike OR $item.comment_html}} - • - {{/if}} - - {{/if}} + {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}} + • {{/if}} + {{/if}} - {{* Put additional actions in a dropdown menu *}} - {{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || $item.drop.dropping || $item.browsershare)}} - - - -

- {{/if}} + {{else}} + + {{/if}} + - - {{* Event attendance buttons *}} - {{if $item.isevent}} - - - - - - {{/if}} - - - {{if $item.drop && $item.drop.pagedrop}} - - - {{/if}} - + + {{* Event attendance buttons *}} + {{if $item.isevent}} + + + + -

- - {{* Display likes, dislike and attendance stats *}} - {{if $item.responses}} -
- {{foreach $item.responses as $verb=>$response}} -
{{$response.output nofilter}}
- {{/foreach}} -
{{/if}} -
- {{if $item.conv}} - {{$item.conv.title}} + + {{if $item.drop && $item.drop.pagedrop}} + + {{/if}} -
-
-
-
+ + +

+ + {{* Display likes, dislike and attendance stats *}} + {{if $item.responses}} +
+ {{foreach $item.responses as $verb=>$response}} +
{{$response.output nofilter}}
+ {{/foreach}} +
+ {{/if}} + +
+ {{if $item.conv}} + {{$item.conv.title}} + {{/if}} +
+
+