Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / view / theme / smoothly / wall_thread.tpl

diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl
index 46cbe651de0645b4010d6084826f421362050d14..7987a36492c88121d973f19b39d8d81a87680d47 100644 (file)
--- a/view/theme/smoothly/wall_thread.tpl
+++ b/view/theme/smoothly/wall_thread.tpl
@@ -70,21 +70,24 @@
                                {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
                                </div>
                                {{ endif }}
+
+                               {{ if $item.has_folders }}
+                               <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name 
+                               <a href="$cat.removeurl" title="$remove">[$remove]</a> 
+                               {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+                               </div>
+                               {{ endif }}
+
                        </div>
                </div>
                <div class="wall-item-social" id="wall-item-social-$item.id">
 
-                       {{ if $item.has_folders }}
-                       <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name 
-                       <a href="$cat.removeurl" title="$remove">[$remove]</a> 
-                       {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-                       </div>
-                       {{ endif }}
-
                        {{ if $item.vote }}
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
                                <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+                               {{ if $item.vote.dislike }}
                                <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+                               {{ endif }}
                                {{ if $item.vote.share }}
                                <a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>                             {{ endif }}
                                <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
@@ -99,7 +102,13 @@
                 
                        {{ if $item.star }}
                        <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-                       <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+                       {{ endif }}
+                       {{ if $item.tagger }}
+                       <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
+                       {{ endif }}
+
+                       {{ if $item.filer }}
+                       <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
                        {{ endif }}
        
                </div>
@@ -116,7 +125,9 @@
                        </div>
 
                        {{ if $item.drop.pagedrop }}
-                       <input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />                       {{ endif }}
+                       <input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />
+                       {{ endif }}
+
                        <div class="wall-item-delete-end"></div>
                </div>
 
@@ -136,8 +147,8 @@
 
 <div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
 
-{{ for $item.children as $item }}
-       {{ inc $item.template }}{{ endinc }}
+{{ for $item.children as $child }}
+       {{ inc $child.template with $item=$child }}{{ endinc }}
 {{ endfor }}
 
 {{ if $item.flatten }}