From a495f0cbd603d33e8c8d69afdadf81d3aa92ebd2 Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Wed, 29 Jun 2011 16:17:11 +0000
Subject: republish news on home page, bottom

---
 en/index.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'en/index.php')

diff --git a/en/index.php b/en/index.php
index 851676247..52f112684 100644
--- a/en/index.php
+++ b/en/index.php
@@ -48,18 +48,22 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules);
                 <p><a href="http://twitter.com/mageia_org" class="twitter-follow-button" data-lang="<?php echo $locale; ?>">Follow @mageia_org</a>
                 <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script></p>
             </div></div>
-            <?php /*
-            <div class="yui-g bb1">
-                <div class="para"><p><?php echo $_t['about'][0]; ?></p>
+
+            <div class="yui-g">
+                <div class="para bb1" 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 class="para bb1"><p><?php echo $_t['about'][0]; ?></p>
                     <p><?php echo $_t['about'][1]; ?></p>
                 </div>
             </div>
+            <?php /*
             <div class="yui-g bb1">
                 <div class="yui-u first rb1">
-                    <div class="para" id="news">
-                        <h2><a href="http://blog.mageia.org/"><?php echo $_t['news']; ?></a></h2>
-                    <?php include '../lib/news.php'; echo html_news($locale); ?>
-                    </div>
                 </div>
                 <div class="yui-u">
                     <div class="para">
@@ -68,6 +72,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules);
                     </div>
                 </div>
             </div>
+            
             <div class="yui-g bb1">
                 <div class="yui-u first">
                     <div class="para" id="contact">
@@ -92,11 +97,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules);
                         </p>
                     </div>
                 </div>
-                <div class="yui-u">
-                    <div class="para">
-                    <iframe src="http://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2FMageia%2F157247240967735&amp;width=320&amp;connections=10&amp;stream=false&amp;header=false&amp;height=255" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:320px; height:255px;" allowTransparency="true"></iframe>
-                    </div>
-                </div>
             </div>
             */ ?>
         </div>
-- 
cgit v1.2.1