From 8ac33fb1271ba2031fcdea28656ba74b4e57ebd6 Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Mon, 29 Nov 2010 15:00:59 +0000
Subject: new layout for English home

---
 en/index.php | 75 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 55 insertions(+), 20 deletions(-)

(limited to 'en')

diff --git a/en/index.php b/en/index.php
index 15b32f765..de5c5be0b 100644
--- a/en/index.php
+++ b/en/index.php
@@ -14,8 +14,62 @@
     <div id="doc" class="yui-t7">
         <div id="hd" role="banner"><h1>Mageia <span>&ndash; A New Linux Distribution</span></h1></div>
         <div id="bd" role="main">
+            <div class="yui-g bb1">
+                <div class="para"><p>Mageia is a fork of Mandriva Linux,
+                    supported by a not-for-profit organisation of
+                    recognized and elected contributors.</p>
+
+                    <p>Further than just delivering a free, secure, stable and sustainable operating system,
+                        the goal is to set a stable and trustable governance to direct collaborative projects
+                        (<a href="#announce">check original announcement</a>).</p>
+                </div>
+            </div>
+            <div class="yui-g bb1">
+                <div class="yui-u first rb1">
+                    <div class="para" id="news">
+                        <h2><a href="http://blog.mageia.org/fr/">News</a></h2>
+                    <?php include '../lib/news.php'; echo html_news('en'); ?>
+                    </div>
+                </div>
+                <div class="yui-u">
+                    <div class="para" lang="en">
+                        <h2>Happening 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>Join us!</h2>
+                        <ul>
+                            <li><a href="https://www.mageia.org/mailman/">Mailing-lists</a></li>
+                            <li><a href="http://mageia.org/wiki/doku.php?id=irc">IRC (Freenode network)</a></li>
+                            <li><a href="http://mageia.org/wiki/">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>
+                            <li><a href="http://www.twitter.com/mageia_org">twitter.com/mageia_org</a></li>
+                            <li><a href="http://identi.ca/mageia">identi.ca/mageia</a></li>
+                        </ul>
+                        <!-->
+                        <p>Please do not use this address for discussions that can happen on above mailing-lists
+                            or IRC channels.</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 class="yui-g">
-                <div class="para">
+                <div class="para" id="announce">
+                    <h2>Announcement</h2>
                     <p class="date">Paris, September 18<sup>th</sup> 2010</p>
                     <p>As you may have heard, the future of the Mandriva Linux distribution is unclear.</p>
                     <p>Most employees working on the distribution were laid off when Edge-IT was liquidated. We do not trust the plans of Mandriva SA anymore and we don't think the company (or any company) is a safe host for such a project.</p>
@@ -81,25 +135,6 @@
                 <p>Your help and support will be very much appreciated.</p>
             </div>
             </div>
-            <div class="yui-g">
-                <div class="yui-u first">
-                    <div class="para" id="contact">
-                    <h2>How to contact us.</h2>
-
-                     <h3><a href="https://www.mageia.org/mailman/">Mailing-lists</a></h3>
-
-                     <h3>IRC (Freenode network)</h3>
-                     <?php include '../channels.html'; ?>
-                    </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>
-                    <p>You should follow us <a href="http://www.twitter.com/mageia_org">on Twitter</a>
-                        or <a href="http://identi.ca/mageia">on identi.ca</a>.</p>
-                    </div>
-                </div>
-            </div>
         </div>
     </div>
 </body>
-- 
cgit v1.2.1