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=77fdf8dae53977809a5ffffb849cf36b80f0e931;hpb=5a929c587f69ba98a0f5d6f28cf3d209edc9bca0;p=friendica.git diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 77fdf8dae5..21923737c0 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -12,15 +12,15 @@ 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}} {{/if}} {{if $item.thread_level==2 && $top_child_nr==1}} -
-- {{$item.network_name|escape}}
+ - {{$item.network_name}}
{{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer || $item.subthread}}
-
@@ -91,38 +93,38 @@ as the value of $top_child_total (this is done at the end of this file)
-
+
-
+
@@ -171,8 +173,8 @@ as the value of $top_child_total (this is done at the end of this file)
{{* The litle overlay avatar picture if someone is posting directly to a wall or a forum *}}
{{if $item.owner_url}}
-
-
+
+
{{/if}}
@@ -184,7 +186,7 @@ as the value of $top_child_total (this is done at the end of this file)
-
+
@@ -196,19 +198,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}}
-
-
- {{$item.comment}}
-
- {{/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 *}}
+
{{if $item.plink}} {{*link to the original source of the item *}}-
- {{$item.plink.title|escape}}
+ {{$item.plink.title}}
{{/if}}
{{if $item.edpost}} {{* edit the posting *}}
-
-
+
{{/if}}
{{if $item.tagger}} {{* tag the post *}}
-
-
+
{{/if}}
{{if $item.filer}}
-
-
+
{{/if}}
{{if $item.star}}
-
-
-
+
+
{{/if}}
{{if $item.subthread}}
-
-
+
{{/if}}
@@ -132,16 +134,16 @@ as the value of $top_child_total (this is done at the end of this file)
{{if $item.ignore}}
-
-
+
-
-
+
{{/if}}
{{if $item.drop.dropping}}
-
-
+
{{/if}}
@@ -156,14 +158,14 @@ as the value of $top_child_total (this is done at the end of this file){{$item.name|escape}} - {{if $item.owner_url}}{{$item.via}} {{$item.owner_name|escape}}{{/if}} - {{if $item.lock}} {{/if}} +
-
+
+
+
+
+
+
+ {{if $item.owner_self}}
+ {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
+ {{/if}}
+
{{if $item.location}}
- ({{$item.location}})
+ ({{$item.location nofilter}})
{{/if}}
@@ -218,9 +229,15 @@ as the value of $top_child_total (this is done at the end of this file)
{{* contact info header for smartphones *}}
@@ -231,9 +248,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 *}}
@@ -246,16 +269,11 @@ 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}}
- {{$item.body}}
+ {{$item.body nofilter}}
@@ -264,33 +282,36 @@ as the value of $top_child_total (this is done at the end of this file)
{{if !$item.suppress_tags}}
{{foreach $item.hashtags as $tag}}
- {{$tag}}
+ {{$tag nofilter}}
{{/foreach}}
{{foreach $item.mentions as $tag}}
- {{$tag}}
+ {{$tag nofilter}}
{{/foreach}}
- {{/if}}
+ {{*foreach $item.implicit_mentions as $tag}}
+ {{$tag nofilter}}
+ {{/foreach*}}
+ {{/if}}
{{foreach $item.folders as $cat}}
- {{$cat.name|escape}}{{if $cat.removeurl}} (x) {{/if}}
+ {{$cat.name}}{{if $cat.removeurl}} (x) {{/if}}
{{/foreach}}
{{foreach $item.categories as $cat}}
- {{$cat.name|escape}}{{if $cat.removeurl}} (x) {{/if}}
+ {{$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}}
-
+
+
@@ -299,13 +320,13 @@ 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}}
-
+
{{/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}}
@@ -315,7 +336,7 @@ as the value of $top_child_total (this is done at the end of this file)
{{* Button to open the comment text field *}}
{{if $item.comment}}
-
+
{{/if}}
{{* Button for sharing the item *}}
@@ -324,31 +345,30 @@ as the value of $top_child_total (this is done at the end of this file)
{{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
â¢
{{/if}}
-
+
{{/if}}
{{/if}}
-
-
+
+
-
+
{{* Event attendance buttons *}}
- {{if $item.isevent}}
-
-
-
-
-
- {{/if}}
+ {{if $item.isevent}}
+
+
+
+
+
+ {{/if}}
-
- {{if $item.drop.pagedrop}}
-
+
+ {{if $item.drop.pagedrop}}
+
- {{/if}}
-
-
-
-
+ {{/if}}
+
+
+
@@ -356,66 +376,44 @@ 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}}
+ {{* Insert comment box of threaded children *}}
+ {{if $item.threaded && $item.comment && $item.indent==comment}}
+
+ {{$item.comment nofilter}}
+
+ {{/if}}
+
{{if $item.thread_level!=1}}
{{$item.name}} + {{if $item.owner_url}}{{$item.via}} {{$item.owner_name}}{{/if}} + {{if $item.lock}} {{/if}}
- {{$item.name|escape}} + {{$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}} +
- {{$item.name|escape}} + {{$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}} +
{{$item.title|escape}}
+
{{$item.title}}
{{/if}} -
{{* 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}} -