From 2e3b3b4c18ba6083b3afb4e32ac99561ef4dc530 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Sep 30 2017 20:22:06 +0000
Subject: add disclaimer for Server we are not releasing F27 Beta traditional Server - also fix Atomic prerelease section


---

diff --git a/getfedora.org/data/content/atomic/download/index.html b/getfedora.org/data/content/atomic/download/index.html
index 4fd890d..c3e522b 100644
--- a/getfedora.org/data/content/atomic/download/index.html
+++ b/getfedora.org/data/content/atomic/download/index.html
@@ -334,6 +334,32 @@
             <li><p><a class="download-cloud-splash" href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Docker/x86_64/images/Fedora-Docker-Base-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.x86_64.tar.xz">${_('Docker Image (%sMB)') % global_variables.iso_size['x86_64_docker']}</a></p></li>
             <li><p><a href="https://cloud.fedoraproject.org/">Fedora Cloud Base images</a></p></li>
           </ul>
+
+        <div class="top-space bottom-margin">
+            <py:choose>
+            <py:when test="global_variables.release['curr_state'] == 'Alpha'">
+              <div class="prerelease-box">
+                <h5>${Markup(_('F%(rel)s Alpha')) % {'rel':global_variables.release['next_id']}}</h5>
+                <h4>${_('Try a pre-release')}</h4>
+                <p>${_('We\'re working on our next release.')}<br />
+                    ${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_id']}}</p>
+                <p><i class="fa fa-fw fa-sm header-icon fa-download"></i><a href="../prerelease">${Markup(_('Download F%(rel)s Alpha images')) % {'rel':global_variables.release['next_id']}}</a></p>
+                <p><i class="fa fa-fw fa-sm header-icon fa-book"></i><a href="//fedoraproject.org/wiki/QA/Join#release-validation">${_('How to test pre-releases')}</a></p>
+              </div>
+            </py:when>
+            <py:when test="global_variables.release['curr_state'] == 'Beta'">
+              <div class="prerelease-box">
+                <h5>${Markup(_('F%(rel)s Beta')) % {'rel':global_variables.release['next_id']}}</h5>
+                <h4>${_('Try a pre-release')}</h4>
+                <p>${_('We\'re working on our next release.')}<br />
+                    ${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_id']}}</p>
+                <p><i class="fa fa-fw fa-sm header-icon fa-download"></i><a href="../prerelease">${Markup(_('Download F%(rel)s Beta images')) % {'rel':global_variables.release['next_id']}}</a></p>
+                <p><i class="fa fa-fw fa-sm header-icon fa-book"></i><a href="//fedoraproject.org/wiki/QA/Join#release-validation">${_('How to test pre-releases')}</a></p>
+              </div>
+            </py:when>
+          </py:choose>
+          </div>
+
         <div class="top-space bottom-margin"><h4>${_('Resources')}</h4></div>
           <p><i class="fa fa-fw fa-sm header-icon fa-globe"></i>${Markup(_('&lt;a href="https://www.projectatomic.io/docs/quickstart/"&gt;&lt;strong&gt;Project Atomic: Getting Started&lt;/strong&gt;&lt;/a&gt;'))}</p>
           <div class="pull-right bottom-step"><p>${_('Documentation on getting started using Project Atomic / Atomic Host.')}</p></div>
diff --git a/getfedora.org/data/content/server/download/index.html b/getfedora.org/data/content/server/download/index.html
index c2c1d0e..ad111c6 100644
--- a/getfedora.org/data/content/server/download/index.html
+++ b/getfedora.org/data/content/server/download/index.html
@@ -38,6 +38,9 @@
   </header>
     <div class="container recover-heading top-space">
       <div class="row">
+        <p class="warning">${Markup(_('Are you looking for the Fedora 27 Server Beta? We\'re hard at work revamping Fedora Server to be built with &lt;a href="%(modularity)s"&gt;Modularity&lt;/a&gt; based on feedback from the &lt;a href="%(boltron)s"&gt;Boltron tech preview&lt;/a&gt;. Stay tuned for a beta release in several weeks. Read more on &lt;a href="%(fedmag)s"&gt;Fedora Magazine&lt;/a&gt;. Or, download Fedora 26 Server below.') % {'modularity':'https://docs.pagure.org/modularity/', 'boltron':'https://fedoramagazine.org/announcing-boltron/', 'fedmag':'https://fedoramagazine.org/where-is-fedora-server-27-beta/'})}
+        </p>
+
         <div class="col-md-8 text-left bottom-space top-space">
           <p>${_('The Fedora Server installation image allows you to make media for your computer that boots to the installer to directly install Fedora Server on to your hard drive')}</p>
           <p>${_('To use this image, you need a drive that can create or "burn" DVDs, or a USB flash drive at least as big as the image.')}</p>
@@ -54,7 +57,7 @@
           <li><p><a class="server-download-splash" href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${Markup(_('64-bit %sMB image')) % global_variables.iso_size['x86_64_server_net']}</a></p></li>
           </ul>
           </p>
-          <div class="top-space bottom-margin">
+<!--          <div class="top-space bottom-margin">
             <py:choose>
             <py:when test="global_variables.release['curr_state'] == 'Alpha'">
               <div class="prerelease-box">
@@ -78,6 +81,7 @@
             </py:when>
           </py:choose>
           </div>
+          -->
           <div class="bottom-margin">
             <h3>${_('Get more Fedora')}</h3>
             <div class="bottom-margin">