remove the selection of live format

1 files changed, 7 insertions, 32 deletions

diff --git a/en/6/download_index.php b/en/6/download_index.php
index 0b50e6d6a..4c3c7b010 100755
--- a/en/6/download_index.php
+++ b/en/6/download_index.php
@@ -226,7 +226,7 @@ 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>
@@ -240,19 +240,6 @@ input[type="radio"], input[type="submit"]  {
 </div>
 
 <?php if($live){ ?>
-<div class="para" id="livespin">
-    <?php _g('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 class="radiobutton">
-        <input type="radio" id="livedvd" value="DVD" name="livespin" />
-        <label for="livedvd" class="ui-button livedvd"><?php _g('LiveDVDs')?></label>
-    </div>
-</div>
 
 <div class="para" id="desktop">
     <?php _g('Desktop',null,'h2');?>
@@ -498,25 +485,25 @@ $('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']();
+        //$('#desktop')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
         $('#dllink')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
     });
 
@@ -524,18 +511,9 @@ $('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 () {
@@ -547,13 +525,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);
     });
@@ -562,7 +538,6 @@ $('img.lazy').each(function(){
     gettooltip('.classical', '#classicalEx',40,-70)
     gettooltip('.live', '#liveEx',40,-70)
     gettooltip('.lan','#lanEx',40,-70)
-    gettooltip('.livedvd', '#livedvdEx',40,-70)
     gettooltip('.gnome', '#gnomeEx',40,-300)
     gettooltip('.kde', '#kdeEx',40,-300)
     gettooltip('.free', '#freeEx',40,-70)