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

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

diff --git a/view/theme/frost/smarty3/threaded_conversation.tpl b/view/theme/frost/smarty3/threaded_conversation.tpl
index 6bf8e8e4dd5e59e394e6a61ab4f116761e23187a..c61de4f53a106ec0f62d52d97d46dcf4b53b0db9 100644 (file)
--- a/view/theme/frost/smarty3/threaded_conversation.tpl
+++ b/view/theme/frost/smarty3/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>
+{{/if}}
 {{/if}}
 
 {{$live_update}}
 
 {{foreach $threads as $thread}}
-{{include file="file:{{$thread.template}}" item=$thread}}
+{{include file="{{$thread.template}}" item=$thread}}
 {{/foreach}}
 
 <div id="conversation-end"></div>