mga 5.1 dl page

1 files changed, 13 insertions, 89 deletions

diff --git a/en/5/download_index.php b/en/5/download_index.php
index 7db00b529..2761f35e7 100755
--- a/en/5/download_index.php
+++ b/en/5/download_index.php
@@ -1,12 +1,11 @@
 <?php
 
 $name = 'Mageia';
-$version = '5';
+$version = '5.1';
 $release = '';
 $torrentavailable=true;
 $classical=true;
 $live=true;
-$dual=true;
 
 
 define('HLANG', true);
@@ -38,9 +37,6 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
   case "x86_64":
     $bit = _r('64 bit');
     break;
-  case "dual":
-    $bit = _r('Dualarch');
-    break;
   default:
     $bit = '';
     break;
@@ -192,7 +188,7 @@ input[type="radio"], input[type="submit"]  {
         _g('The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO.');?>
     </p>
 
-    <?php _g('For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it\'s about %sGB.',array('3.5','1.2'),'p class="dlinfo"');?>
+    <?php _g('For 32 and 64bit, size of the ISOs is about %sGB.',array('3.7'),'p class="dlinfo"');?>
 
 </div>
 <?php } ?>
@@ -200,17 +196,17 @@ input[type="radio"], input[type="submit"]  {
 
 <?php if($live == true){?>
 <div id="liveEx">
-    <?php _g('LiveCDs and LiveDVDs',null,'h3');?>
+    <?php _g('LiveDVDs',null,'h3');?>
 
     <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), 'p');
     _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');?>
 
-    <p><?php _g('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
-    <span class="warn"><?php _g('DO NOT use these LiveCDs or LiveDVDs to upgrade from the prior Mageia release!'); ?></span>
+    <p><?php _g('Use LiveDVDs for fresh new installs ONLY.');?>
+    <span class="warn"><?php _g('DO NOT use these LiveDVDs to upgrade from the prior Mageia release!'); ?></span>
     <?php _g('Use a classical installation and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?>
     </p>
 
-    <?php _g('For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it\'s about %sMB.',array('1.6','700'),'p class="dlinfo"');?>
+    <?php _g('For LiveDVDs, size of the ISOs is about %sGB.',array('1.6'),'p class="dlinfo"');?>
 </div>
 <?php } ?>
 
@@ -225,14 +221,13 @@ input[type="radio"], input[type="submit"]  {
 <div class="radiobutton">
     <?php if( $classical ){?><input type="radio" value="DVD" name="format" id="classical"/>
     <label for="classical" class="ui-button classical" ><?php _g('Classic Installation')?></label><?php }?>
-    <?php if($live){ ?><input type="radio" id="live" value="Live" name="format" />
+    <?php if($live){ ?><input type="radio" id="live" value="LiveDVD" name="format" />
     <label for="live" class="ui-button live"><?php _g('Live Media');?></label><?php }?>
     <input type="radio" id="lan" value="Boot" name="format" />
     <label for="lan" class="ui-button lan"><?php _g('Network Installation')?></label>
 </div>
 <?php if( !$dual || !$live || !$classical ){?>
 <p style="margin-top:1.5em;" class="warn">
-    <?php if(!$dual){ _g('The dualarch is not yet available.');}?>
     <?php if(!$live) {_g('LiveCDs and LiveDVDs are not yet available.');}?>
     <?php if(!$classical){ _g('Classical Installation flavours is not yet available.');}?>
 </p>
@@ -240,27 +235,7 @@ input[type="radio"], input[type="submit"]  {
 </div>
 
 <?php if($live){ ?>
-<div class="para" id="livespin">
-    <?php _g('LiveCDs and LiveDVDs',null,'h2');?>
-
-    <div id="livedvdEx">
-        <?php _g('LiveDVDs',null,'h3');
-        _g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?>
-    </div>
 
-    <div id="livecdEx">
-        <?php _g('LiveCDs',null,'h3');
-        _g('LiveCDs contain only English and is available only in 32bit.',null,'p');
-        _g('Do not use unless you really DON\'T NEED any other language than English.',null,'p class="warn"'); ?>
-    </div>
-
-    <div class="radiobutton">
-        <input type="radio" id="livedvd" value="DVD" name="livespin" />
-        <label for="livedvd" class="ui-button livedvd"><?php _g('LiveDVDs')?></label>
-        <input type="radio" id="livecd" value="CD" name="livespin" />
-        <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label>
-    </div>
-</div>
 
 <div class="para" id="desktop">
     <?php _g('Desktop',null,'h2');?>
@@ -312,26 +287,11 @@ 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>
 
-<?php if($dual){?>
-    <div id='dualEx'>
-        <?php _g('Dualarch',null,'h3');?>
-        <?php _g('The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB.',array('XFCE','1'),'p');
-        echo '<p>';
-        _g('Dual iso size is intended to be small for advanced users, only network proprietary drivers are included.', null, ' ');
-        _g('You will have to add remote nonfree media if you need some more.', null,' ');
-        _g('Furthermore UEFI is not supported.');
-        echo '</p>';
-        _g('It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU.',null, 'p');
-        _g('This ISO is generally for advanced users and system administrator for fast deployment of Mageia.',null, 'p');?>
-    </div>
-<?php } ?>
     <div class="radiobutton">
         <input type="radio" id="32b" value="i586" name="arch" />
         <label for="32b" class="ui-button 32b"><?php _g('32 bit')?></label>
         <input type="radio" id="64b" value="x86_64" name="arch" />
         <label for="64b" class="ui-button 64b"><?php _g('64 bit')?></label>
-    <?php if($dual == true){ ?><input type="radio" id="dual" value="dual" name="arch" />
-        <label for="dual" class="ui-button dual"><?php _g('Dualarch')?></label><?php } ?>
     </div>
 </div>
 
@@ -382,14 +342,6 @@ input[type="radio"], input[type="submit"]  {
                                     dl_link($name,$version,$release,null,'x86_64','DVD',true,$torrentavailable);?>
                                 </td>
                             </tr>
-<?php if($dual){ ?> <tr>
-                                <th class="name">DVD dualarch</th>
-                                <td>
-                                    <?php dl_link($name,$version,$release,null,'dual','DVD',false);?>
-                                    </td><td>
-                                    <?php dl_link($name,$version,$release,null,'dual','DVD',true,$torrentavailable);?>
-                                </td>
-                            </tr><?php } ?>
                         </tbody>
                         </table>
                     </div>
@@ -397,7 +349,7 @@ input[type="radio"], input[type="submit"]  {
 
 <?php if($live){ ?>
                     <div class="para" id="Flive">
-                        <h2><?php _g('LiveCDs and LiveDVDs');?></h2>
+                        <h2><?php _g('LiveDVDs');?></h2>
                         <table class="fr-table dlt2">
                         <thead>
                             <tr>
@@ -431,20 +383,6 @@ input[type="radio"], input[type="submit"]  {
                             dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',true,$torrentavailable);?>
                         </td>
                     <tr>
-                        <th class="name">LiveCD KDE</th>
-                        <td>
-                            <?php dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',false);
-                            echo '</td><td>';
-                            dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',true,$torrentavailable);?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th class="name">LiveCD GNOME</th>
-                        <td>
-                            <?php dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',false);
-                            echo '</td><td>';
-                            dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',true,$torrentavailable);?>
-                    </tr>
 
                         </tbody>
                         </table>
@@ -550,25 +488,24 @@ $('img.lazy').each(function(){
 });
 }
 
-    $('#iso2usb,#arch,#nat,#desktop,#livespin,#dllink').hide();
+    $('#iso2usb,#arch,#nat,#desktop,#dllink').hide();
     $('input[name=format]').click(function () {
         $('#arch,label[for="dual"]')[this.id == 'classical' ? 'slideDown' : 'slideUp']();
         $('label[for="64b"],#64bex').show();
-        $('#livespin')[this.id == 'live' ? 'slideDown' : 'slideUp']();
+        $('#desktop')[this.id == 'live' ? 'slideDown' : 'slideUp']();
         $('#nat')[this.id == 'lan' ? 'slideDown' : 'slideUp']();
         if ($('#classical').is(':checked')) {
             $('input[name="arch"],input[name="dllink"]').prop('checked', false);
         }
 
         if ($('#live').is(':checked')) {
-            $('input[name="livespin"],input[name="arch"],input[name="dllink"]').prop('checked', false);
+            $('input[name="dektop"],input[name="arch"],input[name="dllink"]').prop('checked', false);
         }
 
         if ($('#lan').is(':checked')) {
             $('input[name="nat"],input[name="arch"],input[name="dllink"]').prop('checked', false);
         }
 
-        $('#desktop')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
         $('#dllink')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
     });
 
@@ -576,18 +513,10 @@ $('img.lazy').each(function(){
         $('#arch')[ $('#free,#nonfree').is(':checked') ? 'slideDown' : 'slideUp']();
     });
 
-    $('input[name=livespin]').click(function () {
-        $('#desktop')[ $('#livecd,#livedvd').is(':checked') ? 'slideDown' : 'slideUp']();
-        if ($('#livecd').is(':checked') && $('#64b').is(':checked')) {
-            $('input[id="32b"]').prop('checked', true);
-        }
-        $('label[for="64b"],#64bex')[$('#livecd').is(':checked') ? 'slideUp' : 'slideDown']();
-        lazyload();
-    });
 
     $('input[name=desktop]').click(function () {
         $('#arch')[ $('#gnome,#kde').is(':checked') ? 'slideDown' : 'slideUp']();
-        scrolltoid('#arch')
+	lazyload();
     });
 
     $('input[name=arch]').click(function () {
@@ -599,13 +528,11 @@ $('img.lazy').each(function(){
 
     $('#directlink,#torrentlink').hover(function () {
         format = $('input[name=format]:checked').val();
-        livespin = $('input[name=livespin]:checked').val();
         desktop = $('input[name=desktop]:checked').val();
-        desktop = (livespin == 'CD') ? desktop + '-en' : desktop;
         nat = (nat = $('input[name=nat]:checked').val()) == '-' ? '-' : '-' + nat + '-';
         arch = $('input[name=arch]:checked').val();
         getname ='<?php echo get_mageia($name, $version, $release)?>' + '-';
-        file = $('#live').is(':checked') ? format + livespin + '-' + desktop + '-' + arch + '-' + livespin + '.iso' : $('#classical').is(':checked') ? arch + '-' + format + '.iso' : format + nat + arch + '-CD.iso';
+        file = $('#live').is(':checked') ? format + '-' + desktop + '-' + arch + '-' + 'DVD.iso' : $('#classical').is(':checked') ? arch + '-' + format + '.iso' : format + nat + arch + '-CD.iso';
         file = (this.id == 'torrentlink') ? getname + file + '&torrent=1' : getname + file ;
         $("a.ui-button").attr('href','../downloads/get/?q=' + file);
     });
@@ -614,15 +541,12 @@ $('img.lazy').each(function(){
     gettooltip('.classical', '#classicalEx',40,-70)
     gettooltip('.live', '#liveEx',40,-70)
     gettooltip('.lan','#lanEx',40,-70)
-    gettooltip('.livecd', '#livecdEx',40,-70)
-    gettooltip('.livedvd', '#livedvdEx',40,-70)
     gettooltip('.gnome', '#gnomeEx',40,-300)
     gettooltip('.kde', '#kdeEx',40,-300)
     gettooltip('.free', '#freeEx',40,-70)
     gettooltip('.nonfree','#nonfreeEx',40,-70)
     gettooltip('.32b', '#32bEx',40,-70)
     gettooltip('.64b', '#64bEx',40,-70)
-    gettooltip('.dual', '#dualEx',40,-70)
     gettooltip('.directlink', '#directEx',40,-40)
     gettooltip('.torrentlink','#torrentEx',40,-40)