Merge remote-tracking branch 'upstream/master'

[friendica.git] / view / theme / quattro / wall_item_tag.tpl

diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl
index 926fc929d26df61cf641ad3de20719f6e85cb2e5..63373ab163fef5da82102689690c7263ec3a76fe 100644 (file)
--- a/view/theme/quattro/wall_item_tag.tpl
+++ b/view/theme/quattro/wall_item_tag.tpl
@@ -1,4 +1,28 @@
-<div class="wall-item-container item-tag $item.indent">
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_firstcollapsed}}
+       <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>
+                       {{ if $item.thread_level==3 }} - 
+                       <span id="hide-thread-$item-id"
+                               class="fakelink"
+                               onclick="showThread($item.id);">expand</span> /
+                       <span id="hide-thread-$item-id"
+                               class="fakelink"
+                               onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
+       </div>
+       <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}
+{{ endif }}
+
+{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
+
+
+<div class="wall-item-container item-tag $item.indent $item.shiny">
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper">
@@ -13,11 +37,31 @@
                        <div class="wall-item-location">$item.location</div>    
                </div>
                <div class="wall-item-content">
-                       $item.body
+                       $item.ago $item.body 
                </div>
+                       <div class="wall-item-tools">
+                               {{ if $item.drop.pagedrop }}
+                                       <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                               {{ endif }}
+                               {{ if $item.drop.dropping }}
+                                       <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+                               {{ endif }}
+                       </div>
        </div>
 </div>
 
-<div class="wall-item-comment-wrapper" >
-       $item.comment
-</div>
+{{ if $item.thread_level!=1 }}</div>{{ endif }}
+
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_lastcollapsed}}</div>{{endif}}
+{{ endif }}
+
+{# top thread comment box #}
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >$item.comment</div>
+{{ endif }}{{ endif }}{{ endif }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >$item.comment</div>
+{{ endif }}