Merge pull request #9371 from annando/issue-9358

[friendica.git] / view / theme / vier / templates / wall_thread.tpl

diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index 04ea7b424d09fda02075dc5e807e83a3f16602d9..944aee77b94dd4af94e4470efd96a74c0ca73792 100644 (file)
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -32,7 +32,7 @@
 <span class="commented" style="display: none;">{{$item.commented}}</span>
 <span class="received" style="display: none;">{{$item.received}}</span>
 <span class="created" style="display: none;">{{$item.created_date}}</span>
-<span class="id" style="display: none;">{{$item.id}}</span>
+<span class="uriid" style="display: none;">{{$item.uriid}}</span>
 {{/if}}
        <div class="wall-item-item">
                <div class="wall-item-info">
@@ -40,7 +40,7 @@
                                <!-- <a aria-hidden="true" href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"></a> -->
                                        <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <ul role="menu" aria-haspopup="true" class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu nofilter}}
+                               {{$item.item_photo_menu_html nofilter}}
                                </ul>
 
                        </div>
@@ -65,7 +65,7 @@
                                {{/if}}
                                <span class="pinned">{{$item.pinned}}</span>
                        </span>
-                       {{if $item.lock}}<span class="icon s10 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}
+                       {{if $item.lock}}<span class="icon s10 lock fakelink" onclick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}
                        <span class="wall-item-network" title="{{$item.app}}">
                                {{$item.network_name}}
                        </span>
@@ -74,7 +74,7 @@
 
                <div itemprop="description" class="wall-item-content">
                        {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
-                       <span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body nofilter}}</span>
+                       <span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body_html nofilter}}</span>
                </div>
        </div>
        <div class="wall-item-bottom">
@@ -109,7 +109,7 @@
                                <a role="button" title="{{$item.remote_comment.0}}" href="{{$item.remote_comment.2}}"><i class="icon-commenting"><span class="sr-only">{{$item.remote_comment.1}}</span></i></a>
                        {{/if}}
 
-                       {{if $item.comment}}
+                       {{if $item.comment_html}}
                                <a role="button" id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" title="{{$item.switchcomment}}"><i class="icon-commenting"><span class="sr-only">{{$item.switchcomment}}</span></i></a>
                        {{/if}}
 
@@ -150,7 +150,7 @@
                        {{/if}}
                        </div>
 
-                       <div class="wall-item-location">{{$item.location nofilter}} {{$item.postopts}}</div>
+                       <div class="wall-item-location">{{$item.location_html nofilter}} {{$item.postopts}}</div>
 
                        <div class="wall-item-actions-isevent">
                        </div>
@@ -181,12 +181,12 @@
 
        </div>
 
-       {{if $item.threaded}}{{if $item.comment}}
+       {{if $item.threaded}}{{if $item.comment_html}}
        <div class="wall-item-bottom">
                <div class="wall-item-links">
                </div>
                <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
-                                       {{$item.comment nofilter}}
+                                       {{$item.comment_html nofilter}}
                </div>
        </div>
        {{/if}}{{/if}}
@@ -210,19 +210,19 @@
 {{/if}}
 
 {{if $item.total_comments_num}}
-       {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
+       {{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment_html nofilter}}</div>
        {{/if}}{{/if}}{{/if}}
 
        {{if $item.flatten}}
-               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment_html nofilter}}</div>
        {{/if}}
 {{else}}
-       {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
+       {{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment_html nofilter}}</div>
        {{/if}}{{/if}}{{/if}}
 
        {{if $item.flatten}}
-               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment_html nofilter}}</div>
        {{/if}}
 {{/if}}