X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=download%2Fprerelease%2Findex.html.tt2;h=c301292bdfb3e933b4c7f0a2299a959e9d18d0a9;hb=a218d3efd348aeeed10c600ca65bc90c940daee2;hp=88e4f50f8191a159e7df0f017ae1b2faed0786e7;hpb=f8151b113913dcb8011e8fc212881f73bee903ac;p=grml.org.git

diff --git a/download/prerelease/index.html.tt2 b/download/prerelease/index.html.tt2
index 88e4f50..c301292 100644
--- a/download/prerelease/index.html.tt2
+++ b/download/prerelease/index.html.tt2
@@ -91,7 +91,22 @@ exit;
 
     <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">
+    <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/devel/grml96-full_2012.05-rc1.iso">Grml96 full ISO</a> [<a href="http://download.grml.org/devel/grml96-full_2012.05-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml64-full_2012.05-rc1.iso">Grml64 full ISO</a> [<a href="http://download.grml.org/devel/grml64-full_2012.05-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml32-full_2012.05-rc1.iso">Grml32 full ISO</a> [<a href="http://download.grml.org/devel/grml32-full_2012.05-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml96-small_2012.05-rc1.iso">Grml96 small ISO</a> [<a href="http://download.grml.org/devel/grml96-small_2012.05-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml64-small_2012.05-rc1.iso">Grml64 small ISO</a> [<a href="http://download.grml.org/devel/grml64-small_2012.05-rc1.iso.sha1.asc">Signature</a>]<br/>
+        <a href="http://download.grml.org/devel/grml32-small_2012.05-rc1.iso">Grml32 small ISO</a> [<a href="http://download.grml.org/devel/grml32-small_2012.05-rc1.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="2012.05-rc1"/>
     <div class="download_panel" id="download_panel1"><div>
@@ -99,13 +114,14 @@ exit;
     <h2>Options</h2>
 
     <select name="flavour" id="download_flavour" style="width:100%;">
-    <option value="full" selected="selected">grml (350MB)</option>
-    <option value="small">grml-small (150MB)</option>
+    <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</option>
-    <option value="i386">32-bit PC</option>
+    <option value="amd64" selected="selected">64-bit PC (amd64)</option>
+    <option value="i386">32-bit PC (i586+)</option>
+    <option value="96">One for both (700MB)</option>
     </select>
     <br />
     <br />
@@ -119,19 +135,30 @@ exit;
     <!-- fallback cgi buttons -->
     <div id="formbuttons">
     <button name="filetype" value="iso" id="download_button_mirror" class="largebutton" style="width:100%;" type="submit">Download Now </button><br />
+<!--
     <button name="filetype" value="bt" id="download_button_bt" type="submit">Download using BitTorrent</button><br />
+-->
     <button name="filetype" value="signature" id="download_button_signature" type="submit">Get Checksum/Signature</button><br />
     </div>
     <!-- JS links -->
     <div id="linkbuttons" style="display:none;">
     <a id="download_link_mirror" class="largebutton">Download Now</a><br />
+<!--
     <a id="download_link_bt">BitTorrent Download</a><br />
+-->
     <a id="download_link_signature">Get Checksum/Signature</a><br />
     </div>
     </div></div>
 
     </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 = "2012.05-rc1";
         var product = 'grml';
@@ -139,21 +166,25 @@ exit;
         var flavour = document.getElementById('download_flavour').value;
         if (arch == 'amd64') product = 'grml64';
         if (arch == 'i386') product = 'grml32';
+        if (arch == '96') product = 'grml96';
         var iso = product + '-' + flavour + '_' + current_version + '.iso';
         var mirror_url = "http://download.grml.org/devel/";
         document.getElementById('download_link_mirror').href = mirror_url + iso;
         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_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_links;
+    document.getElementById('download_flavour').onchange = update_arch;
     document.getElementById('download_arch').onchange = update_links;
     // force initial link href set
     update_links();
     // only show our link "buttons"
     document.getElementById('formbuttons').style.display = 'none';
     document.getElementById('linkbuttons').style.display = '';
+    document.getElementById('download_group1').style.display = '';
+    document.getElementById('download_group1_noscript').style.display = 'none';
     </script>
     </div>
 
@@ -164,7 +195,7 @@ exit;
     <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.tgz">Source code</a> (one tgz for both architectures)<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 />
     <br />