diff options
author | Manuel Hiebel <leuhmanu@mageia.org> | 2014-02-01 09:20:35 +0000 |
---|---|---|
committer | Manuel Hiebel <leuhmanu@mageia.org> | 2014-02-01 09:20:35 +0000 |
commit | 61ee6b47a395b21cc99f4a2791c1370c88336abe (patch) | |
tree | e30238950ec4c1aa339049e4c5edcb32539bebac /en/4 | |
parent | 9d64fa07bcd20d604482806f678d288ecaef4f1a (diff) | |
download | www-61ee6b47a395b21cc99f4a2791c1370c88336abe.tar www-61ee6b47a395b21cc99f4a2791c1370c88336abe.tar.gz www-61ee6b47a395b21cc99f4a2791c1370c88336abe.tar.bz2 www-61ee6b47a395b21cc99f4a2791c1370c88336abe.tar.xz www-61ee6b47a395b21cc99f4a2791c1370c88336abe.zip |
Mageia 4 final is here
Diffstat (limited to 'en/4')
-rwxr-xr-x | en/4/download_index.php | 122 | ||||
-rw-r--r-- | en/4/index.php | 103 | ||||
-rw-r--r-- | en/4/nav.php | 7 |
3 files changed, 164 insertions, 68 deletions
diff --git a/en/4/download_index.php b/en/4/download_index.php index 71c0fa52a..3bdab007a 100755 --- a/en/4/download_index.php +++ b/en/4/download_index.php @@ -1,24 +1,20 @@ <?php -$name = 'Mageia'; -$version = '4'; -$release = 'RC'; define('HLANG', true); require '../../langs.php'; -_lang_load($locale, $version); +_lang_load($locale, '4'); require '../downloads/get/lib.php'; -function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext) +function get_mageia_image_file_name($variant = null, $arch, $medium, $ext) { $va = empty($variant) ? $arch : $variant . '-' . $arch; - $re = empty($release) ? $va : $release . '-' . $va; - return implode('-', array($name, $version, $re, $medium)) . $ext; + return implode('-', array('Mageia','4', $va, $medium)) . $ext; } -function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = false) +function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = false) { switch ($arch) { case "i586": @@ -36,9 +32,9 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me } echo $torrent && $unavailabletorrent ? sprintf(_t('forthcoming')) : sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>', - get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, '.iso'), + get_mageia_image_file_name($variant, $arch, $medium, '.iso'), $torrent ? '&torrent=1' : '', - implode(' ', array($name, $version, $release, $variant, $arch, $medium)), + implode(' ', array('Mageia 4', $variant, $arch, $medium)), $bit ); } @@ -49,30 +45,18 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <html dir="ltr" lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> - <title><?php echo sprintf(_t('Download') . ' %s %s %s',$name, $version, $release)?></title> + <title><?php echo sprintf(_t('Download') . 'Mageia 4')?></title> <meta name="description" content="<?php _e('Download Mageia 4 DVD, CD, LiveCD, network install ISO images.') ?>"> <meta name="keywords" content="<?php _e('mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent')?>"> <meta name="robots" content="index,nofollow,nosnippet"> - <link rel="canonical" href="/<?php echo $locale.'/'.$verion;?>/"> + <link rel="canonical" href="/<?php echo $locale.'/4';?>/"> <link rel="stylesheet" href="/g/style/all.css"> <?php include '../../analytics.php'; ?> - <style> - .unstable-release-warning { - padding: 1em 1em 1em 2.2em; - margin: 0; - background: #cc0000; - color: white; - text-align: left; - } - </style> </head> <body class="release downloads"> <?php echo $hsnav; ?> - <h1 id="mgnavt"><?php echo sprintf(_t('Download') . '<strong>%s %s %s</strong>',$name, $version, $release)?></h1> - <?php include '../'.$version.'/nav.php'; ?> - <p class="unstable-release-warning"><?php //_e('Be careful! This is a beta, unstable release.'); - //_e('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');?> -<?php _e('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for February 2014.'); _e('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p> + <h1 id="mgnavt"><?php echo sprintf(_t('Download') . '<strong>Mageia 4</strong>')?></h1> + <?php include '../4/nav.php'; ?> <div id="doc4" class="yui-t7"> <div id="bd" role="main"> <div class="yui-ge bb1"> @@ -91,26 +75,26 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <tbody> <tr> <th class="name" style="width:60%">DVD 32bit<br>DVD 64bit<br> - <span class="dlinfo"><?php _e('Desktop'); ?>: GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...</th> - <td class="size">3.9GB</td> + <span class="dlinfo"><?php _e('Desktop'); ?>: GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...</span></th> + <td class="size">3.7GB</td> <td> - <?php dl_link($name,$version,$release,null,'i586','DVD',false); + <?php dl_link(null,'i586','DVD',false); echo '<br>'; - dl_link($name,$version,$release,null,'x86_64','DVD',false); + dl_link(null,'x86_64','DVD',false); echo '</td><td>'; - dl_link($name,$version,$release,null,'i586','DVD',true); + dl_link(null,'i586','DVD',true); echo '<br>'; - dl_link($name,$version,$release,null,'x86_64','DVD',true);?> + dl_link(null,'x86_64','DVD',true);?> </td> </tr> <tr> <th class="name">DVD dualarch<br> - <span class="dlinfo"><?php _e('Desktop'); ?>: XFCE</th> + <span class="dlinfo"><?php _e('Desktop'); ?>: XFCE</span></th> <td class="size">1GB</td> <td> - <?php dl_link($name,$version,$release,null,'dual','DVD',false);?> + <?php dl_link(null,'dual','DVD',false);?> </td><td> - <?php dl_link($name,$version,$release,null,'dual','DVD',true);?> + <?php dl_link(null,'dual','DVD',true);?> </td> </tr> </tbody> @@ -136,7 +120,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <h2><?php _e('LiveCDs and LiveDVDs');?></h2> <p class="dlinfo"><?php _e('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?> <span class="warn"><?php _e('DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!'); ?></span> - <?php /*_e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));*/?></p> + <?php _e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));?></p> <table class="fr-table dlt2"> <thead> <tr> @@ -152,13 +136,13 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <span class="dlinfo"><?php _e('All languages')?></span></th> <td class="size">1.4GB</td> <td> - <?php dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',false); + <?php dl_link('LiveDVD-KDE4','i586','DVD',false); echo '<br>'; - dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',false); + dl_link('LiveDVD-KDE4','x86_64','DVD',false); echo '</td><td>'; - dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',true); + dl_link('LiveDVD-KDE4','i586','DVD',true); echo '<br>'; - dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',true);?> + dl_link('LiveDVD-KDE4','x86_64','DVD',true);?> </td> </tr> <tr> @@ -166,22 +150,22 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <span class="dlinfo"><?php _e('All languages')?></span></th> <td class="size">1.4GB</td> <td> - <?php dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',false); + <?php dl_link('LiveDVD-GNOME','i586','DVD',false); echo '<br>'; - dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',false); + dl_link('LiveDVD-GNOME','x86_64','DVD',false); echo '</td><td>'; - dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',true); + dl_link('LiveDVD-GNOME','i586','DVD',true); echo '<br>'; - dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',true);?> + dl_link('LiveDVD-GNOME','x86_64','DVD',true);?> </td> <tr> <th class="name">LiveCD KDE<br> <span class="dlinfo"><?php _e('English only')?></span></th> <td class="size">700MB</td> <td> - <?php dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',false); + <?php dl_link('LiveCD-KDE4-en','i586','CD',false); echo '</td><td>'; - dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',true);?> + dl_link('LiveCD-KDE4-en','i586','CD',true);?> </td> </tr> <tr> @@ -189,9 +173,9 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <span class="dlinfo"><?php _e('English only')?></span></th> <td class="size">700MB</td> <td> - <?php dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',false); + <?php dl_link('LiveCD-GNOME-en','i586','CD',false); echo '</td><td>'; - dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',true);?> + dl_link('LiveCD-GNOME-en','i586','CD',true);?> </tr> </tbody> @@ -201,8 +185,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <div class="para"> <h2><?php _e('Wired Network-based Installation CD')?></h2> - <p class="dlinfo"><?php _e('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.')?> - <span class="warn"><?php _e('These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.'); ?></span></p> + <p class="dlinfo"><?php _e('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.')?></p> <table class="fr-table dlt2"> <thead> @@ -215,43 +198,56 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me <tbody> <tr> <th><?php _e('Network installer, Free Software CD')?></th> - <td class="size">~27MB</td> - <td><?php dl_link($name,$version,$release,'Boot','i586','CD',false); + <td class="size">27MB<br>53MB</td> + <td><?php dl_link('Boot','i586','CD',false); echo '<br>'; - dl_link($name,$version,$release,'Boot','x86_64','CD',false);?> + dl_link('Boot','x86_64','CD',false);?> </td> </tr> <tr> <th><?php _e('Network installer + nonfree firmware CD')?><br> <span class="dlinfo"><?php _e('needed for some disc controllers, some network cards, etc.')?></span></th> - <td class="size">~36MB</td> - <td><?php dl_link($name,$version,$release,'Boot-nonfree','i586','CD',false); + <td class="size">37MB<br>74MB</td> + <td><?php dl_link('Boot-nonfree','i586','CD',false); echo '<br>'; - dl_link($name,$version,$release,'Boot-nonfree','x86_64','CD',false);?> + dl_link('Boot-nonfree','x86_64','CD',false);?> </td> </tr> </tbody> </table> - - </div> </div> <div class="yui-u"> <div class="para" style="padding-left: 1em;"> + <h2>Mageia 4</h2> + <?php _h('February 1<sup>st</sup> 2014')?> <ul class="hl"> - <li><?php _e('<a href="%s%s_%s_%s">Release notes</a>', array('https://wiki.mageia.org/en/',$name,$version,$release))?></li> + <li><?php _e('<a href="%s%s_%s_%s">Release notes</a>', array('https://wiki.mageia.org/en/','Mageia',4,'Release_Notes'))?></li> <li><?php _e('<a href="%s">Errata</a>', array('https://wiki.mageia.org/en/Mageia_4_Errata'))?></li> <li><?php _e('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li> <li><?php _e('<a href="%s">Get ISO on USB flash stick</a>', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'))?></li> - <li><?php _e('Help us on <a href="%s">Mageia 4</a>', array('../contribute/'))?></li> + <li><?php _e('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array('https://wiki.mageia.org/en/Newcomers_start_here'))?></li> </ul> <br> <br> + <?php _h('Upgrading<br>from Mageia 3?', null, 'h3')?> + <ul class="hl"><?php + _h('<strong>do not</strong> use LiveCDs;', null, 'li'); + _h('see the <a href="%s" hreflang="en">upgrade guide</a>', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'), 'li'); + ?></ul> + <br> + <br> <?php - _h('Looking for a stable release?', null, 'h3'); + _h('Looking for Mageia 3?', null, 'h3'); echo '<p>'; - _e('It is <a href="%s">here</a>.', array('../downloads/')); - echo '</p>'; + _e('It is <a href="%s">here now</a>.', array('../3/')); + /*echo '<span class="warn">', _t('But please remember that it already <a href="%s">reached EOL</a>.',array('https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/')) . '</span>'; */?> + </p> + <br> + <br> + <?php + _h('Need more challenge?', null, 'h3'); + _h('You can <a href="%s">help</a> us <a href="%s">on Mageia 5</a>.', array('../contribute/','../contribute/')); ?> </div> <hr> diff --git a/en/4/index.php b/en/4/index.php index d2f8c161a..8b02cf7b3 100644 --- a/en/4/index.php +++ b/en/4/index.php @@ -1 +1,102 @@ -<?php include '../4/download_index.php'; +<?php + +define('HLANG', true); +require '../../langs.php'; + +_lang_load($locale, '4'); +?> +<!doctype html> +<html lang="<?php echo $locale; ?>"> +<head> + <meta charset="utf-8"> + <title><?php _e('Mageia 4')?></title> + <link rel="stylesheet" href="/g/style/all.css"> + <meta name="description" content="<?php _e('Mageia 4 is the new, solid, stable Linux distribution from the Mageia project.')?>"> + <?php include '../../analytics.php'; ?> + <style>.para{text-align: justify;text-align: -webkit-auto;}</style> + <link rel="stylesheet" href="/g/style/bjqs.css"> + <script src="/g/js/jquery-1.10.1.min.js"></script> + <script src="/g/js/bjqs-1.3.min.js"></script> + </head> + +<body class="downloads"> + <?php echo $hsnav; ?> + <h1 id="mgnavtitle"><a href="../4/">Mageia 4</a></h1> + <?php include '../4/nav.php'; ?> + <div id="doc5" class="yui-t3"> + <div id="bd" role="main"> + <div class="yui-ge bb1"> + <div class="yui-u first" style="width:55.5%"> + <div class="para"> + +<?php _h('About Mageia 4', null, 'h2'); + + _h('Mageia 4 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'));?> + + <p><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;"><?php _e('Download it right away!');?></a></p> + +<?php _h('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia 4 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or KDE.', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F')); + _h('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.'); + + _h('The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/')); + + _h('Mageia 4 includes several desktop managers including KDE, Gnome, XFCE, Mate, and Cinnamon.'); + + _h('There are lots of applications in the official repositories. You can have a look at the <a href="%s">Mageia Application Database</a> to get a complete list of packages inside Mageia.', array('http://mageia.madb.org')); + + _h('What\'s new?', null, 'h2'); + + _h('There\'s plenty of new goodness in Mageia 4, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array('https://wiki.mageia.org/en/Mageia_4_Release_Notes')); + + _h('To help users configure and use Mageia, and to provide some information about the community and the project, we\'ve added the new <a href="%s">MageiaWelcome</a>.It starts automatically when a session opens for the first time in any of the graphical environments.',array('https://wiki.mageia.org/en/Feature:MageiaWelcome')); + + _h('We\'ve added two new desktop environments: Mate and Cinnamon, both available from the classic installer DVD/ISO. To make it more friendly we re-factored the <a href="%s">custom desktop choice</a>.',array('//doc.mageia.org/installer/4/en/content/choosePackageGroups.html')); + + _h('There\'s been a lot of work done on Mageia software. Many packages were ported from Gtk2 to Gtk3, to use more modern components. We\'ve also ported all the tools from the deprecated usermode to polkit when privileges are needed.'); + + _h('TexLive used to need around 1GB of data for installation - now it\'s separated into 3 packages which will usually mean a much smaller footprint.'); + ?> + </div> + </div> + + <div class="yui-u" style="width:44.5%"> + <div id="banner" style="text-align:center; display: block; padding: 2em 0em 4em;"> + <!-- start Basic Jquery Slider --> + <ul class="bjqs"> + <li><img src="/g/4/kde.png" title="KDE"></li> + <li><img src="/g/4/razorqt.png" title="RazorQT"></li> + <li><img src="/g/4/xfce.png" title="XFCE"></li> + <li><img src="/g/4/gnome.png" title="Gnome"></li> + <li><img src="/g/4/cinnamon.png" title="Cinnamon"></li> + <li><img src="/g/4/mate.png" title="Mate"></li> + <li><img src="/g/4/mageiawelcome1.png" title="Mageia Welcome 1."></li> + <li><img src="/g/4/mageiawelcome2.png" title="Mageia Welcome 2."></li> + <li><img src="/g/4/mageiawelcome3.png" title="Mageia Welcome 3."></li> + <li><img src="/g/4/mageiawelcome4.png" title="Mageia Welcome 4."></li> + <li><img src="/g/4/mageiawelcome5.png" title="Mageia Welcome 5."></li> + <li><img src="/g/4/drakconf.png" title="<?php _e('Mageia Control Center');?>"></li> + </ul> + + </div> + <div class="para" style="padding: 1em 2em 1em 0em"> + + <?php + _h('Mageia in context', null, 'h2'); + + _h('Mageia is both a Community and a Linux Distribution, with Mageia 4 being our fourth release.'); + + _h('Mageia 4 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.',array('../about/')); + + _h('Mageia 4 has been made by more than <a href="%s">100 people from all around the world</a>.',array('//people.mageia.org/g/')); + + _h('Our work adds to the excellent work of the wider Linux and Free Software community. We aim to blend all the excellent work done by the community, adding the special Mageia ingredients, to bring you the best, most stable, reliable and enjoyable experience 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 <a href="%s">join us</a>.', array('../contribute')); + ?> + </div> + +</div> +</div> + + </body> +</html> diff --git a/en/4/nav.php b/en/4/nav.php index 42d0bef81..750ee134a 100644 --- a/en/4/nav.php +++ b/en/4/nav.php @@ -1,11 +1,10 @@ <?php $nav = array( - "https://wiki.mageia.org/en/Mageia_4_Development#Development_Planning" => _t('Development roadmap'), - "https://wiki.mageia.org/en/FeatureMageia4_Review" => _t('Features review'), - "https://wiki.mageia.org/en/Mageia_4_$release" => _t('Release notes'), + "/{$locale}/4/" => _t('Mageia 4'), + "/{$locale}/downloads/" => _t('Download'), + "https://wiki.mageia.org/en/Mageia_4_Release_Notes" => _t('Release notes'), _t('https://wiki.mageia.org/en/Mageia_4_Errata') => _t('Errata'), - "//bugs.mageia.org/" => _t('Bugs Reports'), ); $sru = trim($_SERVER['REQUEST_URI']); |