moving things around, merging user/dev/contrib pages into for-you

author: Romain d'Alverny <rda@mageia.org> 2011-05-31 16:50:18 +0000
committer: Romain d'Alverny <rda@mageia.org> 2011-05-31 16:50:18 +0000
commit: 87c4821cc1f7107cf34b23b182082c2e318c18d2 (patch)
tree: e0cc5af9b64d5add5cf26d1093b676699a8762e1 /en
parent: fdf1057609438fae2b1d86e12a2d71de63e62af2 (diff)
download: www-87c4821cc1f7107cf34b23b182082c2e318c18d2.tar
www-87c4821cc1f7107cf34b23b182082c2e318c18d2.tar.gz
www-87c4821cc1f7107cf34b23b182082c2e318c18d2.tar.bz2
www-87c4821cc1f7107cf34b23b182082c2e318c18d2.tar.xz
www-87c4821cc1f7107cf34b23b182082c2e318c18d2.zip
5 files changed, 97 insertions, 219 deletions
diff --git a/en/1/product/index.php b/en/1/for-you/index.php
index cf5fc9962..ae6d1d744 100644
--- a/en/1/product/index.php
+++ b/en/1/for-you/index.php
@@ -10,12 +10,12 @@ $_t = array(
 ?><!DOCTYPE html>
 <html lang="<?php echo $locale; ?>">
 <head>
-    <meta charset="utf-8" />
+    <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']; ?>" />
-    <meta name="author" content="Mageia" />
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css" >
+    <meta name="description" content="<?php echo $_t['page_desc']; ?>">
+    <meta name="keywords" content="<?php echo $_t['page_kw']; ?>">
+    <meta name="author" content="Mageia">
+    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
     <style>
         .product-list {
             padding: 0;
@@ -90,9 +90,51 @@ $_t = array(
                 <h2>Mageia is focusing on...</h2>
                     <ul class="product-list">
                         <li><h3><a href="./user/">...users</a></h3>
-                            <p>Get more information <a href="./user/">here</a>.</p></li>
+                            <p>Run Mageia inside or beside your existing Operation system, or use a LiveCD to try Mageia without changing your system.</p>
+                            <hr />
+                            <p>Easy installation - choose from a standard list of things to do, or choose individual packages. Have your fully-working system up and running really fast! Choose from a range of desktops - make your computing environment just the way you like it.</p>
+                            <hr />
+                            <p>Mageia is safe, stable and secure by default. Automatic updates and an on-by-default firewall keep it that way.</p>
+                            <hr />
+                            <p>Lots of Productive Desktop applications - Web browsing, email, Office suites, Graphics management and editing, audio and video players, CD and DVD burning, games and more - we've got your software needs covered.</p>
+                            <hr />
+                            <p>All the system administration tools at your fingertips - control your system yourself, or use our simple tools. New users can feel safe with the default settings.</p>
+                            <hr />
+                            <p>Support from the community - join our mailing lists and forums, or talk to people online using IRC.</p>
+                            </li>
+
                         <li><h3><a href="./developer/">...developers</a></h3>
-                            <p>Get more information <a href="./developer/">here</a>.</p></li>
+                            <p>We're following the UNIX tradition of letting people have fun with their computer by programming - Mageia 1 is fully loaded with various popular compilers and interpreters</p>
+                            <p>While our schedule didn't permit us to offer everything we planned, we tried very hard to cover most needs.</p>
+                            <hr />
+                            <p>
+                            Mageia provides the most used compilers, libraries and interpreters like
+                            <ul>
+                                <li>gcc 4.5.2</li>
+                                <li>glibc 2.12.1</li>
+                                <li>gtk+ 2.24.4</li>
+                                <li>qt 4.7.3</li>
+                                <li>perl 5.12.3</li>
+                                <li>python 2.7.1</li>
+                                <li>ruby 1.8.7</li>
+                                <li>php 5.3.6</li>
+                                <li>java openjdk 1.6.0.0</li>
+                                <li>java sun 1.6.0.25</li>
+                            </ul>
+                            </p>
+                            <hr />
+                            <p>Along with those basic development tools Mageia is providing several IDEs for making teh developer's life easier.
+                            <ul>
+                                <li>eclipse 3.6.2</li>
+                                <li>netbeans 6.9</li>
+                                <li>anjuta 2.32.1.1</li>
+                                <li>kdevelop 4.2.2</li>
+                                <li>padre 0.840.0</li>
+                            </ul>
+                            </p>
+                            <p>We're ready to welcome your feedback and contributions to improve this for next release - check the contact links, and contact us with questions and suggestions.</p>
+                            <hr />
+                            </li>
                         <li><h3><a href="./contributor/">...contributors</a></h3>
                             <p>Get more information <a href="./contributor/">here</a>.</p></li>
                     </ul>    
diff --git a/en/1/nav.php b/en/1/nav.php
index 6c315c2ca..42f2e1e6e 100644
--- a/en/1/nav.php
+++ b/en/1/nav.php
@@ -2,9 +2,7 @@
 
 $nav = array(
     "/{$locale}/1/" => '1',
-    "/{$locale}/1/use/" => 'Users',
-    "/{$locale}/1/build/" => 'Developers',
-    "/{$locale}/1/profit/" => 'Businesses', 
+    "/{$locale}/1/for-you/" => 'For You',
     "/{$locale}/downloads/" => 'Download',
     "/{$locale}/1/notes/" => 'Notes',
     "/{$locale}/1/next/" => 'And next?'
diff --git a/en/1/next/index.php b/en/1/next/index.php
new file mode 100644
index 000000000..7281696fd
--- /dev/null
+++ b/en/1/next/index.php
@@ -0,0 +1,47 @@
+<?php
+$_t = array(
+    'page_title' => 'And next?',
+    'page_desc' => '',
+    'page_kw' => 'mageia, mandriva, upgrade, migrate',
+    'page_h1' => 'And next?'
+);
+
+
+?>
+<!DOCTYPE html>
+<html 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']; ?>">
+    <meta name="author" content="Mageia">
+    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
+    <link rel="canonical" href="/<?php echo $locale; ?>/1/next/">
+    <?php include '../../../analytics.php'; ?>
+</head>
+<body class="release">
+    <?php include '../../../langs.php'; ?>
+    <div id="doc" class="yui-t7">
+        <div id="hd" role="banner">
+            <h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1>
+        </div>
+        <?php include '../nav.php'; ?>
+
+        <div id="bd" role="main">
+            <div class="yui-g">
+                <div class="para">
+                    ...
+                </div>
+            </div>
+            <div class="yui-g bb1">
+                <div class="yui-u first rb1">
+                </div>
+                <div class="yui-u">
+                </div>
+            </div>
+            <?php include '../nav.php'; ?>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/en/1/product/developer/index.php b/en/1/product/developer/index.php
deleted file mode 100644
index 23ad5645e..000000000
--- a/en/1/product/developer/index.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-$_t = array(
-    'page_title' => 'Mageia 1, distribution for developers',
-    'page_desc' => 'Mageia 1, developer',
-    'page_kw' => 'mageia, developer',
-    'page_h1' => 'Mageia 1, distribution for developers'
-);
-
-
-?><!DOCTYPE html>
-<html 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']; ?>" />
-    <meta name="author" content="Mageia" />
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css" >
-    <style>
-        .product-list {
-            padding: 0;
-            margin: 0;
-        }
-        .product-list > li {
-            list-style: none;
-            padding-left: 70px;
-            min-height: 60px;
-            background-image: url(/g/images/smi/vcard-48x48.png);
-            background-repeat: no-repeat;
-            background-position: 0 4px;
-            margin-bottom: 2em;
-        }
-        .product-list li h3 {
-            font-size: 140%;
-            margin: 0;
-            padding: 5px;
-            color: #000;
-            font-weight: bold;
-        }
-        .product-list li h3 a {
-            color: #000;
-        }
-
-        .product-list li#marketing { 
-            background-image: url(/g/images/smi/feed-48x48.png); 
-        }
-        .product-list li#web, .contrib-list li#mirror { 
-            background-image: url(/g/images/smi/website-48x48.png); 
-        }
-        .product-list li#triage { 
-            background-image: url(/g/images/smi/feed-48x48.png); 
-        }
-        .product-list li#triage { 
-            background-image: url(/g/images/smi/feed-48x48.png); 
-        }
-        .product-act li { 
-            margin-bottom: 0.6em; 
-        }
-        .product-act { 
-            margin-bottom: 2.5em; 
-        }
-    </style>
-    <?php include '../../../../analytics.php'; ?>
-</head>
-<body class="release">
-    <?php include '../../../../langs.php'; ?>
-    
-    <div id="doc" class="yui-t7">
-        <div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
-        <div id="bd" role="main">
-            <div class="yui-g">
-                <?php include '../../nav.php'; ?>
-                <div class="para">
-
-                <hr />
-                <p>We're following the UNIX tradition of letting people have fun with their computer by programming - Mageia 1 is fully loaded with various popular compilers and interpreters</p>
-                <p>While our schedule didn't permit us to offer everything we planned, we tried very hard to cover most needs.</p>
-                <hr />
-                <p>
-                Mageia provides the most used compilers, libraries and interpreters like
-                <ul>
-                    <li>gcc 4.5.2</li>
-                    <li>glibc 2.12.1</li>
-                    <li>gtk+ 2.24.4</li>
-                    <li>qt 4.7.3</li>
-                    <li>perl 5.12.3</li>
-                    <li>python 2.7.1</li>
-                    <li>ruby 1.8.7</li>
-                    <li>php 5.3.6</li>
-                    <li>java openjdk 1.6.0.0</li>
-                    <li>java sun 1.6.0.25</li>
-                </ul>
-                </p>
-                <hr />
-                <p>Along with those basic development tools Mageia is providing several IDEs for making teh developer's life easier.
-                <ul>
-                    <li>eclipse 3.6.2</li>
-                    <li>netbeans 6.9</li>
-                    <li>anjuta 2.32.1.1</li>
-                    <li>kdevelop 4.2.2</li>
-                    <li>padre 0.840.0</li>
-                </ul>
-                </p>
-                <p>We're ready to welcome your feedback and contributions to improve this for next release - check the contact links, and contact us with questions and suggestions.</p>
-                <hr />
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
diff --git a/en/1/product/user/index.php b/en/1/product/user/index.php
deleted file mode 100644
index 04385e891..000000000
--- a/en/1/product/user/index.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-$_t = array(
-    'page_title' => 'Mageia 1, distribution for the users',
-    'page_desc' => 'Mageia 1, user',
-    'page_kw' => 'mageia, user',
-    'page_h1' => 'Mageia 1, distribution for the users'
-);
-
-
-?><!DOCTYPE html>
-<html 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']; ?>" />
-    <meta name="author" content="Mageia" />
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css" >
-    <style>
-        .product-list {
-            padding: 0;
-            margin: 0;
-        }
-        .product-list > li {
-            list-style: none;
-            padding-left: 70px;
-            min-height: 60px;
-            background-image: url(/g/images/smi/vcard-48x48.png);
-            background-repeat: no-repeat;
-            background-position: 0 4px;
-            margin-bottom: 2em;
-        }
-        .product-list li h3 {
-            font-size: 140%;
-            margin: 0;
-            padding: 5px;
-            color: #000;
-            font-weight: bold;
-        }
-        .product-list li h3 a {
-            color: #000;
-        }
-
-        .product-list li#marketing { 
-            background-image: url(/g/images/smi/feed-48x48.png); 
-        }
-        .product-list li#web, .contrib-list li#mirror { 
-            background-image: url(/g/images/smi/website-48x48.png); 
-        }
-        .product-list li#triage { 
-            background-image: url(/g/images/smi/feed-48x48.png); 
-        }
-        .product-list li#triage { 
-            background-image: url(/g/images/smi/feed-48x48.png); 
-        }
-        .product-act li { 
-            margin-bottom: 0.6em; 
-        }
-        .product-act { 
-            margin-bottom: 2.5em; 
-        }
-    </style>
-    <?php include '../../../../analytics.php'; ?>
-</head>
-<body class="release">
-    <?php include '../../../../langs.php'; ?>
-    
-    <div id="doc" class="yui-t7">
-        <div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
-        <div id="bd" role="main">
-            <div class="yui-g">
-                <?php include '../../nav.php'; ?>
-                <div class="para">
-
-                <hr />
-                <p>Run Mageia inside or beside your existing Operation system, or use a LiveCD to try Mageia without changing your system.</p>
-                <hr />
-
-                <p>Easy installation - choose from a standard list of things to do, or choose individual packages. Have your fully-working system up and running really fast! Choose from a range of desktops - make your computing environment just the way you like it.</p>
-                <hr />
-
-                <p>Mageia is safe, stable and secure by default. Automatic updates and an on-by-default firewall keep it that way.</p>
-                <hr />
-
-                <p>Lots of Productive Desktop applications - Web browsing, email, Office suites, Graphics management and editing, audio and video players, CD and DVD burning, games and more - we've got your software needs covered.</p>
-                <hr />
-
-                <p>All the system administration tools at your fingertips - control your system yourself, or use our simple tools. New users can feel safe with the default settings.</p>
-                <hr />
-
-                <p>Support from the community - join our mailing lists and forums, or talk to people online using IRC.</p>
-                <hr />
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
author	Romain d'Alverny <rda@mageia.org>	2011-05-31 16:50:18 +0000
committer	Romain d'Alverny <rda@mageia.org>	2011-05-31 16:50:18 +0000
commit	87c4821cc1f7107cf34b23b182082c2e318c18d2 (patch)
tree	e0cc5af9b64d5add5cf26d1093b676699a8762e1 /en
parent	fdf1057609438fae2b1d86e12a2d71de63e62af2 (diff)
download	www-87c4821cc1f7107cf34b23b182082c2e318c18d2.tar www-87c4821cc1f7107cf34b23b182082c2e318c18d2.tar.gz www-87c4821cc1f7107cf34b23b182082c2e318c18d2.tar.bz2 www-87c4821cc1f7107cf34b23b182082c2e318c18d2.tar.xz www-87c4821cc1f7107cf34b23b182082c2e318c18d2.zip