From cb7f45eba2862e9e21603579ee967028c59790ef Mon Sep 17 00:00:00 2001
From: Manuel Hiebel <leuhmanu@mageia.org>
Date: Fri, 15 Nov 2013 00:41:51 +0000
Subject: Mageia 4 beta1 (no torrent available yet)

---
 en/4/download_index.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'en/4/download_index.php')

diff --git a/en/4/download_index.php b/en/4/download_index.php
index a8a6ade70..29af5bf0a 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -2,7 +2,7 @@
 
 $name = 'Mageia';
 $version = '4';
-$release = 'alpha3';
+$release = 'beta1';
 
 define('HLANG', true);
 
@@ -18,7 +18,7 @@ function get_mageia_image_file_name($name, $version, $release, $variant = null,
   return implode('-', array($name, $version, $re, $medium)) . $ext;
 }
 
-function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = false)
+function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = true)
 {
   switch ($arch) {
   case "i586":
@@ -35,7 +35,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
     break;
   }
   
-  echo $torrent && $unavailabletorrent ? sprintf(_t('forthcoming')) :  sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>',
+  echo $torrent && $unavailabletorrent || $arch=='dual' ? 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'),
     $torrent ? '&amp;torrent=1' : '',
     implode(' ', array($name, $version, $release, $variant, $arch, $medium)),
@@ -72,7 +72,6 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
     <?php include '../'.$version.'/nav.php'; ?>
             <p class="unstable-release-warning"><?php _e('Be careful! This is an alpha, unstable release.');
             _e('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');?></p>
-	<p style="color:#3494d3">Beta 1 is a bit delayed as it still doesn't satisfy QA tests. Thanks for your patience.</p>
 
     <div id="doc4" class="yui-t7">
         <div id="bd" role="main">
@@ -219,7 +218,7 @@ 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">~35MB<br>~20MB</td>
+                        <td class="size">~27MB<br>~36MB</td>
 			<td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
 			echo '<br>';
 			dl_link($name,$version,$release,'Boot','x86_64','CD',false);?>
@@ -228,7 +227,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
                     <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">~55MB<br>~30MB</td>
+                        <td class="size">~27MB<br>~36MB</td>
 			<td><?php dl_link($name,$version,$release,'Boot-nonfree','i586','CD',false);
 			echo '<br>';
 			dl_link($name,$version,$release,'Boot-nonfree','x86_64','CD',false);?>
-- 
cgit v1.2.1