Can overload the xface generation using a custom image

[banana.git] / banana / templates / banana-message.inc.tpl

diff --git a/banana/templates/banana-message.inc.tpl b/banana/templates/banana-message.inc.tpl
index f7672b7..8181892 100644 (file)
--- a/banana/templates/banana-message.inc.tpl
+++ b/banana/templates/banana-message.inc.tpl
@@ -24,17 +24,17 @@
         {/if}
       </div>
       {/if}
-      {$message->translateHeaderValue('subject')}
+      {$message->translateHeaderValue('subject')|smarty:nodefaults}
     </th>
   </tr>
   {foreach from=$headers name=headers item=hdr}
   <tr class="pair">
     <td class="hdr">{$message->translateHeaderName($hdr)}</td>
-    <td>{$message->translateHeaderValue($hdr)}</td>
+    <td>{$message->translateHeaderValue($hdr)|smarty:nodefaults}</td>
     {if $smarty.foreach.headers.first}
     <td class="xface" rowspan="{$headers|@count}">
       {if $message->hasXFace()}
-      <img src="{url group=$group artid=$artid part="xface"}" alt="[ X-Face ]" />
+      <img src="{url group=$group artid=$artid part="xface"}" style="width: 48px" alt="[ X-Face ]" />
       {/if}
     </td>
     {/if}
@@ -43,7 +43,7 @@
   {assign var=files value=$message->getAttachments()}
   {if $files|@count}
   <tr class="pair">
-    <td class="hdr">Fichiers joints</td>
+    <td class="hdr">{"Fichiers joints"|b}</td>
     <td colspan="2">
       {foreach from=$files item=file name=attachs}
       {imglink img=save alt="Enregistrer"|b group=$group artid=$artid part=$file->getFilename() text=$file->getFilename()}{if !$smarty.foreach.attachs.last}, {/if}
@@ -51,13 +51,43 @@
     </td>
   </tr>
   {/if}
+  {assign var=signature value=$message->getSignature()}
+  {if $signature && $signature.key.id}
+  <tr class="pair">
+    <td class="hdr">{"Signature"|b}</td>
+    <td colspan="2">
+      {if $signature.verify && $signature.certified}
+      {img img=accept alt="Signature valide par une clé de confiance"|b}
+      {elseif $signature.verify}
+      {img img=error alt="Signature valide par une clé non vérifiée"|b}
+      {else}
+      {img img=exclamation alt="Signature non valide"|b}
+      {/if}
+      <strong>
+        {if $signature.verify}<span class="ok">{"Valide"|b}...</span>
+        {else}<span class="erreur">{"Non valide"|b}...</span>{/if}
+      </strong>&nbsp;
+      {"Message signé par la clé"|b} {$signature.key.format}:{$signature.key.id}
+      {if $signature.certified}
+        (<span class="ok">{"identité vérifiée"|b}</span>)
+      {else}
+        (<span class="erreur">{"non vérifiée"|b}</span>&nbsp;: {$signature.certification_error})
+      {/if}
+    </td>
+  </tr>
+  {/if}
   {assign var=alter value=$message->getAlternatives()}
   {if $alter|@count}
   <tr class="pair">
     <td class="hdr">{"Versions"|b}</td>
     <td colspan="2">
       {foreach from=$alter key=ctype item=text name=alter}
-      {if $type eq $ctype}{$text}{else}{link group=$group artid=$artid part=$ctype text=$text}{/if}
+      {if $type eq $ctype}
+      {$text}
+      {if $extimages}[{link group=$group artid=$artid part=$type action=showext text="Afficher les images externes"|b}]{/if}
+      {else}
+      {link group=$group artid=$artid part=$ctype text=$text}
+      {/if}
       {if !$smarty.foreach.alter.last}&nbsp;&bull;&nbsp;{/if}
       {/foreach}
     </td>
@@ -65,7 +95,7 @@
   {/if}
   <tr>
     <td colspan="3" class="body">
-      {$body}
+      {$body|banana_utf8entities|smarty:nodefaults}
     </td>
   </tr>
 </table>