new home page and new navigation for Mageia 2

author: Romain d'Alverny <rda@mageia.org> 2012-05-22 19:47:02 +0000
committer: Romain d'Alverny <rda@mageia.org> 2012-05-22 19:47:02 +0000
commit: 0d0e606eefa347a100cf276b1bc43b832cc48200 (patch)
tree: d12bb44604451a18fb3ca34d1df7bc3490cb6c19
parent: c70474335e7e9bc2f3a6af2a40f6b367b19caf6e (diff)
download: www-0d0e606eefa347a100cf276b1bc43b832cc48200.tar
www-0d0e606eefa347a100cf276b1bc43b832cc48200.tar.gz
www-0d0e606eefa347a100cf276b1bc43b832cc48200.tar.bz2
www-0d0e606eefa347a100cf276b1bc43b832cc48200.tar.xz
www-0d0e606eefa347a100cf276b1bc43b832cc48200.zip
5 files changed, 359 insertions, 149 deletions
diff --git a/en/index.php b/en/index.php
index f83bc4769..7eedbf402 100644
--- a/en/index.php
+++ b/en/index.php
@@ -6,116 +6,262 @@ include 'index_locales.php';
 
 $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules);
 
-?>
-<!DOCTYPE html>
+$nav = array(
+    'nav-for-pc'     => array('for-pc/',     _t('For PC')),
+    'nav-for-server' => array('for-server/', _t('For server')),
+    'nav-support'    => array('support/',    _t('Support')),
+    'nav-community'  => array('community/',  _t('Community')),
+    'nav-about'      => array('about/',      _t('About&nbsp;Mageia.Org'))
+);
+
+?><!DOCTYPE html>
 <html dir="ltr" lang="<?php echo $locale; ?>">
 <head>
     <meta charset="utf-8">
-    <title><?php echo $_t['page_title']; ?></title>
-    <meta name="description" content="<?php echo $_t['page_desc']; ?>">
-    <meta name="keywords" content="<?php echo $_t['page_kw']; ?>">
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><?php _e('page_title'); ?></title>
+    <meta name="description" content="<?php _e('page_desc'); ?>">
+    <meta name="keywords" content="<?php _e('page_kw'); ?>">
     <link type="text/plain" rel="author" href="/humans.txt">
-    <link rel="alternate" type="application/rss+xml" title="<?php echo $_t['alternate_title']; ?>" href="<?php echo $_t['alternate_href']; ?>">
+    <?php
+    foreach ($langs as $l => $name)
+        if ($l != $locale)
+            echo sprintf('<link rel="alternate" hreflang="%s" href="http://www.mageia.org/%s/">', $l, $l);
+    ?>
+    <link rel="alternate" type="application/rss+xml" title="<?php _e('alternate_title'); ?>" href="<?php _e('alternate_href'); ?>">
     <?php include '../analytics.php'; ?>
-</head>
-<body class="release">
-    <?php echo $hsnav; ?>
-    <div id="doc" class="yui-t7">
-	    <div id="hd" role="banner"><h1><a id="logo" href="/<?php echo $locale ?>/"><span>Mageia</span></a>
-            <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
-        <style>
-        div#mgacount {
-            font-family: "Century Gothic", "Trebuchet MS", Arial, sans-serif;
+    <style>
+    html, body {
+        margin: 0;
+        padding: 0;
+        font-family: "Trebuchet MS","Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;
+        line-height: 1.4;
+    }
+    hr { display: none; }
+    ol, ul { margin: 0; padding: 0; list-style: none; }
+    h1, h2 { font-size: 40px; font-weight: normal; margin-top: 0; }
+
+    #master {
+        padding: 2em;
+        border: 1px solid red;
+        margin: 2em;
+        font-size: 90%;
+        display: none;
+    }
+
+    #up, #down { margin: 0; padding: 0; }
+
+    #up {
+        padding-bottom: 40px;
+        color: #fff;
+        text-shadow: 0 0 1px #333;
+        background: #3494D3;
+
+        background: -webkit-radial-gradient(20% 350px, circle cover, #3494D3 0%, #2383C2 50%);
+        background: -moz-radial-gradient(26% 370px, circle cover, #3494D3 0%, #2383C2 50%);
+        background: -o-radial-gradient(20% 350px, circle cover, #3494D3 0%, #2383C2 50%);
+        background: radial-gradient(20% 350px, circle cover, #3494D3 0%, #2383C2 50%);
+    }
+
+    .container {
+        margin: 0 auto;
+        max-width: 980px;
+    }
+    
+    ul#dl li { margin-bottom: 20px; }
+    #dl-btn {
+        display: block;
+        color: #000;
+        text-decoration: none;
+        width: 280px;
+        background: rgba(255,255,255,0.9);
+
+        padding: 20px 20px 15px 20px;
+        border-radius: 4px;
+        text-shadow: none;
+        box-shadow: 0 0 1px #333;
+        /*
+        background: #ff6020;
+        background: -webkit-linear-gradient(top, #ff6600 0%, orange 100%);
+        background: -moz-linear-gradient(top, #ff3000 0%, orange 100%);
+        background: -o-linear-gradient(top, #ff3000 0%, orange 100%);
+        background: linear-gradient(top, #ff3000 0%, orange 100%);
+        /**/
+    }
+    #dl-btn-mageia {
+        background: url(/g/images/logo_ln_1.png);
+        width: 186px;
+        height: 61px;
+        display: block;
+        color: transparent;
+        margin-bottom: 10px;
+    }
+    span.dl-btn {
+        display: block;
+        font-size: 90%;
+    }
+    span.dl-btn span.low {
+        color: #777;
+        font-size: 75%;
+    }
+    p.dl-info {
+        padding: 0 20px;
+        font-size: 75%;
+    }
+    p.dl-info a {
+        color: #fff;
+        text-shadow: none;
+        text-decoration: none;
+    }
+    
+    #dl-btn-other {
+        display: block;
+        width: 222px;padding: 10px 20px 10px 20px;
+        background: rgba(255,255,255, 0.1);
+        border-radius: 4px;
+        color: #ddeeff;
+        text-shadow: none;
+        text-decoration: none;
+        font-size: 75%;
+    }
+    #dl-btn-other:hover {
+        background: rgba(255,255,255, 0.2);
+        color: #fff;
+    }
+    #dl-btn:hover { background: #fff; }
+    #dl-btn:active { border-radius: 0; }
+
+    #fnotes {
+        text-align: center;
+        font: 60%/1.2 Verdana,Arial,sans-serif;
+        color: #f0f0f0;
+    }
+    #fnotes a { color: #ccc; text-decoration: none; }
+    .free-dl { color: green; font-weight: bold; }
+    
+    /* Landscape phones and down */
+    @media (max-width: 480px) {}
+
+    /* Landscape phone to portrait tablet */
+    @media (max-width: 768px) {}
+
+    /* Portrait tablet to landscape and desktop */
+    @media (max-width: 1000px) {
+        h2 { margin: 0 0 .3em; line-height: 1.2; font-size: 200%; }
+
+        ul#p { font-size: 90%; list-style: circle; padding: 0 0 0 2em; margin: 0; }
+        #up { padding-bottom: 0; }
+        #up > .container { padding: 1em; }
+        #b1 { margin: 0; padding: 0 0 1em 0; }
+
+        #nav li { margin: 1em 0 0 1em; float: left; }
+        #nav li a {
+            display: block;
+            width: 222px;
+            padding: 10px 20px 10px 20px;
+            background: rgba(50,160,200, 0.1);
+            border-radius: 4px;
+            color: #68a;
+            text-shadow: none;
+            text-decoration: none;
+            font-size: 75%;
+        }
+        #dl-btn { width: 222px; }
+        #dl-btn-other:hover {
+            background: rgba(255,255,255, 0.2);
             color: #fff;
-            background: #3494D3;
-            background: -webkit-gradient(linear, left top, left bottom, from(#3494D3), color-stop(60%, #3494D3), to(#2383C2));
-            background: -moz-linear-gradient(top, #3494D3 60%, #2383C2);
-            background: -webkit-linear-gradient(top, #3494D3 60%, #2383C2);
-            background: linear-gradient(top, #3494D3 60%, #2383C2);
-            margin: 0; padding: 0;
+        }
+        #fnotes { clear: both; padding: 2em; text-align: left; }
+    }
+
+    @media (min-width: 1000px) {
+        h2 { margin-bottom: 0.3em; }
+        ul#p li:before { content: " > "; }
+        #up > .container { background: url(/g/images/cauldron_alpha_ln_1.png) no-repeat 100% 50px; }
+        #b1 { padding: 70px 0 70px; }
+
+        #nav {
+            padding: 0;
+            margin: 0 auto;
+            display: table;
+            border-radius: 4px;
+            font-size: 80%;
+            margin-bottom: 20px;
+        }
+        #nav li {
+            display: table-cell;
+            padding: 0;
+            border-right: 1px solid #f0f0f0;
+        }
+        #nav li:last-child { border: none; }
+        #nav a {
+            text-decoration: none;
+            padding: 20px 1em 20px 1em;
+            display: block;
+            min-width: 80px;
             text-align: center;
+            color: #444;
+        }
+        #nav a:hover {
+            color: #2383C2;
         }
-        #mgacount h2 { padding: 0.6em; font-size: 220%; color: #fff; font-weight: normal; margin-bottom: 0; }
-        #mgacount h2 span { font-size: 45%; vertical-align: 30%; margin: 0 1em; }
-        #mgacount h2 a,
-        #mgacount h2 a:visited { color: #fff; }
-        #mgacount.inv { background: #fff; border-bottom: 1px solid #2383C2; }
-        #mgacount.inv h2 a { color: #2383C2; }
-        </style>
-        <div id="mgacount"><h2><a href="./1/"><?php echo $_t['mageia-is-here']; ?></a></h2></div>
-        <div id="mgacount" class="inv"><h2><a href="./2/"><?php echo $_t['dl-next-mageia']; ?></a></h2></div>
-        <a href="./2/" title="Mageia 2"></a>
-        <div id="bd" role="main">
-            <div class="yui-g bb1">
-                <div class="para" id="news">
-                <?php
-                    include '../lib/news.php';
-                    echo sprintf('<h2><a href="%s">%s</a></h2>', blog_link($locale), $_t['news']);
-                    echo html_news($locale);
-                ?>
-                </div>
-            </div>
-            <div class="yui-g">
-                <div class="para bb1"><p><?php echo $_t['about'][0]; ?></p>
-                    <p><?php echo $_t['about'][1]; ?></p>
-                </div>
-            </div>
-            <div class="yui-gb">
-                <div class="yui-u first"><div class="para">
-                    <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script></p>
-                    <a href="http://twitter.com/mageia_org" class="twitter-follow-button" data-lang="<?php echo $locale; ?>">Follow @mageia_org</a>
-                </div></div>
-                <div class="yui-u"><div class="para">
-                    <div id="fb-root"></div><script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script><fb:facepile href="facebook.com/Mageia" width="200" max_rows="1"></fb:facepile>
-                </div></div>
-                <div class="yui-u"><div class="para">
-                    <g:plusone href="http://mageia.org/"></g:plusone>
-                </div></div>
-            </div>
-            <?php /*
-            <div class="yui-g bb1">
-                <div class="yui-u first rb1">
-                </div>
-                <div class="yui-u">
-                    <div class="para">
-                        <h2><?php echo $_t['right-now']; ?></h2>
-                        <?php include '../roadmap.php'; ?>
-                    </div>
-                </div>
-            </div>
-            
-            <div class="yui-g bb1">
-                <div class="yui-u first">
-                    <div class="para" id="contact">
-                        <h2><a href="./contribute/"><?php echo $_t['join-us']; ?></a></h2>
-                        <ul>
-                            <li><a href="https://www.mageia.org/mailman/">Mailing-lists</a></li>
-                            <li><a href="https://wiki.mageia.org/en/IRC">IRC (Freenode network)</a></li>
-                            <li><a href="https://wiki.mageia.org/en/">Mageia Wiki</a></li>
-                            <li>Contact the founders team:
-                                <ul>
-                                    <li><a href="mailto:mageia-contact@mageia.org">mageia-contact@mageia.org</a></li>
-                                    <li><a href="mailto:press@mageia.org">press@mageia.org</a></li>
-                                    <li>expect an answer within 2 days</li>
-                                </ul></li>
-                        </ul>
-                        <p>
-                            <a href="<?php echo $_t['alternate_href']; ?>"><img src="/g/images/smi/feed-32x32.png" alt="<?php echo $_t['alternate_title']; ?>"></a>
-                            <a href="http://www.twitter.com/mageia_org"><img src="/g/images/smi/twitter-32x32.png" alt="@mageia_org"></a>
-                            <a href="http://identi.ca/mageia"><img src="/g/images/smi/identica-32x32.png" alt="@mageia"></a>
-                            <a href="http://www.facebook.com/Mageia"><img src="/g/images/smi/facebook-32x32.png" alt="Mageia"></a>
-                            <a href="http://www.flickr.com/photos/mageia_org"><img src="/g/images/smi/flickr-32x32.png"></a>
-                        </p>
-                    </div>
-                </div>
-            </div>
-            */ ?>
+    }
+    @media (min-width: 1200px) {}
+    </style>
+    <link rel="stylesheet" href="/g/fa/css/font-awesome.css">
+</head>
+<body>
+    
+<div id="master">
+    <h1><a href="about/"><?php _e('page_h1'); ?></a></h1>
+</div>
+
+<div id="up">
+    <div class="container">
+        <div id="b1">
+            <h2><?php _e('change'); ?></h2>
+            <ul id="p"><?php foreach ($_t['change-items'] as $ci)
+                echo sprintf('<li>%s</li>', $ci);
+                ?></ul>
+            </ul>
+        </div>
+        <div id="b2">
+            <ul id="dl">
+                <li><a href="downloads/" id="dl-btn">
+                        <span id="dl-btn-mageia">Mageia 2</span>
+                        <span style="font-size: 32px; color: green; float: right;" class="icon-download-alt"></span>
+                        <span class="dl-btn free-dl"><?php _e('dl-free-act'); ?></span>
+                        <span class="dl-btn"><?php _e('dl-version'); ?></span>
+                    </a>
+                    <p class="dl-info">
+                        <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes"><?php _e('dl-rel-notes'); ?></a>,
+                        <a href="https://wiki.mageia.org/en/Mageia_2_Errata">errata</a>.
+                    </p>
+                </li>
+                <li><a href="1/" id="dl-btn-other">
+                    <span><?php _e('dl-mga-1'); ?></span>
+                    </a>
+                </li>
+                <li><a href="contribute/" id="dl-btn-other"><?php _e('dl-contribute'); ?></a>
+                </li>
+            </ul>
         </div>
     </div>
-    <script type="text/javascript" src="https://apis.google.com/js/plusone.js">
-      {lang: '<?php echo $locale; ?>'}
-    </script>
+</div>
+<hr>
+<div id="down">
+    <div class="container">
+        <ul id="nav"><?php foreach ($nav as $k => $v)
+            echo sprintf('<li><a class="%s" href="%s">%s</a></li>',
+                $k, $v[0], $v[1]);
+        ?></ul>
+        <hr>
+        <p id="fnotes">
+            <a href="/map/"><?php _e('Sitemap')?></a>
+            | <a href="/en/about/policies/privacy/"><?php _e('Privacy policy')?></a>
+        </p>
+    </div>
+</div>
 
 </body>
-</html>
+</html>
+\ No newline at end of file
diff --git a/en/index_locales.php b/en/index_locales.php
index 12d3c11c2..a774680b1 100644
--- a/en/index_locales.php
+++ b/en/index_locales.php
@@ -1,52 +1,77 @@
 <?php
 
-
 $_t = array(
     'en' => array(
-        'page_title' => 'A New Linux Distribution: Mageia',
-        'page_desc'  => 'Mageia is new community-based Linux distribution.',
-        'page_kw'    => 'linux, mageia, mandriva, mandrake, free software, operating system, computer, laptop, desktop, server, device, mobile',
-        'page_h1'    => 'A New Linux Distribution',
+        'page_title' => 'Home of the Mageia project',
+        'page_desc'  => 'Mageia is a community-based Linux distribution, for desktop & server.',
+        'page_kw'    => 'linux, mageia, free software, operating system, computer, laptop, desktop, server, headless, device, mobile, mandriva, mandrake',
+        'page_h1'    => 'Mageia, a free, community-based Linux distribution for desktop & server.',
         'alternate_title' => 'Mageia Blog (English)',
         'alternate_href'  => 'http://blog.mageia.org/en/?feed=rss',
         'about' => array(
-            'Mageia is a fork of Mandriva Linux,
-                supported by a not-for-profit organisation of
-                recognized and elected contributors.',
-            'Further than just delivering a free, secure, stable and sustainable operating system,
-                the goal is to set up a stable and trustable governance to direct collaborative projects
-                (<a href="/en/about/2010-sept-announcement.html">check original announcement</a>).'
+            '<img src="/g/images/logo_ln_1.png" alt="Mageia"> is a Free Software, Linux-based operating system.',
+            'is a volunteer-based project, gathering individuals and organizations.',
+            'has governance bodies elected by contributors.',
+            'is supported by a nonprofit organisation owned and elected by contributors.',
+            '<a href="/en/about/2010-sept-announcement.html">forked from Mandriva Linux in 2010</a>.'
         ),
         'mageia-is-here' => 'Mageia 1 is here',
-        'mageia-is-coming' => 'Mageia 2 is coming',
-        'dl-next-mageia' => 'Try Mageia 2 Release Candidate',
+        'mageia-2-coming' => 'Mageia 2 is coming soon',
         'join-us' => 'Join Us!',
         'right-now' => 'Happening right now',
         'news' => 'News',
+        
+        'change' => 'Change your perspective',
+        'change-items' => array(
+            'Stable, secure operating system for desktop &amp; server',
+            'Free Software, coproduced by hundreds of people',
+            'Elected governance, nonprofit organization',
+            'You can be part of it',
+        ),
+        'dl-free-act'   => 'Free Download',
+        'dl-version'    => 'version 2 (May \'12)',
+        'dl-rel-notes'  => 'Release notes',
+        'dl-mga-1'      => 'Download older Mageia 1 (June \'11)',
+        'dl-contribute' => '<strong>Get involved</strong> in the next version',
     ),
     'fr' => array(
         'page_title' => 'Une nouvelle distribution Linux communautaire : Mageia',
         'page_desc'  => 'Mageia est une nouvelle distribution Linux communautaire.',
         'page_kw'    => 'linux, mageia, mandriva, logiciel libre, système d\'exploitation, ordinateur, portable, serveur',
-        'page_h1'    => 'Une Distribution Linux',
+        'page_h1'    => 'Mageia, une distribution Linux communautaire, pour poste personnel et serveur.',
         'alternate_title' => 'Le blog de Mageia (français)',
         'alternate_href'  => 'http://blog.mageia.org/fr/?feed=rss',
         'about' => array(
-            'Mageia est un fork de Mandriva Linux,
-                reposant sur une association de type 1901 composée de
-                contributeurs reconnus et élus pour leur travail.',
-            'Au delà d&rsquo;un système d&rsquo;exploitation libre,
-                sécurisé, stable et pérenne, l&rsquo;objectif est d&rsquo;établir
-                une gouvernance stable et légitime autour d&rsquo;un modèle
-                collaboratif (<a href="/fr/about/2010-sept-announcement.html">voir l&rsquo;annonce originale</a>).'
+            '<img src="/g/images/logo_ln_1.png" alt="Mageia"> est un système d&rsquo;exploitation libre, basé sur Linux.',
+            'est un projet encadré par une association dirigée par des contributeurs élus.',
+            '<a href="/fr/about/2010-sept-announcement.html">a pris son essor et dérivé de Mandriva Linux en 2010</a>.',
         ),
         'mageia-is-here' => 'Mageia 1 est arrivée',
-        'mageia-is-coming' => 'Mageia 2 arrive',
-        'dl-next-mageia' => 'Essayez Mageia 2 Release Candidate',
         'join-us' => 'Rejoignez-nous&nbsp;!',
         'right-now' => 'En ce moment',
-        'news' => 'Actualités'
-
+        'news' => 'Actualités',
+        
+        'change' => '<span class="br-small">Changez</span> de point de vue',
+        'change-items' => array(
+            'Système d&rsquo;exploitation libre pour PC et serveur',
+            'Stable, sécurisé et flexible',
+            'Gouvernance élue, association à but non lucratif',
+            'Vous pouvez le coproduire'
+        ),
+        'dl-free-act'   => 'Téléchargement gratuit',
+        'dl-version'    => 'version 2 <span class="low">(mai 2012)</span>',
+        'dl-rel-notes'  => 'Notes de publication',
+        'dl-mga-1'      => 'Télécharger Mageia 1 <span class="low">(juin \'11)</span>',
+        'dl-contribute' => '<strong>Participer</strong> à la prochaine version',
+        'For you' => 'Pour vous',
+        'For PC' => 'Pour ordinateur personnel',
+        'For server' => 'Pour serveur',
+        'News' => 'Actualités',
+        'Community' => 'Communauté',
+        'About Mageia.Org' => 'À propos',
+        'Privacy policy' => 'Respect de la vie privée',
+        'Legal' => 'Mentions légales',
+        'Support' => 'Assistance'
     ),
     'de' => array(
         'page_title' => 'Mageia - Eine neue Linux Distribution',
diff --git a/langs.inc.php b/langs.inc.php
index ad1f34862..f81e000ba 100644
--- a/langs.inc.php
+++ b/langs.inc.php
@@ -155,7 +155,8 @@ function _t($s = null, $opt = null) {
     else {
         global $_t;
     }
-    return ($s == '' ? '-EMPTY-STRING-' : (array_key_exists($s, $_t) ? $_t[$s] : $s));
+
+    return ($s == '' ? '---' : (array_key_exists($s, $_t) ? $_t[$s] : $s));
 }
 
 function _e($s = null) {
diff --git a/langs.php b/langs.php
index 18060ebfc..4a96b3002 100644
--- a/langs.php
+++ b/langs.php
@@ -250,16 +250,11 @@ $langsForm = <<<H
 H;
 $hsnav .= $langsForm;
 
-if (isset($_GET['testnav'])) {
-    $_SESSION['testnav'] = $_GET['testnav'];
-}
-//$_SESSION['testnav'] = 1;
-
-if ($_SESSION['testnav'] > 0) {
-    include ('_nav/lib.php');
-    $hsnav = _mgnav_style() . _mgnav_html(true, $locale, $langsForm);
-    $hsfoot = '';
-}
+// use new nav now.
+// TODO(rda) cleanup above code about old nav structure.
+include ('_nav/lib.php');
+$hsnav = _mgnav_style() . _mgnav_html(true, $locale, $langsForm, '//mageia:8888');
+$hsfoot = '';
 
 if (!defined('HLANG'))
     echo $hsnav;
diff --git a/lib/news.php b/lib/news.php
index f2d9b2cb3..3a9f7bd86 100644
--- a/lib/news.php
+++ b/lib/news.php
@@ -8,11 +8,11 @@
  *
  * @return array
 */
-function html_news($locale = 'en')
+function html_news($locale = 'en', $count = 5)
 {
-    $news = get_news($locale);
+    $news = get_news($locale, $count);
     $html =  '<ul class="news">';
-    $item_tmpl = '<li><span class="dt">%s</span> <a href="%s">%s</a> </li>';
+    $item_tmpl = '<li><a href="%2$s">%3$s</a> <span class="dt">%1$s</span></li>';
     foreach ($news as $item)
     {
         $html .= sprintf($item_tmpl,
@@ -63,26 +63,36 @@ function news_date($dt, $locale = 'en')
 */
 function get_news($locale = 'en', $count = 5, $cache_timeout = 5)
 {
-    $source_url = blog_link($locale);
+    return get_feed(blog_link($locale), $count, cache_timeout);
 
+}
+
+/**
+*/
+function get_feed($url, $count = 5, $cache_timeout = 5)
+{
     include_once G_APP_ROOT . '/lib/simplepie/simplepie.inc';
-    $feed = new SimplePie($source_url,
+
+    $feed = new SimplePie($url,
         realpath(G_APP_ROOT . '/var/tmp/cache'),
         3600 * $cache_timeout);
 
+    $feed->set_timeout(2);
     $feed->enable_order_by_date(true);
-
     $feed->handle_content_type();
-
     $items = array();
+
     foreach ($feed->get_items(0, $count) as $item)
+    {
         $items[] = array(
-            'link'  => $item->get_permalink(),
-            'title' => $item->get_title(),
-            'date'  => $item->get_date('c'),
-            'desc'  => $item->get_description(),
+            'source' => $item->get_feed()->get_link(),
+            'link'   => $item->get_permalink(),
+            'title'  => $item->get_title(),
+            'date'   => $item->get_date('c'),
+            'desc'   => $item->get_description(),
             'author' => $item->get_author()
         );
+    }
 
     unset($feed);
 
@@ -91,6 +101,31 @@ function get_news($locale = 'en', $count = 5, $cache_timeout = 5)
 
 /**
 */
+function show_feed($title, $link, $feed, $count = 5, $skip = null) {
+
+    if (!is_null($skip))
+        $count += 5;
+
+    $data = get_feed($feed, $count);
+
+    $s = '';
+    if (!is_null($title))
+        $s .= sprintf('<h3><a href="%s">%s</a></h3>', $link, $title);
+
+    $s .= '<ul id="newslist">';
+    foreach ($data as $d) {
+        if (!is_null($skip) && strpos($d['link'], $skip) !== false)
+            continue;
+
+        $s .= sprintf('<li><a href="%s">%s</a> <span class="dt">%s</span></li>',
+            $d['link'], $d['title'], news_date($d['date'], 'fr'));
+    }
+    $s .= '</ul>';
+    echo $s;
+}
+
+/**
+*/
 function blog_link($locale)
 {
     $news = array(
@@ -112,6 +147,14 @@ function blog_link($locale)
         $locale = 'en';
 
     $source_url = $news[$locale];
-    
+
     return $source_url;
 }
+
+function planet_link($locale)
+{
+    $planets = array('en', 'fr', 'de', 'es', 'it', 'pt');
+    $locale = in_array($locale, $planets) ? $locale : 'en';
+
+    return sprintf('http://planet.mageia.org/%s/', $locale);
+}
+\ No newline at end of file
author	Romain d'Alverny <rda@mageia.org>	2012-05-22 19:47:02 +0000
committer	Romain d'Alverny <rda@mageia.org>	2012-05-22 19:47:02 +0000
commit	0d0e606eefa347a100cf276b1bc43b832cc48200 (patch)
tree	d12bb44604451a18fb3ca34d1df7bc3490cb6c19
parent	c70474335e7e9bc2f3a6af2a40f6b367b19caf6e (diff)
download	www-0d0e606eefa347a100cf276b1bc43b832cc48200.tar www-0d0e606eefa347a100cf276b1bc43b832cc48200.tar.gz www-0d0e606eefa347a100cf276b1bc43b832cc48200.tar.bz2 www-0d0e606eefa347a100cf276b1bc43b832cc48200.tar.xz www-0d0e606eefa347a100cf276b1bc43b832cc48200.zip