X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Ffrio%2Ftemplates%2Fwall_thread.tpl;h=21923737c03d2523a79010ec32b667296a33a399;hb=0a82fe4211f73cf10107feb69fe38eaa85eb61f8;hp=c149b58a515edabedab9fc051469d09eb653614d;hpb=d6a82c6c2d7befde9914fce3bd4e3e07b97ca036;p=friendica.git diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index c149b58a51..21923737c0 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -20,7 +20,7 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}} {{if $item.thread_level==2 && $top_child_nr==1}} -
@@ -266,11 +269,6 @@ as the value of $top_child_total (this is done at the end of this file) {{* item content *}}
- {{* insert some space if it's an top-level post *}}
- {{if $item.thread_level==1}}
-
- {{/if}}
-
{{if $item.title}}
+
+
+ {{/if}}
+
+
+
@@ -381,61 +381,39 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}}
+ {{* Insert comment box of threaded children *}}
+ {{if $item.threaded && $item.comment && $item.indent==comment}}
+
+ {{$item.comment nofilter}}
+
+ {{/if}}
+
{{if $item.thread_level!=1}}
-
- {{$item.comment nofilter}}
-
- {{/if}}{{/if}}{{/if}}
-
-
- {{foreach $item.children as $child}}
- {{*
- {{if $child.type == tag}}
- {{include file="wall_item_tag.tpl" item=$child}}
- {{else}}
- {{include file="{{$item.template}}" item=$child}}
- {{/if}}
- *}}
- {{include file="{{$item.template}}" item=$child}}
- {{/foreach}}
-
- {{* Insert the comment box of the top level post at the bottom of the thread.
- Display this comment box if there are any comments. If not hide it. In this
- case it could be opend with the "comment" button *}}
+
+ {{foreach $item.children as $child}}
+ {{include file="{{$item.template}}" item=$child}}
+ {{/foreach}}
+
+ {{* Insert the comment box of the top level post at the bottom of the thread.
+ Display this comment box if there are any comments. If not hide it. In this
+ case it could be opend with the "comment" button *}}
+ {{if $item.comment && $item.thread_level==1}}
{{if $item.total_comments_num}}
- {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
- {{$item.comment nofilter}}
- {{/if}}{{/if}}{{/if}}
-
- {{if $item.flatten}}
- {{$item.comment nofilter}}
- {{/if}}
- {{else}}
- {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
- {{$item.comment nofilter}}
- {{/if}}{{/if}}{{/if}}
-
- {{if $item.flatten}}
- {{$item.comment nofilter}}
- {{/if}}
+
+
+
{{/if}}
-
{{$item.title}}
{{/if}} @@ -290,8 +288,11 @@ as the value of $top_child_total (this is done at the end of this file) {{foreach $item.mentions as $tag}} {{$tag nofilter}} {{/foreach}} - {{/if}} + {{*foreach $item.implicit_mentions as $tag}} + {{$tag nofilter}} + {{/foreach*}} + {{/if}} {{foreach $item.folders as $cat}} {{$cat.name}}{{if $cat.removeurl}} (x) {{/if}} {{/foreach}} @@ -305,9 +306,9 @@ as the value of $top_child_total (this is done at the end of this file) -
{{* Action buttons to interact with the item (like: like, dislike, share and so on *}} -
{{/if}} - - - {{* Insert comment box of threaded children *}} - {{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}} -