upload mageia 3 website

author: Manuel Hiebel <leuhmanu@mageia.org> 2013-05-19 05:34:51 +0000
committer: Manuel Hiebel <leuhmanu@mageia.org> 2013-05-19 05:34:51 +0000
commit: 246790554e755035087b63e37bbefe5a47831ac3 (patch)
tree: 4ba726ab0ad6094b5948a280974e5f05c1e07f80 /en
parent: edeb364d468a69c18890f278b5a9531a1bfa8769 (diff)
download: www-246790554e755035087b63e37bbefe5a47831ac3.tar
www-246790554e755035087b63e37bbefe5a47831ac3.tar.gz
www-246790554e755035087b63e37bbefe5a47831ac3.tar.bz2
www-246790554e755035087b63e37bbefe5a47831ac3.tar.xz
www-246790554e755035087b63e37bbefe5a47831ac3.zip
5 files changed, 42 insertions, 32 deletions
diff --git a/en/3/index.php b/en/3/index.php
index 53943d09e..7596d4e78 100644
--- a/en/3/index.php
+++ b/en/3/index.php
@@ -11,32 +11,40 @@ _lang_load($locale, '3');
     <meta charset="utf-8">
     <title><?php _e('Mageia 3')?></title>
     <link rel="stylesheet" href="/g/style/all.css">
-    <meta name="description" content="<?php _e('Mageia 3')?>">
+    <meta name="description" content="<?php _e('Mageia 3 is the new, solid, stable Linux distribution from the Mageia project.')?>">
     <style>
-    .para { text-align: left; float: left; width: 600px; display: block; border-right: 1px solid #eef; border-bottom: 1px solid #eef; }
+    .para { text-align: left; float: left; width: 250px; display: block; border-right: 1px solid #eef; border-bottom: 1px solid #eef; }
     hr { margin-top: 2em; }
-    .unstable-release-warning {
-        padding: 1em 1em 1em 2.2em;
-        margin: 0;
-        background: #cc0000;
-        color: white;
-        text-align: left;
-    }
     </style>
     <?php include '../../analytics.php'; ?>
-    <base href="../downloads/get/">
 </head>
 <body class="downloads">
     <?php echo $hsnav; ?>
-    <article>
-        <header id="mgnavt">
-            <h1><?php _e('Mageia 3')?></h1>
-            <ul>
-		<li><a href="https://wiki.mageia.org/en/Mageia_3_Release_Notes"><?php _e('Release notes')?></a></li>
-                <li><a href="https://wiki.mageia.org/en/Mageia_3_Errata"><?php _e('Errata')?></a></li>
-            </ul>
-        </header>
-                <h2>Mageia 3 will come the 19th May at 5 hours UTC, thanks for you patience!</h2>
-    </article>
+    <h1 id="mgnavtitle"><a href="../3/">Mageia 3</a></h1>
+    <?php include '../3/nav.php'; ?>
+    <div class="para" style="width: 600px;">
+        <section>
+            <a href="../downloads" title="Mageia 3"><img src="/g/3/mageia-3-desktop-550.png" alt="Mageia 3" style="width: 550px; display: block; margin: 2em auto 3em auto; box-shadow: 0 0 5px #aaa;"></a>
+            <?php
+            _h('Mageia 3 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.',
+                array('../community'));
+
+            _h("What's new?", null, 'h2');
+            _h('Too much to include here! See the <a href="https://wiki.mageia.org/en/Mageia_3_Release_Notes">release notes</a> for an extensive exposé.');
+            _h('<a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;">Download it right away!</a>');
+
+            _h('Mageia in context', null, 'h2');
+            _h('Mageia is both a Community and a Linux Distribution, with Mageia 3 being our third release.');
+            _h('Since the release of <a href="../1/">Mageia 1</a>, our offering has been consistently in the <a href="%s">top 10 of Distrowatch\'s most popular distributions</a>.',
+                array('http://distrowatch.com/popularity'));
+
+            _h('Mageia 3 is supported by the <a href="../about/">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.');
+            _h('Mageia 3 has been made by more than 100 people from all around the world.');
+
+            _h('Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform we can make; for regular users, developers and businesses.');
+            _h('We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to join us.');
+            ?>
+        </section>
+    </div>
 </body>
 </html>
diff --git a/en/downloads/index.php b/en/downloads/index.php
index 73c73de70..038df9c10 100644
--- a/en/downloads/index.php
+++ b/en/downloads/index.php
@@ -1 +1 @@
-<?php include '../2/download_index.php';
+<?php include '../3/download_index.php';
diff --git a/en/for-pc/index.php b/en/for-pc/index.php
index 53355221f..7aa367d9c 100644
--- a/en/for-pc/index.php
+++ b/en/for-pc/index.php
@@ -25,7 +25,7 @@ _lang_load($locale, '3');
         <section>
             <?php
                 _h('Plenty', null, 'h2');
-                _h('There are 19&nbsp;881&nbsp;packages in our repositories. And that\'s just for the 64-bit branch.');
+                _h('There are more than 21&nbsp;700&nbsp;packages in our repositories. And that\'s just for the 64-bit branch.');
                 _h('The total number is double that &ndash; and then if you consider the backports, and the packages in the Cauldron still testing... you\'ll see that Mageia users are spoiled for choice.');
                 _h('Here\'s a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:');
                 _h('Environments', null, 'h2');
diff --git a/en/for-server/index.php b/en/for-server/index.php
index dfa2d4f11..dc1f5e4a9 100644
--- a/en/for-server/index.php
+++ b/en/for-server/index.php
@@ -36,7 +36,7 @@ _lang_load($locale, '3');
 
             _h('Databases', null, 'h3');
             _h('Databases included are PostgreSQL 8.4; MariaDB, which replaces MySQL 5.5.28; BDB.');
-            _h('And there are NoSQL servers too: CouchDB 1.2.1, Redis 2.6.5, Cassandra 1.4.0, MongoDB 2.2.2.');
+            _h('And there are NoSQL servers too: CouchDB 1.2.1, Redis 2.6.5, MongoDB 2.2.2.');
 
             _h('Servers', null, 'h3');
             _h('Web servers include Apache 2.4.4, Cherokee 1.2.101 and lighttpd 1.4.32.');
diff --git a/en/index.php b/en/index.php
index 4995ec970..0d3ec51d6 100644
--- a/en/index.php
+++ b/en/index.php
@@ -56,19 +56,22 @@ $nav = array(
     #up, #down { margin: 0; padding: 0; }
 
     #up {
-        padding-bottom: 40px;
+        padding-bottom: 0px;
         color: #fff;
         text-shadow: 0 0 1px #333;
-        background: #3494D3;
+	background: url(/g/3/background_tile.png)
+	/*
         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;
+        padding-bottom: 40px;
     }
 
     ul#dl li { margin-bottom: 14px; }
@@ -91,7 +94,7 @@ $nav = array(
         /**/
     }
     #dl-btn-mageia {
-        background: url(/g/images/logo_ln_1.png);
+        background: url(/g/3/logo_web.png) no-repeat;
         width: 186px;
         height: 61px;
         display: block;
@@ -178,7 +181,7 @@ $nav = array(
     @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; }
+        #up > .container { background: url(/g/3/background.png) no-repeat 100% 0px; }
         #b1 { padding: 70px 0 70px; }
 
         #navb {
@@ -231,19 +234,18 @@ $nav = array(
         <div id="b2">
             <ul id="dl">
                 <li><a href="downloads/" id="dl-btn">
-                        <span id="dl-btn-mageia">Mageia 2</span>
+                        <span id="dl-btn-mageia">Mageia 3</span>
                         <span style="font-size: 32px; color: green; float: right;" class="icon-download-alt"></span>
                         <span class="dl-btn free-dl"><?php _e('Free Download'); ?></span>
-                        <span class="dl-btn"><?php _e('version 2 (May 2012)'); ?></span>
+                        <span class="dl-btn"><?php _e('version 3 (May 2013)'); ?></span>
                     </a>
                     <p class="dl-info">
-                        <a hreflang="en" href="<?php _e('https://wiki.mageia.org/en/Mageia_2_Release_Notes'); ?>"><?php _e('Release notes'); ?></a>,
-                        <a hreflang="en" href="<?php _e('https://wiki.mageia.org/en/Mageia_2_Errata'); ?>"><?php _e('errata'); ?></a>.
+                        <a hreflang="en" href="<?php _e('https://wiki.mageia.org/en/Mageia_3_Release_Notes'); ?>"><?php _e('Release notes'); ?></a>,
+                        <a hreflang="en" href="<?php _e('https://wiki.mageia.org/en/Mageia_3_Errata'); ?>"><?php _e('errata'); ?></a>.
                     </p>
                 </li>
                 <li><a href="contribute/" class="dl-btn-other"><?php _e('<strong>Get involved</strong> in the next version'); ?></a>
                 </li>
-                <li><a href="3/" class="dl-btn-other"><?php _e('Test Mageia 3%s', array(' RC')); ?></a></li>
             </ul>
         </div>
     </div>
author	Manuel Hiebel <leuhmanu@mageia.org>	2013-05-19 05:34:51 +0000
committer	Manuel Hiebel <leuhmanu@mageia.org>	2013-05-19 05:34:51 +0000
commit	246790554e755035087b63e37bbefe5a47831ac3 (patch)
tree	4ba726ab0ad6094b5948a280974e5f05c1e07f80 /en
parent	edeb364d468a69c18890f278b5a9531a1bfa8769 (diff)
download	www-246790554e755035087b63e37bbefe5a47831ac3.tar www-246790554e755035087b63e37bbefe5a47831ac3.tar.gz www-246790554e755035087b63e37bbefe5a47831ac3.tar.bz2 www-246790554e755035087b63e37bbefe5a47831ac3.tar.xz www-246790554e755035087b63e37bbefe5a47831ac3.zip