From 31c4bde127453b94966cfe1bf43ffa8272023829 Mon Sep 17 00:00:00 2001
From: Manuel Hiebel <leuhmanu@mageia.org>
Date: Sun, 30 Jun 2019 17:20:08 +0200
Subject: Enable cauldron dowload

---
 en/downloads/alternative/index.php         |   2 +-
 en/downloads/get/definitions.ini           |  41 ++++++++++
 en/downloads/prerelease/download_index.php | 122 +++--------------------------
 3 files changed, 51 insertions(+), 114 deletions(-)

(limited to 'en')

diff --git a/en/downloads/alternative/index.php b/en/downloads/alternative/index.php
index 2f082bf4e..ac8000a9a 100644
--- a/en/downloads/alternative/index.php
+++ b/en/downloads/alternative/index.php
@@ -1,7 +1,7 @@
 <?php
 
 $current = '7';
-$cauldron = '8';
+$cauldron = 'Cauldron';
 
 define('HLANG', true);
 
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 60e631705..8e116059b 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -1585,3 +1585,44 @@ torrent = "iso/7/torrents/Mageia-7-x86_64.torrent"
 magnet = "magnet:?xt=urn:btih:36838a55c36ca4802bbfb27dbf494245440ba269&dn=Mageia-7-x86_64&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451"
 name = "Mageia 7 64bit"
 size = "4.1 GB"
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;; Mageia 8
+;;;;;;;;;;;;;;;;;;;;;
+
+;
+[Mageia-Cauldron-netinstall-i586.iso]
+file = "Mageia-Cauldron-netinstall-i586.iso"
+path = "distrib/cauldron/i586/install/images"
+md5 = ""
+sha512 = ""
+name = "Mageia Cauldron Netinstall 32bit"
+size = "around 38 MB"
+
+;
+[Mageia-Cauldron-netinstall-nonfree-i586.iso]
+file = "Mageia-Cauldron-netinstall-nonfree-i586.iso"
+path = "distrib/cauldron/i586/install/images"
+md5 = ""
+sha512 = ""
+name = "Mageia Cauldron Netinstall Nonfree 32bit"
+size= "around 66 MB"
+
+;
+[Mageia-Cauldron-netinstall-x86_64.iso]
+file = "Mageia-Cauldron-netinstall-x86_64.iso"
+path = "distrib/cauldron/x86_64/install/images"
+md5 = ""
+sha512 = ""
+name = "Mageia Cauldron Netinstall 64bit"
+size = "around 51 MB"
+
+;
+[Mageia-Cauldron-netinstall-nonfree-x86_64.iso]
+file = "Mageia-Cauldron-netinstall-nonfree-x86_64.iso"
+path = "distrib/cauldron/x86_64/install/images"
+md5 = ""
+sha512 = ""
+name = "Mageia Cauldron Netinstall Nonfree 64bit"
+size = " 81 MB"
diff --git a/en/downloads/prerelease/download_index.php b/en/downloads/prerelease/download_index.php
index 265f7c15a..de6b7cecf 100644
--- a/en/downloads/prerelease/download_index.php
+++ b/en/downloads/prerelease/download_index.php
@@ -1,11 +1,11 @@
 <?php
 
 $name = 'Mageia';
-$version = '7'; 
-$release = 'rc';
-$torrentavailable=true;
-$classical=true;
-$live=true;
+$version = 'Cauldron'; 
+$release = '';
+$torrentavailable=false;
+$classical=false;
+$live=false;
 
 
 define('HLANG', true);
@@ -92,10 +92,10 @@ input[type="radio"], input[type="submit"], .popover-content  {
         <?php include './nav.php'; ?>
         <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 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('July 2019')), ' '); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
+//		_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('July 2019')), ' '); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
 		</div>
  
 
@@ -106,7 +106,7 @@ input[type="radio"], input[type="submit"], .popover-content  {
             <div class="yui-u first col-md-8">
 
 <noscript>
-<div class="para alert alert-info"><?php _g('It looks like you have JavaScript disable. Please <a href="%s">enable</a> it to have better render. At the <a href="%s">end</a> of this page there will be download link for you. But what is written between is important.',array('http://www.enable-javascript.com/','../alternative/'),'p'); ?></div>
+<div class="para alert alert-info"><?php _g('It looks like you have JavaScript disable. Please <a href="%s">enable</a> it to have better render. At the <a href="%s">end</a> of this page there will be download link for you. But what is written between is important.',array('http://www.enable-javascript.com/','#NoscriptDownload'),'p'); ?></div>
 <style>.pop{display: none;} .popover-content{display:block ;}</style>
 </noscript>
 
@@ -308,111 +308,7 @@ input[type="radio"], input[type="submit"], .popover-content  {
 </div>
 
 <noscript>
-<?php if ($classical){ ?>
-                    <div class="para" id="Fclassical">
-                        <h2><?php _g('Classical Installation Flavours')?></h2>
-                        <table class="fr-table dlt2">
-                        <thead>
-                            <tr>
-                                <th><?php _g('Format');?></th>
-                                <th><?php _g('link');?></th>
-                                <th><?php _g('BitTorrent');?></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <th class="name" >DVD 32bit<br>DVD 64bit</th>
-                                <td>
-                                    <?php dl_link($name,$version,$release,null,'i586','DVD',false);
-                                    echo '<br>';
-                                    dl_link($name,$version,$release,null,'x86_64','DVD',false);
-                                    echo '</td><td>';
-                                    dl_link($name,$version,$release,null,'i586','DVD',true,$torrentavailable);
-                                    echo '<br>';
-                                    dl_link($name,$version,$release,null,'x86_64','DVD',true,$torrentavailable);?>
-                                </td>
-                            </tr>
-                        </tbody>
-                        </table>
-                    </div>
-<?php } ?>
-
-<?php if($live){ ?>
-                    <div class="para" id="Flive">
-                        <h2><?php _g('LiveDVDs');?></h2>
-                        <table class="fr-table dlt2">
-                        <thead>
-                            <tr>
-                                <th><?php _g('Desktop');?></th>
-                                <th><?php _g('link');?></th>
-                                <th><?php _g('BitTorrent');?></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                                <tr>
-                        <th class="name" style="width:60%">LiveDVD Plasma</th>
-                        <td>
-                            <?php 
-                            dl_link($name,$version,$release,'LiveDVD-Plasma','x86_64','DVD',false);
-                            echo '</td><td>';
-                            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','x86_64','DVD',false);
-                            echo '</td><td>';
-                            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-Xfce','i586','DVD',false);
-                            echo '<br>';
-                            dl_link($name,$version,$release,'LiveDVD-Xfce','x86_64','DVD',false);
-                            echo '</td><td>';
-                            dl_link($name,$version,$release,'LiveDVD-Xfce','i586','DVD',true,$torrentavailable);
-                            echo '<br>';
-                            dl_link($name,$version,$release,'LiveDVD-Xfce','x86_64','DVD',true,$torrentavailable);?>
-                        </td>
-                    </tr>
-
-                        </tbody>
-                        </table>
-
-                    </div>
-<?php }?>
-
-                    <div class="para" id="Flan">
-                        <h2><?php _g('Wired Network-based Installation CD')?></h2>
-
-                        <table class="fr-table dlt2">
-                        <thead>
-                        <tr>
-                            <th><?php _g('Format');?></th>
-                            <th><?php _g('link');?></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr>
-                        <th><?php _g('Network installer, Free Software CD')?></th>
-                        <td><?php dl_link($name,$version,$release,'Netinstall','i586','CD',false);
-                            echo '<br>';
-                            dl_link($name,$version,$release,'netinstall','x86_64','CD',false);?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th><?php _g('Network installer + nonfree firmware CD')?><br>
-                        <td><?php dl_link($name,$version,$release,'netinstall-nonfree','i586','CD',false);
-                            echo '<br>';
-                            dl_link($name,$version,$release,'netinstall-nonfree','x86_64','CD',false);?>
-                        </td>
-                    </tr>
-                        </tbody>
-                        </table>
-                    </div>
+<div class="para" id="NoscriptDownload"><a href="/downloads/alternative/#Cauldron"><?php _g('Alternative downloads')?></a></div>
 </noscript>
                 </div>
 
-- 
cgit v1.2.1