Browse Source

Bug 1566358 - Update releases page to include 64-bit Windows and Linux platforms - allow table footer to be defined by XML too r=me

Ian Neal 5 years ago
parent
commit
ec8cede7ad
2 changed files with 23 additions and 14 deletions
  1. 14 11
      lib/downloads_table.en.xml
  2. 9 3
      lib/release.tmpl

+ 14 - 11
lib/downloads_table.en.xml

@@ -4,8 +4,11 @@
   <header name="Windows" second="x64" spanclass="download-win" />
   <header name="Windows" second="x86" spanclass="download-win" />
   <header name="macOS" second="x64" spanclass="download-mac" />
-  <header name="Linux" second="x64" class="top-right" spanclass="download-linux" />
+  <header name="Linux" second="x64" spanclass="download-linux" />
   <header name="Linux" second="x86" class="top-right" spanclass="download-linux" />
+  <footer class="bottom-left" />
+  <footer colspan="6" />
+  <footer class="bottom-right" />
   <language id="zh-CN">
     <cell name="Chinese (Simplified)" />
     <cell lang="zh-CN" native="中文 (简体)" />
@@ -46,16 +49,6 @@
     <cell locale="nl" class="download-linux" platform="linux64" content="Download" />
     <cell locale="nl" class="download-linux" platform="linux" content="Download" />
   </language>
-  <language id="en-US">
-    <cell name="English (US)" />
-    <cell lang="en-US" native="English (US)" />
-    <cell version="" />
-    <cell locale="en-US" class="download-win" platform="win64" content="Download" />
-    <cell locale="en-US" class="download-win" platform="win" content="Download" />
-    <cell locale="en-US" class="download-mac" platform="osx" content="Download" />
-    <cell locale="en-US" class="download-linux" platform="linux64" content="Download" />
-    <cell locale="en-US" class="download-linux" platform="linux" content="Download" />
-  </language>
   <language id="en-GB">
     <cell name="English (British)" />
     <cell lang="en-GB" native="English (British)" />
@@ -66,6 +59,16 @@
     <cell locale="en-GB" class="download-linux" platform="linux64" content="Download" />
     <cell locale="en-GB" class="download-linux" platform="linux" content="Download" />
   </language>
+  <language id="en-US">
+    <cell name="English (US)" />
+    <cell lang="en-US" native="English (US)" />
+    <cell version="" />
+    <cell locale="en-US" class="download-win" platform="win64" content="Download" />
+    <cell locale="en-US" class="download-win" platform="win" content="Download" />
+    <cell locale="en-US" class="download-mac" platform="osx" content="Download" />
+    <cell locale="en-US" class="download-linux" platform="linux64" content="Download" />
+    <cell locale="en-US" class="download-linux" platform="linux" content="Download" />
+  </language>
   <language id="fr">
     <cell name="French" />
     <cell lang="fr" native="Français" />

+ 9 - 3
lib/release.tmpl

@@ -109,11 +109,17 @@
      END;
      "      </tr>\n";
      "    </thead>\n";
+
      "    <tfoot>\n";
      "      <tr>\n";
-     "        <td class=\"bottom-left\"></td>\n";
-     "        <td colspan=\"6\"></td>\n";
-     "        <td class=\"bottom-right\"></td>\n";
+     FOREACH footer IN languages.footer;
+       IF footer.class;
+         "        <td class=\"$footer.class\"></td>\n";
+       END;
+       IF footer.colspan;
+         "        <td colspan=\"$footer.colspan\"></td>\n";
+       END;
+     END;
      "      </tr>\n";
      "    </tfoot>\n";
      "    <tbody>\n";