X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftemplates%2Fwall_thread.tpl;h=c149b58a515edabedab9fc051469d09eb653614d;hb=4facd1dfdba93ede48ca40b5e146424e6701118b;hp=85091cf1c69aa3858130e66c2802ae636c41b2fd;hpb=e301fa083291f2df98192532c9c5cba03abfeb5a;p=friendica.git diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 85091cf1c6..c149b58a51 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -12,8 +12,8 @@ The div get's closed if thread_level = 2 and the value of $top_child_nr is the s as the value of $top_child_total (this is done at the end of this file) *}} {{if $item.thread_level==1}} - {{assign var="top_child_total" count($item.children)}} - {{assign var="top_child_nr" 0}} + {{assign var="top_child_total" value=count($item.children)}} + {{assign var="top_child_nr" value=0}} {{/if}} {{if $item.thread_level==2}} {{assign var="top_child_nr" value=$top_child_nr+1 scope=parent}} @@ -40,11 +40,11 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.thread_level<3}}
-
+
{{$item.num_comments}} {{$item.hide_text}} + class="hide-comments">{{$item.hide_text}}
@@ -55,62 +55,73 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}} {{/if}} - +{{* TODO => Unknown block *}} - - +{{* /TODO => Unknown block *}} {{* Use a different div container in dependence max thread-level = 7 *}} {{if $item.thread_level<7}} -
+
{{else}} -
- {{/if}} +
+{{/if}} +{{if $item.thread_level==1}} + + + + +{{/if}}
{{* Put addional actions in a top-right dropdown menu *}}
  • {{$item.network_name}}
    • - {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer}} + {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer || $item.subthread}}
  • - + @@ -142,16 +153,16 @@ as the value of $top_child_total (this is done at the end of this file)
    {{if $item.thread_level==1}} @@ -170,9 +181,9 @@ as the value of $top_child_total (this is done at the end of this file) {{* The avatar picture for comments *}} {{if $item.thread_level!=1}}
    - +
    - {{$item.name}} + {{$item.name}}
    @@ -184,20 +195,28 @@ as the value of $top_child_total (this is done at the end of this file) {{* contact info header*}} {{if $item.thread_level==1}} @@ -220,9 +245,15 @@ as the value of $top_child_total (this is done at the end of this file)
    {{*this is the media body for comments - this div must be closed at the end of the file *}}
    - {{$item.name}} + {{$item.name}} - {{$item.ago}} {{if $item.location}} — ({{$item.location}}){{/if}} + + {{$item.ago}} + {{if $item.location}} — ({{$item.location nofilter}}){{/if}} + {{if $item.owner_self}} + {{include file="sub/delivery_count.tpl" delivery=$item.delivery}} + {{/if}} +
    @@ -234,41 +265,42 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.thread_level==1}}
    {{/if}} {{* item content *}} -
    +
    {{* insert some space if it's an top-level post *}} {{if $item.thread_level==1}} -
     
    +
     
    {{/if}} {{if $item.title}}

    {{$item.title}}


     {{/if}} -
    {{$item.body}}
    +
    {{$item.body nofilter}}
    -
    -
    +
    - {{foreach $item.hashtags as $tag}} - {{$tag}} - {{/foreach}} - - {{foreach $item.mentions as $tag}} - {{$tag}} - {{/foreach}} + {{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.folders as $cat}} + {{$cat.name}}{{if $cat.removeurl}} (x) {{/if}} + {{/foreach}} - {{foreach $item.categories 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}} + {{if $item.edited}}
    {{$item.edited['label']}} ({{$item.edited['relative']}})
    {{/if}}
    @@ -278,7 +310,7 @@ as the value of $top_child_total (this is done at the end of this file)
    @@ -287,45 +319,44 @@ as the value of $top_child_total (this is done at the end of this file) {{* Buttons for like and dislike *}} {{if $item.vote}} {{if $item.vote.like}} -  {{$item.vote.like.1}} + {{/if}} - {{if $item.vote.like AND $item.vote.dislike}} -  â€¢  + • {{/if}} - {{if $item.vote.dislike}} -  {{$item.vote.dislike.1}} + {{/if}} {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}} -  â€¢  + • {{/if}} {{/if}} - {{* Butten to open the comment text field *}} + {{* Button to open the comment text field *}} {{if $item.comment}} -  {{$item.switchcomment}} + {{/if}} {{* Button for sharing the item *}} {{if $item.vote}} - {{if ($item.vote.like OR $item.vote.dislike OR $item.comment) AND $item.vote.share}} -  â€¢  - {{/if}} {{if $item.vote.share}} -  {{$item.vote.share.1}} + {{if $item.vote.like OR $item.vote.dislike OR $item.comment}} + • + {{/if}} + {{/if}} {{/if}} +
    {{* Event attendance buttons *}} {{if $item.isevent}}
    - {{$item.attend.0}} - {{$item.attend.1}} - {{$item.attend.2}} + + +
    {{/if}} @@ -345,7 +376,7 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.responses}}
    {{foreach $item.responses as $verb=>$response}} -
    {{$response.output}}
    +
    {{$response.output nofilter}}
    {{/foreach}}
    {{/if}} @@ -359,7 +390,7 @@ as the value of $top_child_total (this is done at the end of this file) {{* Insert comment box of threaded children *}} {{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}} {{/if}}{{/if}}{{/if}} @@ -380,19 +411,19 @@ as the value of $top_child_total (this is done at the end of this file) case it could be opend with the "comment" button *}} {{if $item.total_comments_num}} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}}{{/if}}{{/if}} {{if $item.flatten}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}} {{else}} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} - + {{/if}}{{/if}}{{/if}} {{if $item.flatten}} - + {{/if}} {{/if}}