From 61b6cae5fc829daf262f61d37f473869291ac203 Mon Sep 17 00:00:00 2001
From: Manuel Hiebel <leuhmanu@mageia.org>
Date: Mon, 6 Mar 2017 23:49:07 +0100
Subject: Mga6 sta2 available

new set of iso:
- live Xfce i586 and x86_64
- live Plasma and Gnome only x86_64
---
 en/6/download_index.php | 74 +++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

(limited to 'en/6')

diff --git a/en/6/download_index.php b/en/6/download_index.php
index 55ad35e6a..7e19268c1 100755
--- a/en/6/download_index.php
+++ b/en/6/download_index.php
@@ -2,7 +2,7 @@
 
 $name = 'Mageia';
 $version = '6';
-$release = 'sta1';
+$release = 'sta2';
 $torrentavailable=true;
 $classical=true;
 $live=true;
@@ -203,7 +203,7 @@ input[type="radio"], input[type="submit"]  {
 <div id="liveEx">
     <?php _g('LiveDVDs',null,'h3');?>
 
-    <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or PLASMA.', array("$name $version"), 'p');
+    <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a DVD or USB device, and try it using one of the graphical user interfaces such as GNOME, Plasma or Xfce.', 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 LiveDVDs for fresh new installs ONLY.');?>
@@ -246,18 +246,24 @@ input[type="radio"], input[type="submit"]  {
 
     <div id="gnomeEx">
         <?php _g('GNOME Desktop',null,'h3');?>
-        <?php get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?>
+        <?php //get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?>
     </div>
     <div id="kdeEx">
-        <?php _g('PLASMA Desktop',null,'h3');?>
-        <?php get_image('PLASMA', '/g/5/kde.png', 'width: 100%');?>
+        <?php _g('Plasma Desktop',null,'h3');?>
+        <?php //get_image('PLASMA', '/g/5/kde.png', 'width: 100%');?>
     </div>
+    <div id="xfceEx">
+        <?php _g('Xfce Desktop',null,'h3');?>
+        <?php //get_image('PLASMA', '/g/5/kde.png', 'width: 100%');?>
+    </div>    
 
     <div class="radiobutton">
-        <input type="radio" id="kde" value="PLASMA5" name="desktop" />
-        <label for="kde" class="ui-button kde"><?php _g('PLASMA Desktop')?></label>
+        <input type="radio" id="kde" value="Plasma" name="desktop" />
+        <label for="kde" class="ui-button kde"><?php _g('Plasma Desktop')?></label>
         <input type="radio" id="gnome" value="GNOME" name="desktop" />
         <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label>
+        <input type="radio" id="xfce" value="xfce4" name="desktop" />
+        <label for="xfce" class="ui-button xfce"><?php _g('Xfce Desktop')?></label>        
     </div>
 </div><?php }/*live*/?>
 
@@ -364,29 +370,34 @@ input[type="radio"], input[type="submit"]  {
                         </thead>
                         <tbody>
                                 <tr>
-                        <th class="name" style="width:60%">LiveDVD PLASMA</th>
+                        <th class="name" style="width:60%">LiveDVD Plasma</th>
                         <td>
-                            <?php dl_link($name,$version,$release,'LiveDVD-PLASMA5','i586','DVD',false);
-                            echo '<br>';
-                            dl_link($name,$version,$release,'LiveDVD-PLASMA5','x86_64','DVD',false);
+                            <?php 
+                            dl_link($name,$version,$release,'LiveDVD-Plasma','x86_64','DVD',false);
                             echo '</td><td>';
-                            dl_link($name,$version,$release,'LiveDVD-PLASMA5','i586','DVD',true,$torrentavailable);
-                            echo '<br>';
-                            dl_link($name,$version,$release,'LiveDVD-PLASMA5','x86_64','DVD',true,$torrentavailable);?>
+                            dl_link($name,$version,$release,'LiveDVD-Plasma','x86_64','DVD',true,$torrentavailable);?>
                         </td>
                     </tr>
                     <tr>
                         <th class="name">LiveDVD GNOME</th>
                         <td>
-                            <?php dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',false);
-                            echo '<br>';
+                            <?php 
                             dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',false);
                             echo '</td><td>';
-                            dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',true,$torrentavailable);
-                            echo '<br>';
                             dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',true,$torrentavailable);?>
                         </td>
                     <tr>
+                        <th class="name">LiveDVD Xfce</th>
+                        <td>
+                            <?php dl_link($name,$version,$release,'LiveDVD-xfce4','i586','DVD',false);
+                            echo '<br>';
+                            dl_link($name,$version,$release,'LiveDVD-xfce4','x86_64','DVD',false);
+                            echo '</td><td>';
+                            dl_link($name,$version,$release,'LiveDVD-xfce4','i586','DVD',true,$torrentavailable);
+                            echo '<br>';
+                            dl_link($name,$version,$release,'LiveDVD-xfce4','x86_64','DVD',true,$torrentavailable);?>
+                        </td>
+                    <tr>                    
 
                         </tbody>
                         </table>
@@ -487,22 +498,11 @@ $('img.lazy').each(function(){
 
     $('#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();
+        $('#arch')[this.id == 'classical' ? 'slideDown' : 'slideUp']();
+        $('label[for="32b"],#32bEx').show();
+        $('input[name="desktop"],input[name="nat"],input[name="arch"],input[name="dllink"]').prop('checked', false);
         $('#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="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);
-        }
-
         $('#dllink')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
     });
 
@@ -511,12 +511,13 @@ $('img.lazy').each(function(){
     });
 
     $('input[name=desktop]').click(function () {
-        $('#arch')[ $('#gnome,#kde').is(':checked') ? 'slideDown' : 'slideUp']();
+        $('#arch')[ $('#gnome,#kde,#xfce').is(':checked') ? 'slideDown' : 'slideUp']();
+        $('#32bEx,label[for="32b"]')[$('#gnome,#kde').is(':checked') ? 'hide' : 'show']()
         lazyload();
     });
 
     $('input[name=arch]').click(function () {
-        $('#dllink')[$('#32b,#64b,#dual').is(':checked') ? 'slideDown' : 'slideUp']();
+        $('#dllink')[$('#32b,#64b').is(':checked') ? 'slideDown' : 'slideUp']();
         $('input[name="dllink"]').prop('checked', false);
         $('#torrentEx,#torrentlink')[$('#lan').is(':checked') ? 'hide' : 'show']();
         scrolltoid('#dllink')
@@ -537,8 +538,9 @@ $('img.lazy').each(function(){
     gettooltip('.classical', '#classicalEx',40,-70)
     gettooltip('.live', '#liveEx',40,-70)
     gettooltip('.lan','#lanEx',40,-70)
-    gettooltip('.gnome', '#gnomeEx',40,-300)
-    gettooltip('.kde', '#kdeEx',40,-300)
+    gettooltip('.gnome', '#gnomeEx',40,-0)
+    gettooltip('.kde', '#kdeEx',40,-0)
+    gettooltip('.xfce', '#xfceEx',40,-0)
     gettooltip('.free', '#freeEx',40,-70)
     gettooltip('.nonfree','#nonfreeEx',40,-70)
     gettooltip('.32b', '#32bEx',40,-70)
-- 
cgit v1.2.1