X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=download%2Fprerelease%2Findex.php;h=89680c35fb722eb8634226f938acfa531761777f;hb=fde130a703aa87dc4e714fc7d97a698bdda79700;hp=96008c49e8843fc6d28bf6177024328a0b41c320;hpb=c39f079208e4a8e8a354e19e17d34ee43699e908;p=grml.org.git

diff --git a/download/prerelease/index.php b/download/prerelease/index.php
index 96008c4..89680c3 100644
--- a/download/prerelease/index.php
+++ b/download/prerelease/index.php
@@ -1,3 +1,8 @@
+<?php
+// while there is no prerelease, redirect to stable page
+header("Location: /download/");
+exit;
+?>
 <!DOCTYPE html>
 <html>
 <head>
@@ -77,35 +82,36 @@
 
 <div class="content">
 
-    <h1>Download Grml 2011.05-rc1</h1>
+    <h1>Download Grml 2011.12-rc1</h1>
 
-    <p><strong>NOTE:</strong> There is no current pre-release.</p>
-
-    <!--
     <p><strong>NOTE: This is a PRE-RELEASE, not a stable release yet.<br />
-    You have been warned.</strong><br /> -->
+    You have been warned.</strong><br />
+
     <a href="../">Looking for the stable release version instead?</a></p>
 
     <p>Download the Grml flavour you need, then write it to a CD-R or an empty USB stick.</p>
 
     <div class="download_group" id="download_group1">
-    <form method="post" action="/cgi-bin/download.cgi">
-    <input type="hidden" name="version" value="2011.05-rc1"/> 
+    <form method="get" action="/download/bounce/">
+    <input type="hidden" name="version" value="2011.12-rc1"/>
     <div class="download_panel" id="download_panel1"><div>
 
     <h2>Options</h2>
 
     <select name="flavour" id="download_flavour" style="width:100%;">
-    <option value="full" selected="selected">grml (700MB)</option>
-    <option value="medium">grml-medium (220MB)</option>
-    <option value="small">grml-small (110MB)</option>
+    <option value="full" selected="selected">grml (350MB)</option>
     </select>
     <br /><br />
     <select name="arch" id="download_arch" style="width:100%;">
-    <option value="i386" selected="selected">32-bit PC</option>
-    <option value="amd64">64-bit PC</option>
+    <option value="amd64" selected="selected">64-bit PC</option>
+    <option value="i386">32-bit PC</option>
     </select>
     <br />
+    <br />
+    <br />
+    <br />
+    <br />
+    <a href="/changelogs/README-grml-2011.12-rc1/">Release Notes</a>
     </div></div>
 
     <div class="download_panel" id="download_panel2"><div>
@@ -118,16 +124,15 @@
     <!-- JS links -->
     <div id="linkbuttons" style="display:none;">
     <a id="download_link_mirror" class="largebutton">Download Now</a><br />
-    <a id="download_link_bt">Download using BitTorrent</a><br />
+    <a id="download_link_bt">BitTorrent Download</a><br />
     <a id="download_link_signature">Get Checksum/Signature</a><br />
-    <a href="/download/mirrors/">Download from a specific mirror</a><br />
     </div>
     </div></div>
 
     </form>
     <script type="text/javascript">
     function update_links() {
-        var current_version = "2011.05";
+        var current_version = "2011.12-rc1";
         var product = 'grml';
         var arch = document.getElementById('download_arch').value;
         var flavour = document.getElementById('download_flavour').value;
@@ -143,10 +148,6 @@
     // hook update function
     document.getElementById('download_flavour').onchange = update_links;
     document.getElementById('download_arch').onchange = update_links;
-    var ua = window.navigator.userAgent;
-    if (ua.indexOf('WOW64') != -1 || ua.indexOf('Win64') != -1 || ua.indexOf('x64') != -1 || ua.indexOf('x86_64') != -1 || ua.indexOf('amd64') != -1) {
-        document.getElementById('download_arch').value = 'amd64';
-    }
     // force initial link href set
     update_links();
     // only show our link "buttons"
@@ -161,7 +162,8 @@
     <b>Alternate downloads</b><br /><br />
     <a href="http://daily.grml.org/">Daily images</a><br />
     <a href="http://download.grml.org/">Older releases</a><br />
-    <a href="http://debian.netcologne.de/grml/release-chroots/">chroots for remastering</a><br />
+    <a href="http://download.grml.org/devel/">chroots for remastering</a> (prerelease)<br />
+    <a href="http://download.grml.org/devel/grml_sources-2011.12-rc1.tgz">Source code</a> (one tgz for both architectures)<br />
     <br />
     <a href="http://debian.netcologne.de/grml/gnupg-michael-prokop.txt">Signing Key</a><br />
     <br />
@@ -172,7 +174,7 @@
     <b>Boot from USB stick</b><br />
     <br />
     Just <tt>dd(1)</tt> the downloaded ISO to an <abbr title="Any existing data will be overriden by the dd command!">empty</abbr> USB stick!<br /><br />
-    <code>dd if=grml_2011.05-rc1.iso of=/dev/USB_STICK</code>
+    <code>dd if=grml_2011.12-rc1.iso of=/dev/USB_STICK</code>
     <br /><br />
 
     <b>Troubleshooting</b><br /><br />
