aboutsummaryrefslogtreecommitdiffstats
path: root/nb
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2010-11-30 09:32:26 +0000
committerRomain d'Alverny <rda@mageia.org>2010-11-30 09:32:26 +0000
commit46df032b4cd05e2fdedd2a10fd3e6e7e2ed99d89 (patch)
tree80e7b627b893c670484bd342c2af866eeff052b1 /nb
parentba779f861bb405b930987ac0acf1824b8c65ad61 (diff)
downloadwww-46df032b4cd05e2fdedd2a10fd3e6e7e2ed99d89.tar
www-46df032b4cd05e2fdedd2a10fd3e6e7e2ed99d89.tar.gz
www-46df032b4cd05e2fdedd2a10fd3e6e7e2ed99d89.tar.bz2
www-46df032b4cd05e2fdedd2a10fd3e6e7e2ed99d89.tar.xz
www-46df032b4cd05e2fdedd2a10fd3e6e7e2ed99d89.zip
new layout for all locales, modulo localization to improve on each
Diffstat (limited to 'nb')
-rw-r--r--nb/index.php75
1 files changed, 53 insertions, 22 deletions
diff --git a/nb/index.php b/nb/index.php
index ccd5aad99..847da8150 100644
--- a/nb/index.php
+++ b/nb/index.php
@@ -13,8 +13,60 @@
<?php include '../langs.php'; ?>
<div id="doc" class="yui-t7">
<div id="hd" role="banner"><h1>Mageia <span>&ndash; en ny Linux distribusjon</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 up 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/">Nyheter</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>Slik kontakter du oss</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">
<p class="date">Paris, 18. September 2010</p>
@@ -89,27 +141,6 @@ Spesiell vekt vil bli tillagt å integrere tredjeparts programmer (frie og propr
<p>Din hjelp og støtte vil bli høyt verdsatt.</p>
</div>
</div>
- <div class="yui-g">
- <div class="yui-u first">
- <div class="para" id="contact">
- <h2>Slik kontakter du oss.</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>