Socials reorganized

footer.php

@@ -7,24 +7,27 @@
                     </div>
                     <div class="even">
                     <ul class="navigation">
-                    <li><a href="<?php echo rss_url(); ?>"><?php echo social_logo('rss'); ?>RSS</a></li>
+                        <?php if(site_meta('mail', '')): ?>
+                        <li><a href="<?php echo social_url('mail'); ?>"><?php echo social_logo('mail').' '.site_meta('mail', ''); ?></a></li>
+                        <?php endif; ?>
                         <?php if(site_meta('github', '')): ?>
-                        <li><a href="<?php echo social_url('github'); ?>"><?php echo social_logo('github').site_meta('github', ''); ?></a></li>
+                        <li><a href="<?php echo social_url('github'); ?>"><?php echo social_logo('github').' '.site_meta('github', ''); ?></a></li>
                         <?php endif; ?>
                         <?php if(site_meta('framasphere', '')): ?>
-                        <li><a href="<?php echo social_url('framasphere'); ?>"><?php echo social_logo('framasphere').site_meta('framasphere', ''); ?></a></li>
+                        <li><a href="<?php echo social_url('framasphere'); ?>"><?php echo social_logo('framasphere').' '.site_meta('framasphere', ''); ?></a></li>
                         <?php endif; ?>
                         <?php if(site_meta('facebook', '')): ?>
-                        <li><a href="<?php echo social_url('facebook'); ?>"><?php echo social_logo('facebook').site_meta('facebook', ''); ?></a></li>
+                        <li><a href="<?php echo social_url('facebook'); ?>"><?php echo social_logo('facebook').' '.site_meta('facebook', ''); ?></a></li>
                         <?php endif; ?>
                         <?php if(site_meta('twitter', '')): ?>
-                        <li><a href="<?php echo social_url('twitter'); ?>"><?php echo social_logo('twitter').'@'.site_meta('twitter', ''); ?></a></li>
+                        <li><a href="<?php echo social_url('twitter'); ?>"><?php echo social_logo('twitter').' '.site_meta('twitter', ''); ?></a></li>
                         <?php endif; ?>
                 </ul>
                 <br />
                 <ul class="navigation">
                         <li><a href="<?php echo base_url(); ?>" title="Retour &agrave; l'accueil.">Accueil</a></li>
                         <li><a href="<?php echo base_url('admin'); ?>" title="Administration">Administration</a></li>
+                        <li><a href="<?php echo rss_url(); ?>"><?php echo social_logo('rss'); ?> RSS</a></li>
                     <?php echo html_meta('w3c'); ?>
                     </ul>
                     </div>

functions.php

@@ -70,6 +70,7 @@ function social_url($network) {
         'framasphere' => 'https://framasphere.org/people/',
         'facebook' => 'https://facebook.com/',
         'twitter' => 'https://twitter.com/',
+        'mail' => 'mailto:',
     );
     if ($network == "framasphere"){
         $account = site_meta($network.'_id', '');