X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Ftemplates%2Fbanana-thread.inc.tpl;h=5660c700cac45918bbb1a8e35d0ecb9171f799f0;hb=8ba04fa3864bf9a31567d92969fd88cf2ff2161e;hp=9bf65fd128ec67a782509436b2e784ad7ade002f;hpb=8bfa4595f72d796e19c1e7e8829c02f4b67e9cde;p=banana.git

diff --git a/banana/templates/banana-thread.inc.tpl b/banana/templates/banana-thread.inc.tpl
index 9bf65fd..5660c70 100644
--- a/banana/templates/banana-thread.inc.tpl
+++ b/banana/templates/banana-thread.inc.tpl
@@ -1,8 +1,9 @@
+{capture name=pages}
 {if $withtitle}
 <div class="pages">
-{if $spool->overview|@count > $msgbypage}
-{section name=pages loop=$spool->overview step=$msgbypage}
-  {if $first >= $smarty.section.pages.index && $first < $smarty.section.pages.index_next}
+{if $spool->roots|@count gt $msgbypage}
+{section name=pages loop=$spool->roots step=$msgbypage}
+  {if $first ge $smarty.section.pages.index && $first lt $smarty.section.pages.index_next}
     <strong>{$smarty.section.pages.iteration}</strong>
   {else}
     {link group=$group first=$smarty.section.pages.index text=$smarty.section.pages.iteration}
@@ -11,13 +12,17 @@
 {/if}
 </div>
 {/if}
+{/capture}
+
+{$smarty.capture.pages|smarty:nodefaults}
 <table class="bicol thread">
   <tr>
     {if $withtitle}
     <th>
-      {if $spool->nextUnread()}
+      {assign var=nextUnread value=$spool->nextUnread()}
+      {if $nextUnread}
       <div class="menu">
-        {imglink group=$group artid=$spool->nextUnread() img=next_unread alt="Message non-lu suivant"|b accesskey=u}
+        {imglink group=$group artid=$nextUnread img=next_unread alt="Message non-lu suivant"|b accesskey=u}
       </div>
       {/if}
       {"Date"|b}
@@ -27,18 +32,31 @@
       {if $protocole->canSend()}
       <div class="action">
         {imglink group=$group action=new img=post alt="Nouveau message"|b accesskey=p}
+        {if $feed_active}{imglink group=$group action=$feed_format img=feed alt="Flux"|b accesskey=f}{/if}
       </div>
       {/if}
       {"Auteur"|b}
     </th>
     {else}
-    <th colspan="3">
-      {"Aperçu de "|b}{link group=$group text=$group}
-    </th>
+    <th colspan="3">{"En discussion sur "|b}{link group=$group text=$group}...</th>
     {/if}
   </tr>
-  {if $spool->overview|@count}
-  {if $artid}{$spool->toHtml($artid, true)}{else}{$spool->toHtml($first)}{/if}
+  {if $spool->roots|@count}
+  {section name=threads loop=$spool->roots step=1 start=$spool->start() max=$spool->context()}
+  {assign var=overview value=$spool->roots[$smarty.section.threads.index]}
+  {assign var=id value=$overview->id}
+  {cycle assign=class values="impair,pair"}
+  <tr class="{$class} {if $overview->descunread}new{/if}">
+    <td class="date">{$spool->formatDate($overview)}</td>
+    <td class="subj">{$spool->formatSubject($overview)|smarty:nodefaults}</td>
+    <td class="from">{$spool->formatFrom($overview)|smarty:nodefaults}</td>
+  </tr>
+  {if !$artid && $spool->nextPost($id)}
+  <tr class="{$class}">
+    <td colspan="3" class="thread_tree">{$spool->getTree($id)|smarty:nodefaults}</td>
+  </tr>
+  {/if}
+  {/section}
   {else}
   <tr>
     <td colspan="3">
@@ -47,21 +65,10 @@
   </tr>
   {/if}
 </table>
+{$smarty.capture.pages|smarty:nodefaults}
 {if $showboxlist}
+<br />
 {include file="banana-boxlist.inc.tpl" grouplist=$groups withstats=true}
 {/if}
-{if $withtitle}
-<div class="pages">
-{if $spool->overview|@count > $msgbypage}
-{section name=pages loop=$spool->overview step=$msgbypage}
-  {if $first >= $smarty.section.pages.index && $first < $smarty.section.pages.index_next}
-    <strong>{$smarty.section.pages.iteration}</strong>
-  {else}
-    {link group=$group first=$smarty.section.pages.index text=$smarty.section.pages.iteration}
-  {/if}
-{/section}
-{/if}
-</div>
-{/if}
 
 {* vim:set et sw=2 sts=2 ts=2 enc=utf-8: *}