Dropped 2.5 and 2.6 versions from the downloads section

Author: Thierry Boileau

_data/downloads.yml

@@ -19,15 +19,6 @@ editions:
   - name: OSGi Environments
     value: osgi
 versions:
-  '2.6':
-    releases:
-      - {name: '2.6 M1', release_date: '2020-01-26', id: 2.6m1}
-  '2.5':
-    releases:
-      - {name: '2.5.1', release_date: '2025-01-28', id: 2.5.1}
-      - {name: '2.5.0', release_date: '2024-12-27', id: 2.5.0}
-      - {name: '2.5 RC1', release_date: '2020-03-09', id: 2.5rc1}
-      - {name: '2.5 M1', release_date: '2020-03-09', id: 2.5m1}
   '2.4':
     releases:
       - {name: 2.4.4, release_date: '2024-06-20', id: 2.4.4}

_includes/current_version_downloader.html

@@ -19,7 +19,7 @@
           <path d="M66.36,85.13A2.91,2.91,0,0,0,66.72,85h8.52c-0.75-1-9.84-16.4-10.72-17.48a13.63,13.63,0,0,0,6-4.38,12,12,0,0,0,2.09-7.35c0-4.86-1.72-8.23-5.17-10.54S59,42,52.56,42H41.3c-0.9,0-1.3.08-1.3,0.94V85H50V70H49.64L50,61.81V50h3.31c3.12,0,5.38.4,7,1.29a4.69,4.69,0,0,1,2.35,4.49,5.11,5.11,0,0,1-2.39,4.76C58.67,61.46,56,62,52.37,62H52.24c-1.42,0-1.9.61-1.32,2l3.51,5.61c0.71,0.85,6.85,10.57,9.14,14.33A3.43,3.43,0,0,0,66.36,85.13Z" fill="#fff"></path>
         </svg>
       </div>
-      <div class="card__body">
+      <div class="card__body" onload="currentDownloadIIFE();">
         {% assign currentBranch = site.data.downloads.currentVersion.branch %}
         {% assign currentRelease = site.data.downloads.currentVersion.release %}
         {% assign currentReleaseDate = site.data.downloads.currentVersion.release_date %}
@@ -32,21 +32,12 @@
             <li class="doc"><a href="/documentation/{{ currentBranch }}/changelog">View Change Log</a></li>
             <li class="doc"><a href="/documentation/user-guide/{{ currentBranch }}/">Access User Guide</a></li>
           </ul>
-          <script>
-            (function currentDownloadIIFE() {
-
-              document.querySelector('#frmDownloadCurrent').addEventListener('submit', function overrideSubmit(event) {
-                event.preventDefault();
-                window.location = getUrl('{{ currentBranch }}', '{{ currentRelease }}', 'jse');
-              });
-            })()
-          </script>
         </form>
 
       </div>
     </div>
   </div>
-  <div class="col-sm-6">
+  <div class="col-sm-6" onload="editionDownloadIIFE();">
     <div class="m-card m-card--square text-center">
       <div class="card__figure">
         <p class="text-uppercase abs-hv-center">Other Editions</p>
@@ -63,16 +54,6 @@
             <li><a href="/downloads/faq/" class="text-bostonblue">What are these editions?</a></li>
             <li><small>For access to previous releases, testing and unstable releases <a href="/downloads/past/">click here.</a></small></li>
           </ul>
-          <script>
-            (function editionDownloadIIFE() {
-              var editionSelect = document.querySelector('#id_edition');
-
-              document.querySelector('#frmDownloadEdition').addEventListener('submit', function overrideSubmit(event) {
-                event.preventDefault();
-                window.location = getUrl('{{ currentBranch }}', '{{ currentRelease }}', editionSelect.value);
-              });
-            })()
-          </script>
         </form>
       </div>
     </div>

_includes/scripts.html

@@ -5,4 +5,5 @@
 <script type="text/javascript" src="/assets/js/init.js"></script>
 <script type="text/javascript" src="/assets/js/prism.js" data-default-language="markup"></script>
 <script type="text/javascript" src="/assets/js/app.js"></script>
+<script type="text/javascript" src="/assets/js/downloads.js"></script>
 

assets/js/downloads.js

@@ -0,0 +1,76 @@
+function editionDownloadIIFE() {
+  var editionSelect = document.querySelector('#id_edition');
+
+  document.querySelector('#frmDownloadEdition').addEventListener('submit', function overrideSubmit(event) {
+    event.preventDefault();
+    window.location = getUrl('{{ currentBranch }}', '{{ currentRelease }}', editionSelect.value);
+  });
+};
+
+function downloadIIFE (versions, baseUrl) {
+
+  function getUrl (branch, release, edition) {
+    var excludeEdition = branch === '1.0' || branch === '1.1' || branch === '1.2';
+    var editionFragment = excludeEdition ? '' : edition  + '-';
+    return baseUrl + branch + '/restlet-' + editionFragment + release + '.zip';
+  }
+
+  function getReleases (branch) {
+    return versions[ branch ].releases;
+  }
+
+  function createSelectOption (releaseKey, release) {
+    var option = document.createElement("option");
+    option.value = releaseKey;
+    option.text = release.name;
+    return option;
+  }
+
+  var branchSelect = document.querySelector('#id_branch');
+  var releaseSelect = document.querySelector('#id_release');
+  var editionSelect = document.querySelector('#id_edition');
+
+  function populateReleases (releases) {
+    while (releaseSelect.firstChild) { // Purge existing values
+      releaseSelect.firstChild.remove();
+    }
+
+    Object.keys(releases).forEach(function (key) {
+      var release = releases[ key ];
+      releaseSelect.add(createSelectOption(key, release));
+    });
+  }
+
+  // Replace placeholder releases (there in case js is disabled)
+  var currentReleases = getReleases(branchSelect.value);
+  populateReleases(currentReleases);
+
+  branchSelect.addEventListener('change', function changeBranch (event) {
+    var releases = getReleases(event.target.value);
+
+    populateReleases(releases);
+
+    // Set release date
+    var releaseDateElement = document.querySelector('#download_date');
+    var currentReleaseKey = releaseSelect.firstChild.value;
+    releaseDateElement.innerText = releases[ currentReleaseKey ].release_date;
+
+    // Set links
+    var changeLogLink = document.querySelector('#change_log_link');
+    changeLogLink.href = '/documentation/' + event.target.value + '/changelog';
+
+    var changeLogBranch = document.querySelector('.download_name');
+    changeLogBranch.innerText = event.target.value;
+  });
+
+  releaseSelect.addEventListener('change', function changeRelease (event) {
+    var currentBranch = branchSelect.value;
+    var releaseDateElement = document.querySelector('#download_date');
+    var currentReleaseKey = event.target.value;
+    releaseDateElement.innerText = getReleases(currentBranch)[ currentReleaseKey ].release_date;
+  });
+
+  var releaseIndex = releaseSelect.value;
+  var releaseId = getReleases(branchSelect.value)[ releaseIndex ][ 'id' ];
+  window.location = getUrl(branchSelect.value, releaseId, editionSelect.value);
+};

downloads/past/index.html

@@ -68,83 +68,10 @@
           </div>
 
           <div class="form-group">
-            <button type="summit" class="m-button m-button-block m-button-flat-darkblue" id="download" >Download</button>
+            <button type="button" class="m-button m-button-block m-button-flat-darkblue" id="download" onclick="downloadIIFE({{ site.data.downloads.versions | jsonify }}, '{{ site.data.downloads.baseUrl }}')">Download</button>
           </div>
 
           <p>Release date: <span id="download_date">2014-12-19</span></p>
-            <script>
-              (function downloadIIFE () {
-                var versions = {{ site.data.downloads.versions | jsonify }};
-
-                function getUrl (branch, release, edition) {
-                  var excludeEdition = branch === '1.0' || branch === '1.1' || branch === '1.2';
-                  var editionFragment = excludeEdition ? '' : edition  + '-';
-                  return '{{ site.data.downloads.baseUrl }}' + branch + '/restlet-' + editionFragment + release + '.zip';
-                }
-
-                function getReleases (branch) {
-                  return versions[ branch ].releases;
-                }
-
-                function createSelectOption (releaseKey, release) {
-                  var option = document.createElement("option");
-                  option.value = releaseKey;
-                  option.text = release.name;
-                  return option;
-                }
-
-                var branchSelect = document.querySelector('#id_branch');
-                var releaseSelect = document.querySelector('#id_release');
-                var editionSelect = document.querySelector('#id_edition');
-
-                function populateReleases (releases) {
-                  while (releaseSelect.firstChild) { // Purge existing values
-                    releaseSelect.firstChild.remove();
-                  }
-
-                  Object.keys(releases).forEach(function (key) {
-                    var release = releases[ key ];
-                    releaseSelect.add(createSelectOption(key, release));
-                  });
-                }
-
-                // Replace placeholder releases (there in case js is disabled)
-                var currentReleases = getReleases(branchSelect.value);
-                populateReleases(currentReleases);
-
-                branchSelect.addEventListener('change', function changeBranch (event) {
-                  var releases = getReleases(event.target.value);
-
-                  populateReleases(releases);
-
-                  // Set release date
-                  var releaseDateElement = document.querySelector('#download_date');
-                  var currentReleaseKey = releaseSelect.firstChild.value;
-                  releaseDateElement.innerText = releases[ currentReleaseKey ].release_date;
-
-                  // Set links
-                  var changeLogLink = document.querySelector('#change_log_link');
-                  changeLogLink.href = '/documentation/' + event.target.value + '/changelog';
-
-                  var changeLogBranch = document.querySelector('.download_name');
-                  changeLogBranch.innerText = event.target.value;
-                });
-
-                releaseSelect.addEventListener('change', function changeRelease (event) {
-                  var currentBranch = branchSelect.value;
-                  var releaseDateElement = document.querySelector('#download_date');
-                  var currentReleaseKey = event.target.value;
-                  releaseDateElement.innerText = getReleases(currentBranch)[ currentReleaseKey ].release_date;
-                });
-
-                document.querySelector('#frmDownload').addEventListener('submit', function overrideSubmit (event) {
-                  event.preventDefault();
-                  var releaseIndex = releaseSelect.value;
-                  var releaseId = getReleases(branchSelect.value)[ releaseIndex ][ 'id' ];
-                  window.location = getUrl(branchSelect.value, releaseId, editionSelect.value);
-                });
-              })()
-            </script>
 
         </form>
         <div>