diff options
Diffstat (limited to 'en')
| -rwxr-xr-x | en/6/download_index.php | 33 | ||||
| -rwxr-xr-x[-rw-r--r--] | en/6/nav.php | 6 |
2 files changed, 20 insertions, 19 deletions
diff --git a/en/6/download_index.php b/en/6/download_index.php index 314e8c870..fa77e9cac 100755 --- a/en/6/download_index.php +++ b/en/6/download_index.php @@ -2,7 +2,7 @@ $name = 'Mageia'; $version = '6'; -$release = 'rc'; +$release = ''; $torrentavailable=true; $classical=true; $live=true; @@ -103,13 +103,14 @@ input[type="radio"], input[type="submit"] { <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1> <?php include '../6/nav.php'; ?> - <div class="bg-danger"> +<!-- <div class="bg-danger"> <p class="text-white p-3 container"><?php // _g('Be careful! This is an alpha, unstable release.'); // _g('Be careful! This is a beta, unstable release.'); // _g('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>'); - _g('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 %s.', array(_r('June 2017'))); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p> - </div> +// _g('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 %s.', array(_r('June 2017'))); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p> + </div>--> + <div id="doc4" class="yui-t7" style="margin-bottom: 0px;"> @@ -192,7 +193,7 @@ input[type="radio"], input[type="submit"] { _g('Size of the ISOs is about 50MB.',null,'p class="dlinfo"');?> </div> -<div> +<div class="d-sm-flex justify-content-center"> <?php if( $classical ){?><input type="radio" value="DVD" name="format" id="classical"/> <label for="classical" class="btn btn-outline-primary classical" ><?php _g('Classic Installation')?></label><?php }?> <?php if($live){ ?><input type="radio" id="live" value="LiveDVD" name="format" /> @@ -226,7 +227,7 @@ input[type="radio"], input[type="submit"] { <?php //get_image('PLASMA', '/g/5/kde.png', 'width: 100%');?> </div> - <div> + <div class="d-sm-flex justify-content-center"> <input type="radio" id="kde" value="Plasma" name="desktop" /> <label for="kde" class="btn btn-outline-primary kde"><?php _g('Plasma Desktop')?></label> <input type="radio" id="gnome" value="GNOME" name="desktop" /> @@ -247,7 +248,7 @@ input[type="radio"], input[type="submit"] { <?php _g('Network installer + nonfree firmware CD', null,'h3'); _g('Contain nonfree drivers needed for some disc controllers, some network cards, etc.',null,'p')?> </div> - <div> + <div class="d-sm-flex justify-content-center"> <input type="radio" id="free" value="-" name="nat" /> <label for="free" class="btn btn-outline-primary free"><?php _g('Free Software CD')?></label> <input type="radio" id="nonfree" value="nonfree" name="nat" /> @@ -266,7 +267,7 @@ input[type="radio"], input[type="submit"] { _g('This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though.',null,'p')?> </div> - <div> + <div class="d-sm-flex justify-content-center"> <input type="radio" id="32b" value="i586" name="arch" /> <label for="32b" class="btn btn-outline-primary 32b"><?php _g('32 bit')?></label> <input type="radio" id="64b" value="x86_64" name="arch" /> @@ -289,7 +290,7 @@ input[type="radio"], input[type="submit"] { <?php } else { echo _g('BitTorrent link are not yet available.',null, 'p style="margin-top:1.5em;" class="warn"'); } ?> </div> - <div> + <div class="d-sm-flex justify-content-center"> <?php if($torrentavailable){ ?> <a href="#" id="torrentlink" class="btn btn-outline-primary torrentlink"><?php _g('BitTorrent')?></a><?php }?> <a href="#" id="directlink" class="btn btn-outline-primary directlink"><?php _g('Direct Link')?></a> @@ -413,20 +414,20 @@ input[type="radio"], input[type="submit"] { <?php _g('<a href="%s">Which to choose</a>', array(_r('https://wiki.mageia.org/en/Installation_Media')), 'li')?> <?php _g('<a href="%s">Get ISO on USB flash drive</a>', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')),'li') ?> <?php _g('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array(_r('https://wiki.mageia.org/en/Newcomers_start_here')), 'li')?> - <?php _g('Help us on %s', array("<a href=\"../contribute\">$name $version</a>"), 'li')?> + <?php //_g('Help us on %s', array("<a href=\"../contribute\">$name $version</a>"), 'li')?> </ul> - <?php echo '<br>'; - _g('Looking for a stable release?', null, 'h3'); + <?php '<br>'; +/* _g('Looking for a stable release?', null, 'h3'); echo '<p>'; _g('It is <a href="%s">here</a>.', array('../downloads/')); - echo '</p>'; -/* _g('Upgrading<br>from %s ?', array('Mageia 5'), 'h3')?> - echo '<ul class="hl">' + echo '</p'; +*/ _g('Upgrading<br>from %s ?', array('Mageia 5'), 'h3'); + echo '<ul class="hl">'; _g('<strong>do not</strong> use LiveDVDs;', null, 'li'); _g('see the <a href="%s" hreflang="en">upgrade guide</a>', array($upgradeguide), 'li'); -*/ ?> + ?> </div> <hr> diff --git a/en/6/nav.php b/en/6/nav.php index c780d22b6..7cfb49d2e 100644..100755 --- a/en/6/nav.php +++ b/en/6/nav.php @@ -9,11 +9,11 @@ $errata = _r('https://wiki.mageia.org/en/Mageia_6_Errata'); $upgradeguide = _r('https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5'); $nav = array( - _r("https://wiki.mageia.org/en/Mageia_6_Development") => _r('Development roadmap'), - _r("https://wiki.mageia.org/en/FeatureMageia6_Review") => _r('Features review'), +// _r("https://wiki.mageia.org/en/Mageia_6_Development") => _r('Development roadmap'), +// _r("https://wiki.mageia.org/en/FeatureMageia6_Review") => _r('Features review'), $releasenotes => _r('Release notes'), $errata => _r('Errata'), - "//bugs.mageia.org/" => _r('Bugs Reports'), +// "//bugs.mageia.org/" => _r('Bugs Reports'), ); $sru = trim($_SERVER['REQUEST_URI']); |