X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Flogin.tpl;h=a104701ad10b8cc879394180049860c34310fac5;hb=7743e0e58199e7d59177ab8a6bac8a6310456c86;hp=d68ad8ef661ce7275b1fbafe4e2c31d9519c1afc;hpb=7b2413f614dc4deafd18501ba3cbe8db398c05e3;p=platal.git

diff --git a/templates/login.tpl b/templates/login.tpl
index d68ad8e..a104701 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -83,7 +83,12 @@ Bienvenue {$smarty.session.prenom}
   <table class="bicol">
     <tr>
       <th>
-        <a href="events?lu={$ev.id}{if $previd}#newsid{$previd}{/if}" style="display:block;float:right"><img alt="Cacher" title="Cacher cet article" src="images/retirer.gif"/></a>
+        <div style="float:right">
+          {if $smarty.session.perms eq 'admin'}
+          <a href="admin/events/edit/{$ev.id}">{icon name=page_edit title="Editer cet article"}</a>
+          {/if}
+          <a href="events/read/{$ev.id}{if $previd}/newsid{$previd}{/if}">{icon name=cross title="Cacher cet article"}</a>
+        </div>
         {assign var="previd" value=$ev.id}
         <a id="newsid{$ev.id}"></a>
 	 {tidy}
@@ -97,7 +102,7 @@ Bienvenue {$smarty.session.prenom}
           {$ev.texte|smarty:nodefaults|nl2br}
         {/tidy}
         <br />
-        <p class="smaller"><a href="#pagetop" style="display:block;float:right"><img alt="Sommaire" title="Remonter tout en haut" src="images/up.png"/></a>Annonce proposée par
+        <p class="smaller"><a href="events#pagetop" style="display:block;float:right"><img alt="Sommaire" title="Remonter tout en haut" src="images/up.png"/></a>Annonce proposée par
         <a href="profile/{$ev.forlife}" class="popup2">
           {$ev.prenom} {$ev.nom} X{$ev.promo}
         </a>
@@ -112,6 +117,15 @@ Bienvenue {$smarty.session.prenom}
   <table class="bicol">
     <tr>
       <th>
+        {if $smarty.session.core_rss_hash}
+        <a href='rss/{$smarty.session.forlife}/{$smarty.session.core_rss_hash}/rss.xml' style="display:block;float:right">
+          {icon name=feed title='fil rss'}
+        </a>
+        {else}
+        <a href='prefs/rss?referer=events'  style="display:block;float:right">
+          {icon name=feed_add title='Activer mon fil rss'}
+        </a>
+       {/if}
         Sommaire des informations événementielles
       </th>
     </tr>
@@ -119,7 +133,7 @@ Bienvenue {$smarty.session.prenom}
     <tr class="{cycle values="impair,pair"}">
       <td class="half">
         &bull;
-        <a href="{if !$ev.nonlu}events?nonlu={$ev.id}{/if}#newsid{$ev.id}">
+        <a href="events{if !$ev.nonlu}/unread/{$ev.id}{else}#newsid{$ev.id}{/if}">
         {if $ev.nonlu}<strong>{/if}
       	 {tidy}
       	   {$ev.titre|nl2br}
@@ -128,7 +142,13 @@ Bienvenue {$smarty.session.prenom}
         </a>
       </td>
     </tr>
+    {assign var="has_evts" value=true}
     {/iterate}
+    {if !$has_evts}
+    <tr>
+      <td class="half">Aucun article actuellement</td>
+    </tr>
+    {/if}
   </table>
 
   <p class="smaller">
@@ -143,15 +163,6 @@ Bienvenue {$smarty.session.prenom}
   <p>
   <a href="events/submit">Proposer une information événementielle</a>
   </p>
-  {if $smarty.session.core_rss_hash}
-  <div class="right">
-    <a href='rss/{$smarty.session.forlife}/{$smarty.session.core_rss_hash}/rss.xml'><img src='images/rssicon.gif' alt='fil rss' /></a>
-  </div>
-  {else}
-  <div class="right">
-    <a href='prefs/rss?referer=events'><img src='images/rssact.gif' alt='fil rss' /></a>
-  </div>
-  {/if}
 {/if}
 
 {* vim:set et sw=2 sts=2 sws=2: *}