Merge https://github.com/friendica/friendica into pull

[friendica.git] / view / theme / frost / threaded_conversation.tpl

diff --git a/view/theme/frost/threaded_conversation.tpl b/view/theme/frost/threaded_conversation.tpl
index 0f7f9a986f70d417d7a5b2069fea41ef6ddca81d..cdafaad39cbfae196c58c61c1046feb6ea04d3af 100644 (file)
--- a/view/theme/frost/threaded_conversation.tpl
+++ b/view/theme/frost/threaded_conversation.tpl
@@ -4,12 +4,16 @@
   <div id="item-delete-selected-top-desc" >$dropping</div>
 </div>
 <img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{ else }}
+{{ if $mode==display }}
+<div id="display-top-padding"></div>
+{{ endif }}
 {{ endif }}
 
 $live_update
 
-{{ for $threads as $item }}
-{{ inc $item.template }}{{ endinc }}
+{{ for $threads as $thread }}
+{{ inc $thread.template with $item=$thread }}{{ endinc }}
 {{ endfor }}
 
 <div id="conversation-end"></div>