From 48f20ccf72a23e3c91024a831eb80157ab4a9492 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Sun, 15 Jul 2012 16:26:52 +0200
Subject: [PATCH] Update FXLetter CSS/template.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 htdocs/css/nl.FX.css                | 33 +++++++++++++++++++++++++++++++++
 templates/newsletter/nl.FX.mail.tpl | 21 ++++++++++++++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/htdocs/css/nl.FX.css b/htdocs/css/nl.FX.css
index dcbab87..0ff0835 100644
--- a/htdocs/css/nl.FX.css
+++ b/htdocs/css/nl.FX.css
@@ -66,6 +66,39 @@ div.fx_mail div.signature {
     text-align : right;
 }
 
+/* Category */
+div.fx_mail h1.category {
+    margin: 3ex 0 2ex;
+    padding : 1.5ex 2ex 0.5ex 1ex;
+    font-size : 120%;
+    font-weight : bold;
+    text-align : right;
+}
+
+/* Article title */
+div.fx_mail h2.xorg_nl {
+    margin : 2ex 0 0;
+    padding : 0.4ex 2ex;
+    font-size : 100%;
+    font-weight : bold;
+    font-style : italic;
+    border-width : thin 0;
+    border-style : solid;
+}
+
+/* Article text */
+div.fx_mail div.art {
+    margin: 2ex 3ex;
+}
+
+/* Article details */
+div.fx_mail div.app {
+    margin : 2ex 6ex 0 3ex;
+    font-size : 95%;
+    text-align : left;
+    color: #333;
+}
+
 /* Give */
 div.fx_mail div.give {
     font-weight: bold;
diff --git a/templates/newsletter/nl.FX.mail.tpl b/templates/newsletter/nl.FX.mail.tpl
index 8332667..4f41fbf 100644
--- a/templates/newsletter/nl.FX.mail.tpl
+++ b/templates/newsletter/nl.FX.mail.tpl
@@ -36,6 +36,17 @@
 
 {$issue->head($user, 'text')}
 
+{foreach from=$issue->arts key=cid item=arts}
+--------------------------------------------------------------------
+*{$issue->category($cid)}*
+--------------------------------------------------------------------
+
+{foreach from=$arts item=art}
+{$art->toText($hash, $user->login())}
+
+{/foreach}
+{/foreach}
+
 {$issue->signature('text')}
 
 --------------------------------------------------------------------
@@ -79,10 +90,18 @@ ne plus recevoir : &lt;https://www.polytechnique.org/fxletter/out/{if $hash}{$ha
     <div class='fx_mail'>
       <div class="title">{$issue->title()}</div>
       <div class="intro">{$issue->head($user, 'html')|smarty:nodefaults}</div>
+      {foreach from=$issue->arts key=cid item=arts name=cats}
+      <h1 class="category"><a id="cat{$cid}"></a>
+        {$issue->category($cid)}
+      </h1>
+      {foreach from=$arts item=art}
+        {$art->toHtml($hash, $user->login())|smarty:nodefaults}
+      {/foreach}
+      {/foreach}
       <div class="signature">{$issue->signature('html')|smarty:nodefaults}</div>
       <div class="give"><a href="http://fondationx.fr/fond/paiement.php">Faire un don</a></div>
       <div class="foot1">
-        Cette lettre est envoyée par la FX grâce aux outils de Polytechnique.org.
+        Cette lettre est envoyée par la Fondation grâce aux outils de Polytechnique.org.
       </div>
       <div class="foot2">
         [<a href="https://www.polytechnique.org/fxletter">archives</a>&nbsp;|
-- 
2.1.4