From 033d5a4247d38e52960e730f22c814ab8e803fdb Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Tue, 29 May 2012 10:32:05 +0200
Subject: [PATCH] Update start page + download page for new release

---
 download/index.html.tt2            | 64 ++++++++++++++++++++++++++------------
 download/prerelease/index.html.tt2 |  2 ++
 index.html.tt2                     |  6 ++--
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/download/index.html.tt2 b/download/index.html.tt2
index 7cee4c2..bde4cff 100644
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -77,40 +77,49 @@
 
 <div class="content">
 
-    <h1>Download Grml 2011.12</h1>
+    <h1>Download Grml 2012.05</h1>
 
+    <!--
     <p>Get the current stable release here.<br />
     <a href="prerelease/">Looking for the current pre-release version instead?</a></p>
+    -->
 
     <p>Download Grml and then write it to a CD-R or an empty USB key.</p>
 
 
-
-    <p><a href="http://grml.org/changelogs/README-grml-2011.12">Release Notes</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_noscript">
     <div class="download_panel" id="download_panel1_noscript"><div>
         <a href="http://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
         <br/>
         Direct download links:<br/>
-        <a href="http://download.grml.org/grml96_2011.12.iso">Grml96 ISO</a> [<a href="http://download.grml.org/grml96_2011.12.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml64_2011.12.iso">Grml64 ISO</a> [<a href="http://download.grml.org/grml64_2011.12.iso.sha1.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml32_2011.12.iso">Grml32 ISO</a> [<a href="http://download.grml.org/grml32_2011.12.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml96-full_2012.05.iso">Grml96 full ISO</a> [<a href="http://download.grml.org/grml96-full_2012.05.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml64-full_2012.05.iso">Grml64 full ISO</a> [<a href="http://download.grml.org/grml64-full_2012.05.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml32-full_2012.05.iso">Grml32 full ISO</a> [<a href="http://download.grml.org/grml32-full_2012.05.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml96-small_2012.05.iso">Grml96 small ISO</a> [<a href="http://download.grml.org/grml96-small_2012.05.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml64-small_2012.05.iso">Grml64 small ISO</a> [<a href="http://download.grml.org/grml64-small_2012.05.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/grml32-small_2012.05.iso">Grml32 small ISO</a> [<a href="http://download.grml.org/grml32-small_2012.05.iso.sha1.asc">Signature</a>]<br/>
         <br/>
         </div></div>
     </div>
 
     <div class="download_group" id="download_group1" style="display:none;">
     <form method="get" action="/download/bounce/">
-    <input type="hidden" name="version" value="2011.12"/>
+    <input type="hidden" name="version" value="2012.05"/>
     <div class="download_panel" id="download_panel1"><div>
 
-    <h2>Architecture</h2>
+    <h2>Options</h2>
 
+    <select name="flavour" id="download_flavour" style="width:100%;">
+    <option value="full" selected="selected">grml-full (~350MB)</option>
+    <option value="small">grml-small (~150MB)</option>
+    </select>
+    <br /><br />
     <select name="arch" id="download_arch" style="width:100%;">
     <option value="amd64" selected="selected">64-bit PC (amd64)</option>
     <option value="i386">32-bit PC (i586+)</option>
-    <option value="both">One for both (700MB)</option>
+    <option value="96">One for both (700MB)</option>
     </select>
     <br />
     <br />
@@ -118,8 +127,12 @@
     <br />
     <br />
 
+    <p><a href="http://grml.org/changelogs/README-grml-2012.05">Release Notes</a></p>
+
+    <!--
     <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2012.05-rc1 instead!</span></a>
     <br />
+    -->
 
     </div></div>
 
@@ -142,20 +155,31 @@
 
     </form>
     <script type="text/javascript">
+    function update_arch() {
+        var flavour = document.getElementById('download_flavour').value;
+        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (300MB)</option>';
+        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (700MB)</option>';
+        update_links();
+    }
+
     function update_links() {
-        var current_version = "2011.12";
-        var product = 'grml64';
+        var current_version = "2012.05";
+        var product = 'grml';
         var arch = document.getElementById('download_arch').value;
+        var flavour = document.getElementById('download_flavour').value;
+        if (arch == 'amd64') product = 'grml64';
         if (arch == 'i386') product = 'grml32';
-        if (arch == 'both') product = 'grml96';
-        var iso = product + '_' + current_version + '.iso';
+        if (arch == '96') product = 'grml96';
+        var iso = product + '-' + flavour + '_' + current_version + '.iso';
         var mirror_url = "http://download.grml.org/";
         document.getElementById('download_link_mirror').href = mirror_url + iso;
-        document.getElementById('download_link_mirror').innerHTML = '<br />Download Now<div class="download_relinfo">' + product + ' ' + current_version + '</div>';
+        document.getElementById('download_link_mirror').innerHTML = '<br />Download Now<div class="download_relinfo">' + product + '-' + flavour + ' ' + current_version + '</div>';
         document.getElementById('download_link_bt').href = mirror_url + iso + '.torrent';
         document.getElementById('download_link_signature').href = mirror_url + iso + '.sha1.asc';
     }
+
     // hook update function
+    document.getElementById('download_flavour').onchange = update_arch;
     document.getElementById('download_arch').onchange = update_links;
     // force initial link href set
     update_links();
@@ -173,13 +197,13 @@
     <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://download.grml.org/grml_sources-2011.12.tar.gz">Source code</a> (both archs)<br />
+    <a href="http://download.grml.org/grml_sources-2012.05.tar.gz">Source code</a> (both archs)<br />
     <br/>
     Netboot packages:<br/>
-    <a href="http://download.grml.org/grml_netboot_package_grml64_2011.12.tar.bz2">64-bit</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml64_2011.12.tar.bz2.sha1.asc">(sig)</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml32_2011.12.tar.bz2">32-bit</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml32_2011.12.tar.bz2.sha1.asc">(sig)</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml64_2012.05.tar.bz2">64-bit</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml64_2012.05.tar.bz2.sha1.asc">(sig)</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml32_2012.05.tar.bz2">32-bit</a>
+    <a href="http://download.grml.org/grml_netboot_package_grml32_2012.05.tar.bz2.sha1.asc">(sig)</a>
     <br />
     <br />
     <a href="http://debian.netcologne.de/grml/gnupg-michael-prokop.txt">Signing Key</a><br />
@@ -191,7 +215,7 @@
     <b>Boot from USB key</b><br />
     <br />
     Just <tt>dd(1)</tt> the downloaded ISO to an <abbr title="Any existing data will be overwritten by the dd command!">empty</abbr> USB key!<br /><br />
-    <code>dd if=grml64_2011.12.iso of=/dev/USB_KEY</code>
+    <code>dd if=grml64_2012.05.iso of=/dev/USB_KEY</code>
     <br /><br />
 
     <b>Troubleshooting</b><br /><br />
diff --git a/download/prerelease/index.html.tt2 b/download/prerelease/index.html.tt2
index c301292..cd12b05 100644
--- a/download/prerelease/index.html.tt2
+++ b/download/prerelease/index.html.tt2
@@ -194,7 +194,9 @@ exit;
     <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://download.grml.org/devel/">chroots for remastering</a> (prerelease)<br />
+-->
     <a href="http://download.grml.org/devel/grml_sources-2012.05-rc1.tar.gz">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 />
diff --git a/index.html.tt2 b/index.html.tt2
index 86af481..0825c3d 100644
--- a/index.html.tt2
+++ b/index.html.tt2
@@ -48,22 +48,24 @@
             </p>
             <br />
 
+	    <!--
             <p style="text-align: center;">
             <b>Pre-Release:</b><br/><br/>
             <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Download Grml 2012.05-rc1</span></a>
             </p>
-            <br />
+	    <br />
+	    -->
 
             <img style="float: right; margin-left: 20px" src="/img/grmltux_small.jpg" alt="*" />
             <br />
 
             <h2>News</h2>
             <div class="news">
+            <p>29 May 2012: New <a href="/changelogs/README-grml-2012.05">stable release version 2012.05</a> is available <a href="/download/">for download</a>.</p>
             <p>17 May 2012: Release candidate version <a href="/changelogs/README-grml-2012.05-rc1/">2012.05-rc1</a> available</p>
             <p>16 May 2012: New Grml developer: Evgeni Golov</p>
             <p>23 Feb 2012: Grml featured <a href="http://blog.grml.org/archives/373-Grml-featured-in-Linux-User-032012.html">in Linux User 03/2012</a></p>
             <p>17 Jan 2012: We want <a href="http://blog.grml.org/archives/372-We-want-you!.html">YOU!</a></p>
-            <p>23 Dec 2011: New <a href="/changelogs/README-grml-2011.12/">stable release version 2011.12</a> is available <a href="/download/">for download</a>.</p>
             </div>
 
       </div>
-- 
2.1.4