icalicon -> calendar_view_day

rssact   -> feed_add
Avoid to create a new line juste for ical or rss icons

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@666 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs.net/.htaccess b/htdocs.net/.htaccess
index c5457d6..8baf1b3 100644 (file)
--- a/htdocs.net/.htaccess
+++ b/htdocs.net/.htaccess
@@ -1,7 +1,7 @@
 Options +FollowSymLinks
 RewriteEngine on
 
-RewriteBase /~x2001corpet
+RewriteBase /~x2003bruneau
 
 # Rewrite URLs of the form 'index.php?q=x':
 RewriteCond %{REQUEST_FILENAME} !-f

diff --git a/htdocs.net/css/xnet.css b/htdocs.net/css/xnet.css
index 68f1ed8..df71e41 100644 (file)
--- a/htdocs.net/css/xnet.css
+++ b/htdocs.net/css/xnet.css
@@ -120,6 +120,7 @@ td#search {
 }
 
 td#body {
+    vertical-align: top;
     padding-left: 1em;
     padding-bottom: 1em;
 }

diff --git a/htdocs/.htaccess b/htdocs/.htaccess
index 54469c6..b72936d 100644 (file)
--- a/htdocs/.htaccess
+++ b/htdocs/.htaccess
@@ -1,7 +1,7 @@
 Options +FollowSymLinks
 RewriteEngine on
 
-RewriteBase /~x2001corpet
+RewriteBase /~x2003bruneau
 
 # wiki
 

diff --git a/htdocs/images/icalicon.gif b/htdocs/images/icalicon.gif
deleted file mode 100644 (file)
index 01cc8cd..0000000
Binary files a/htdocs/images/icalicon.gif and /dev/null differ

diff --git a/htdocs/images/icons/calendar_view_day.gif b/htdocs/images/icons/calendar_view_day.gif
new file mode 100644 (file)
index 0000000..b07c373
Binary files /dev/null and b/htdocs/images/icons/calendar_view_day.gif differ

diff --git a/htdocs/images/icons/feed_add.gif b/htdocs/images/icons/feed_add.gif
new file mode 100644 (file)
index 0000000..cb1e280
Binary files /dev/null and b/htdocs/images/icons/feed_add.gif differ

diff --git a/htdocs/images/rssact.gif b/htdocs/images/rssact.gif
deleted file mode 100644 (file)
index 00f1192..0000000
Binary files a/htdocs/images/rssact.gif and /dev/null differ

diff --git a/templates/carnet/index.tpl b/templates/carnet/index.tpl
index ee4f86b..813aacf 100644 (file)
--- a/templates/carnet/index.tpl
+++ b/templates/carnet/index.tpl
@@ -53,6 +53,15 @@
 <table class="bicol">
   <tr>
     <th colspan="2">
+      {if $smarty.session.core_rss_hash}
+      <a href='carnet/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=carnet' style="display:block;float:right">
+        {icon name=feed_add title='Activer mon fil rss'}
+      </a>
+      {/if}
       Notifications
     </th>
   </tr>
@@ -63,15 +72,6 @@
       </h3>
       <div class="explication">
         Affichage de tous les évenements de camarades/promos
-  {if $smarty.session.core_rss_hash}
-  <div class="right">
-    <a href='carnet/rss/{$smarty.session.forlife}/{$smarty.session.core_rss_hash}/rss.xml'>{icon name=feed title='fil rss'}</a>
-  </div>
-  {else}
-  <div class="right">
-    <a href='prefs/rss/?referer=carnet'><img src='images/rssact.gif' alt='fil rss' /></a>
-  </div>
-  {/if}
       </div>
     </td>
     <td class='half'>

diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl
index 04d9653..e8bdbfe 100644 (file)
--- a/templates/carnet/mescontacts.tpl
+++ b/templates/carnet/mescontacts.tpl
@@ -54,12 +54,18 @@ Pour r
   [<a href="carnet/contacts/pdf/mescontacts.pdf" class='popup'><strong>tri par noms</strong></a>]
   </li>
 </ul>
-<p>
-  Tu peux récupérer un calendrier iCal avec l'anniversaire de tes contacts.
-</p>
-<div class="right">
-  <a href='carnet/ical/annivs-x.ics'><img src='images/icalicon.gif' alt='fichier ical' title='Anniversaires'/></a>
-</div>
+<table style="width: 100%">
+  <tr>
+    <td>
+      Tu peux récupérer un calendrier iCal avec l'anniversaire de tes contacts.
+    </td>
+    <td class="right">
+      <a href="carnet/ical/anniv-x.ics">
+        {icon name=calendar_view_day title='Anniversaires'}
+      </a>
+    </td>
+  </tr>
+</table>
 
 {if $trombi}
 

diff --git a/templates/login.tpl b/templates/login.tpl
index 27e4931..8558878 100644 (file)
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -112,6 +112,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>
@@ -143,15 +152,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'>{icon name=feed title='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: *}