Merge pull request #9892 from MrPetovan/task/9872-item-pin

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

diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
index b6907219ffd2cc8fb63ec93731057617e41b3d66..5f682dd3e288ed0e0dc506e247231280f03075af 100644 (file)
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -19,7 +19,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-decor">
@@ -39,7 +39,7 @@
                                </a>
                                <a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
                                <ul 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>
@@ -50,11 +50,11 @@
                                </a>
                        </div>
                        {{/if}}
-                       <div class="wall-item-location">{{$item.location nofilter}}</div>
+                       <div class="wall-item-location">{{$item.location_html nofilter}}</div>
                </div>
                <div 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>
+                       <div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body_html nofilter}}</div>
                </div>
        </div>
        <div class="wall-item-bottom">
@@ -76,6 +76,9 @@
                        {{/foreach}}
                {{/if}}
                </div>
+               {{if $item.edited}}
+               <div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>
+               {{/if}}
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links">
@@ -95,8 +98,8 @@
 
                        <div class="wall-item-actions-social">
                        {{if $item.pin}}
-                               <a href="#" id="pin-{{$item.id}}" onclick="dopin({{$item.id}}); return false;"  class="{{$item.pin.classdo}}"  title="{{$item.pin.do}}">{{$item.pin.do}}</a>
-                               <a href="#" id="unpin-{{$item.id}}" onclick="dopin({{$item.id}}); return false;"  class="{{$item.pin.classundo}}"  title="{{$item.pin.undo}}">{{$item.pin.undo}}</a>
+                               <a href="#" id="pin-{{$item.id}}" onclick="doPin({{$item.id}}); return false;" class="{{$item.pin.classdo}}" title="{{$item.pin.do}}">{{$item.pin.do}}</a>
+                               <a href="#" id="unpin-{{$item.id}}" onclick="doPin({{$item.id}}); return false;" class="{{$item.pin.classundo}}" title="{{$item.pin.undo}}">{{$item.pin.undo}}</a>
                        {{/if}}
                        {{if $item.star}}
                                <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
@@ -122,6 +125,9 @@
                                {{if $item.vote.dislike}}
                                <a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}}); return false">{{$item.vote.dislike.1}}</a>
                                {{/if}}
+                               {{if $item.vote.announce}}
+                               <a href="#" id="announce-{{$item.id}}"{{if $item.responses.announce.self}} class="active{{/if}}" title="{{$item.vote.announce.0}}" onclick="dolike({{$item.id}}, 'announce'{{if $item.responses.announce.self}}, true{{/if}}); return false">{{$item.vote.announce.1}}</a>
+                               {{/if}}
                            {{if $item.vote.share}}
                                    <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
                            {{/if}}
@@ -161,11 +167,11 @@
                {{/if}}
        </div>
 
-       {{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
+       {{if $item.threaded}}{{if $item.comment_html}}{{if $item.indent==comment}}
        <div class="wall-item-bottom commentbox">
                <div class="wall-item-links"></div>
                <div class="wall-item-comment-wrapper">
-                                       {{$item.comment nofilter}}
+                                       {{$item.comment_html nofilter}}
                </div>
        </div>
        {{/if}}{{/if}}{{/if}}
@@ -189,11 +195,11 @@
 {{/if}}
 
 {{* top thread comment box *}}
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
+{{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
 {{/if}}{{/if}}{{/if}}
 
 
 {{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
+<div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
 {{/if}}