[gentoo-commits] sites/www:master commit in: _includes/downloads/, downloads/

[Alex Legler]

commit:     29b3f1db432909ce7940337dbf76d0f92ddb2708
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Mon Nov 23 19:45:05 2015 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 19:45:05 2015 +0000
URL:        https://gitweb.gentoo.org/sites/www.git/commit/?id=29b3f1db

Put sh and s390 downloads according to profile status

Also fixes bug 563618 by linking to all of the s390 files

 _includes/downloads/experimental.html | 21 +++++++++++++++++----
 _includes/downloads/s390.html         |  7 -------
 _includes/downloads/sh.html           |  7 -------
 downloads/index.html                  | 16 +---------------
 4 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/_includes/downloads/experimental.html b/_includes/downloads/experimental.html
index e6fc030..0adc955 100644
--- a/_includes/downloads/experimental.html
+++ b/_includes/downloads/experimental.html
@@ -1,12 +1,25 @@
 <div class="col-xs-12 col-md-6">
-  <h4>mips</h4>
+  <h4 id="mips">mips</h4>
   <div class="list-group">
     <a href="http://distfiles.gentoo.org/experimental/mips/stages/" data-relurl="../experimental/mips/stages/" class="list-group-item download-link download-link-mirrorable">
       <span class="fa fa-download fa-fw"></span>
       <strong>MIPS stages</strong>
     </a>
   </div>
-</div>
-<div class="col-xs-12 col-md-6">
 
-</div>
\ No newline at end of file
+  <h4 id="s390">s390</h4>
+  <div class="list-group">
+    <a href="http://distfiles.gentoo.org/releases/s390/autobuilds/" data-relurl="../releases/s390/stages/" class="list-group-item download-link download-link-mirrorable">
+      <span class="fa fa-download fa-fw"></span>
+      <strong>S390 stages and boot media</strong>
+    </a>
+  </div>
+
+  <h4 id="sh">sh</h4>
+  <h5>Stage Archives</h5>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="sh" id="sh4" title="Stage 3" tag="SH4" %}
+    {% include partials/download-link.html type="stage3" arch="sh" id="sh4a" title="Stage 3" tag="SH4A" %}
+  </div>
+</div>
+<div class="col-xs-12 col-md-6">&nbsp;</div>

diff --git a/_includes/downloads/s390.html b/_includes/downloads/s390.html
deleted file mode 100644
index a93064b..0000000
--- a/_includes/downloads/s390.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="col-xs-12 col-md-6">
-  <h4>Stage Archives</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="s390" id="s390" title="Stage 3" tag="S390" %}
-    {% include partials/download-link.html type="stage3" arch="s390" id="s390x" title="Stage 3" tag="S390X" %}
-  </div>
-</div>
\ No newline at end of file

diff --git a/_includes/downloads/sh.html b/_includes/downloads/sh.html
deleted file mode 100644
index 8bd2b03..0000000
--- a/_includes/downloads/sh.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="col-xs-12 col-md-6">
-  <h4>Stage Archives</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="sh" id="sh4" title="Stage 3" tag="SH4" %}
-    {% include partials/download-link.html type="stage3" arch="sh" id="sh4a" title="Stage 3" tag="SH4A" %}
-  </div>
-</div>
\ No newline at end of file

diff --git a/downloads/index.html b/downloads/index.html
index 610dddf..bcf15fc 100644
--- a/downloads/index.html
+++ b/downloads/index.html
@@ -67,8 +67,6 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });"
       <li><a href="#hppa" data-toggle="tab"><strong>hppa</strong></a></li>
       <li><a href="#ia64" data-toggle="tab"><strong>ia64</strong></a></li>
       <li><a href="#ppc" data-toggle="tab"><strong>ppc</strong></a></li>
-      <li><a href="#s390" data-toggle="tab"><strong>s390</strong></a></li>
-      <li><a href="#sh" data-toggle="tab"><strong>sh</strong></a></li>
       <li><a href="#sparc" data-toggle="tab"><strong>sparc</strong></a></li>
       <li><a href="#experimental" data-toggle="tab"><strong>(experimental)</strong></a></li>
     </ul>
@@ -116,18 +114,6 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });"
           {% include downloads/ppc.html %}
         </div>
       </div>
-      <div class="tab-pane active" id="s390">
-        <h3>s390</h3>
-        <div class="row">
-          {% include downloads/s390.html %}
-        </div>
-      </div>
-      <div class="tab-pane active" id="sh">
-        <h3>sh</h3>
-        <div class="row">
-          {% include downloads/sh.html %}
-        </div>
-      </div>
       <div class="tab-pane active" id="sparc">
         <h3>sparc</h3>
         <div class="row">
@@ -147,4 +133,4 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });"
 <h2>Gentoo DVDs and CDs</h2>
 <p>
   If you simply don't have the ability to download the large DVD or CD images, then you may wish to purchase a <a href="/inside-gentoo/stores/">Gentoo DVD or CD</a>.
-</p>
\ No newline at end of file
+</p>