Merge pull request #7828 from nupplaphil/task/move_enotify

[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 0ab2e478eba7b75edd5ea42bcc89ff0006638c4b..169d1b21405487b29cbff20560c67d48e28d5307 100644 (file)
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -2,12 +2,13 @@
 {{else}}
 {{if $item.comment_firstcollapsed}}
        {{if $item.thread_level<3}}
-               <div class="hide-comments-outer">
-                       <span id="hide-comments-total-{{$item.id}}"
-                               class="hide-comments-total">{{$item.num_comments}}</span>
-                       <span id="hide-comments-{{$item.id}}"
-                               class="hide-comments fakelink"
-                               onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+               <div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+                       <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
+                               {{$item.num_comments}} - {{$item.show_text}}
+                       </span>
+                       <span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
+                               {{$item.num_comments}} - {{$item.hide_text}}
+                       </span>
                </div>
                <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
        {{else}}
@@ -56,6 +57,10 @@
                        {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
                        <span class="wall-item-ago">
                                {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
+                               {{if $item.owner_self}}
+                                       {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
+                               {{/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}}
                        <span class="wall-item-network" title="{{$item.app}}">
@@ -75,17 +80,17 @@
                <div class="wall-item-tags">
                {{if !$item.suppress_tags}}
                        {{foreach $item.hashtags as $tag}}
-                               <span class="tag">{{$tag}}</span>
+                               <span class="tag">{{$tag nofilter}}</span>
                        {{/foreach}}
                        {{foreach $item.mentions as $tag}}
-                               <span class="mention">{{$tag}}</span>
+                               <span class="mention">{{$tag nofilter}}</span>
                        {{/foreach}}
                {{/if}}
                        {{foreach $item.folders as $cat}}
                                <span class="folder p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
                        {{foreach $item.categories as $cat}}
-                               <span class="category p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                               <span class="category p-category"><a href="{{$cat.url}}">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
                </div>
        </div>
@@ -118,6 +123,10 @@
                            {{/if}}
                        {{/if}}
 
+                       {{if $item.pin}}
+                               <a role="button" id="pin-{{$item.id}}" onclick="dopin({{$item.id}}); return false;"  class="{{$item.pin.classdo}}" title="{{$item.pin.do}}"><i class="icon-circle icon-large"><span class="sr-only">{{$item.pin.do}}</span></i></a>
+                               <a role="button" id="unpin-{{$item.id}}" onclick="dopin({{$item.id}}); return false;"  class="{{$item.pin.classundo}}"  title="{{$item.pin.undo}}"><i class="icon-remove-circle icon-large"><span class="sr-only">{{$item.pin.undo}}</span></i></a>
+                       {{/if}}
                        {{if $item.star}}
                                <a role="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="icon-star icon-large"><span class="sr-only">{{$item.star.do}}</span></i></a>
                                <a role="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}"><i class="icon-star-empty icon-large"><span class="sr-only">{{$item.star.undo}}</span></i></a>