#645 updates for atomic f26 pre-release page
Merged 2 years ago by robyduck. Opened 2 years ago by dustymabe.
dustymabe/fedora-websites dusty-atomic-prerel  into  f26-alpha

file modified
+30 -23

@@ -12,7 +12,7 @@ 

      'curr_alt_state':  'Alpha',        # either 'Alpha', 'Beta' or '' (i.e empty)

      'curr_cloud_state':  'Alpha',       # either 'Alpha', 'Beta' or '' (i.e empty)

      'curr_cloud_AMI_state':  'Alpha',   # either 'Alpha', 'Beta' or '' (i.e empty)

-     'curr_atomic_state':  'Alpha',   # either 'Alpha', 'Beta' or '' (i.e empty)

+     'curr_atomic_state':  'Pre-Release',   # No Alpha/Beta for Atomic Host

      'prev_arm_id': '24',

      'prev_alt_id': '24',

      'prev_cloud_id': '24',

@@ -66,6 +66,12 @@ 

      'atomic_age': '???',

      'pre_cloud_atomic_freshness': False,

      'pre_cloud_atomic_age': '???',

+     'manual_pre_atomic_iso_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/Atomic/x86_64/iso/Fedora-Atomic-ostree-x86_64-26-20170331.n.0.iso',

+     'manual_pre_atomic_qcow2_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Atomic-26-20170331.n.0.x86_64.qcow2',

+     'manual_pre_atomic_raw_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Atomic-26-20170331.n.0.x86_64.raw.xz',

+     'manual_pre_atomic_VBvag_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-26-20170331.n.0.x86_64.vagrant-virtualbox.box',

+     'manual_pre_atomic_libvag_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-26-20170331.n.0.x86_64.vagrant-libvirt.box',

+     'manual_pre_atomic_date': '20170331',

  }

  

  path={

@@ -262,10 +268,11 @@ 

      'pre_VBvag_cloud':         '237',   # In MB

      'pre_libvag_cloud':        '227',   # In MB

      # Manual atomic prerelease image sizes go here.

-     'manual_pre_atomic_raw_cloud':    '100',   # In MB

-     'manual_pre_atomic_qcow2_cloud':  '200',   # In MB

-     'manual_pre_atomic_VBvag_cloud':  '300',   # In MB

-     'manual_pre_atomic_libvag_cloud': '400',   # In MB

+     'manual_pre_atomic_raw_cloud':    '446',   # In MB

+     'manual_pre_atomic_qcow2_cloud':  '551',   # In MB

+     'manual_pre_atomic_VBvag_cloud':  '539',   # In MB

+     'manual_pre_atomic_libvag_cloud': '529',   # In MB

+     'manual_pre_atomic_iso':          '854',   # In MB

      # Everything release

      'x86_64_ev':        '477',   #In MB

      'i386_ev':          '465',   #In MB

@@ -426,25 +433,25 @@ 

  }

  

  pre_HVM_atomic_AMI={

-     #'us-east-1':        'ami-7d1a6c18',     # Virginia

-     #'us-west-2':        'ami-c5f5eaf5',     # Oregon

-     #'us-west-1':        'ami-2945806d',     # California

-     #'eu-west-1':        'ami-b5b895c2',     # Ireland

-     #'eu-central-1':     'ami-b28eb0af',     # Frankfurt

-     #'ap-southeast-1':   'ami-9e9683cc',     # Singapore

-     #'ap-northeast-1':   'ami-28d04628',     # Tokyo

-     #'ap-southeast-2':   'ami-2f165815',     # Sydney

-     #'sa-east-1':        'ami-9b0c9986'      # Sao Paolo

+     'us-east-1':        'ami-0fff7a19',     # Virginia

+     'us-west-2':        'ami-f12abe91',     # Oregon

+     'us-west-1':        'ami-2f0e544f',     # California

+     'eu-west-1':        'ami-8dbe81eb',     # Ireland

+     'eu-central-1':     'ami-ddc515b2',     # Frankfurt

+     'ap-southeast-1':   'ami-9ffd42fc',     # Singapore

+     'ap-northeast-1':   'ami-15785c72',     # Tokyo

+     'ap-southeast-2':   'ami-afd7d8cc',     # Sydney

+     'sa-east-1':        'ami-c81370a4'      # Sao Paolo

  }

  

  pre_GP2_HVM_atomic_AMI={

-     #'us-east-1':        'ami-bf1d6bda',     # Virginia

-     #'us-west-2':        'ami-e9f5ead9',     # Oregon

-     #'us-west-1':        'ami-23458067',     # California

-     #'eu-west-1':        'ami-c7b895b0',     # Ireland

-     #'eu-central-1':     'ami-ac8eb0b1',     # Frankfurt

-     #'ap-southeast-1':   'ami-909683c2',     # Singapore

-     #'ap-northeast-1':   'ami-12d54312',     # Tokyo

-     #'ap-southeast-2':   'ami-3716580d',     # Sydney

-     #'sa-east-1':        'ami-9d0c9980'      # Sao Paolo

+     'us-east-1':        'ami-1efe7b08',     # Virginia

+     'us-west-2':        'ami-832abee3',     # Oregon

+     'us-west-1':        'ami-a40e54c4',     # California

+     'eu-west-1':        'ami-2fbb8449',     # Ireland

+     'eu-central-1':     'ami-0bc61664',     # Frankfurt

+     'ap-southeast-1':   'ami-b7fa45d4',     # Singapore

+     'ap-northeast-1':   'ami-f3795d94',     # Tokyo

+     'ap-southeast-2':   'ami-17d5da74',     # Sydney

+     'sa-east-1':        'ami-881370e4'      # Sao Paolo

  }

@@ -343,23 +343,13 @@ 

            <div class="pull-right bottom-margin"><p>${Markup(_('Join the Project Atomic channel &lt;strong&gt;#atomic&lt;/strong&gt;&lt;/a&gt; on &lt;strong&gt;irc.freenode.org&lt;/strong&gt;&lt;/a&gt;.'))}</p></div>

            <div class="top-space bottom-margin">

              <py:choose>

-             <py:when test="global_variables.release['curr_atomic_state'] == 'Alpha'">

+             <py:when test="global_variables.release['curr_atomic_state'] == 'Pre-Release'">

                <div class="prerelease-box">

-                 <h5>${Markup(_('F%(rel)s Alpha')) % {'rel':global_variables.release['next_atomic_id']}}</h5>

+                 <h5>${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</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_atomic_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_atomic_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_atomic_state'] == 'Beta'">

-               <div class="prerelease-box">

-                 <h5>${Markup(_('F%(rel)s Beta')) % {'rel':global_variables.release['next_atomic_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_atomic_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_atomic_id']}}</a></p>

+                 <p><i class="fa fa-fw fa-sm header-icon fa-download"></i><a href="../prerelease">${Markup(_('Download F%(rel)s %(state)s images')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</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>

@@ -34,7 +34,7 @@ 

            <h2>${Markup(_('Download Fedora %(rel)s %(state)s Atomic Host')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</h2>

              <p>${_('Atomic Host is built every 2 weeks or so.')}</p>

              <p py:if="not global_variables.release['atomic_freshness']">${Markup(_('The latest two week build did not meet our testing criteria. The images available are from over %(atomic_age)s days ago. Check the Project Atomic blog for updates and information about Atomic blocker bugs.') % global_variables.release)}</p>

-             <p py:if="global_variables.release['atomic_freshness']">${Markup(_('These are the latest official Fedora Atomic Host images, produced %(atomic_age)s days ago.') % global_variables.release)}</p>

+             <p py:if="global_variables.release['atomic_freshness']">${Markup(_('These are the latest Fedora Atomic Host images, produced on %(manual_pre_atomic_date)s.') % global_variables.release)}</p>

          </div>

        </div>

      </div>

@@ -47,12 +47,6 @@ 

            <div class="col-xs-12">

            <p class="warning">${Markup(_('This is pre-release software and is supported by the &lt;a href="%(team_url)s"&gt;Cloud Working Group&lt;/a&gt;. Please direct questions to their &lt;a href="%(team_list)s"&gt;mailing list&lt;/a&gt; or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})}

            ${Markup(_('All issues or bugs should be reported via the &lt;a href="%s"&gt;Red Hat Bugzilla&lt;/a&gt;. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}

-           <py:choose>

-             <py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the &lt;a href="%(relnotes_url)s"&gt;Release Notes&lt;/a&gt; for more information on changes and new features, and the &lt;a href="%(commonbugs_url)s"&gt;Common Bugs&lt;/a&gt; page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_atomic_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_atomic_id'])})}

-             </py:when>

-             <py:when test="global_variables.release['curr_state'] == 'Beta'">${Markup(_('Read the &lt;a href="%(relnotes_url)s"&gt;Release Notes&lt;/a&gt; for more information on changes and new features, and the &lt;a href="%(commonbugs_url)s"&gt;Common Bugs&lt;/a&gt; page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_atomic_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_atomic_id'])})}

-             </py:when>

-           </py:choose>

          </p>

            </div>

        </div>

@@ -88,9 +82,9 @@ 

                      </thead>

                      <tbody>

                        <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI" class="hidden-xs">${global_variables.GP2_HVM_atomic_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.GP2_HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                         <td py:if="r.code in global_variables.pre_GP2_HVM_atomic_AMI">${_(r.long)}</td>

+                         <td py:if="r.code in global_variables.pre_GP2_HVM_atomic_AMI" class="hidden-xs">${global_variables.pre_GP2_HVM_atomic_AMI[r.code]}</td>

+                         <td py:if="r.code in global_variables.pre_GP2_HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                        </tr>

                      </tbody>

                    </table>

@@ -120,9 +114,9 @@ 

                      </thead>

                      <tbody>

                        <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.HVM_atomic_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.HVM_atomic_AMI" class="hidden-xs">${global_variables.HVM_atomic_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                         <td py:if="r.code in global_variables.pre_HVM_atomic_AMI">${_(r.long)}</td>

+                         <td py:if="r.code in global_variables.pre_HVM_atomic_AMI" class="hidden-xs">${global_variables.pre_HVM_atomic_AMI[r.code]}</td>

+                         <td py:if="r.code in global_variables.pre_HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                        </tr>

                      </tbody>

                    </table>

@@ -164,9 +158,9 @@ 

                      </thead>

                      <tbody>

                        <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI" class="hidden-xs">${global_variables.GP2_HVM_atomic_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.GP2_HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                         <td py:if="r.code in global_variables.pre_GP2_HVM_atomic_AMI">${_(r.long)}</td>

+                         <td py:if="r.code in global_variables.pre_GP2_HVM_atomic_AMI" class="hidden-xs">${global_variables.pre_GP2_HVM_atomic_AMI[r.code]}</td>

+                         <td py:if="r.code in global_variables.pre_GP2_HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                        </tr>

                      </tbody>

                    </table>

@@ -194,9 +188,9 @@ 

                      </thead>

                      <tbody>

                        <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.HVM_atomic_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.HVM_atomic_AMI" class="hidden-xs">${global_variables.HVM_atomic_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                         <td py:if="r.code in global_variables.pre_HVM_atomic_AMI">${_(r.long)}</td>

+                         <td py:if="r.code in global_variables.pre_HVM_atomic_AMI" class="hidden-xs">${global_variables.pre_HVM_atomic_AMI[r.code]}</td>

+                         <td py:if="r.code in global_variables.pre_HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                        </tr>

                      </tbody>

                    </table>

@@ -223,14 +217,14 @@ 

  	              <div class="col-xs-12">

  	                <h5 class="bold">${_('VirtualBox Image')}</h5>

  	                <p>${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}</p>

- 	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>

+ 	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['manual_pre_atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>

  	                  <p class="caption">${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_atomic_VBvag_cloud']}</p>

  	              </div>

  	              <div class="col-xs-12">

  	                <h5 class="bold">${_('libvirt/KVM Image')}</h5>

  	                <p>${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}</p>

- 	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>

- 	                  <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_atomic_libvag_cloud']}</p>

+ 	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['manual_pre_atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>

+ 	                  <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['manual_pre_atomic_libvag_cloud']}</p>

  	              </div>

  	            </div>

  

@@ -247,12 +241,12 @@ 

  	            </div>

  	            <div class="row hidden-xs">

  	              <div class="col-sm-6">

- 	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>

- 	                  <p class="caption">${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_atomic_VBvag_cloud']}</p>

+ 	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['manual_pre_atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>

+ 	                  <p class="caption">${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['manual_pre_atomic_VBvag_cloud']}</p>

  	              </div>

  	              <div class="col-sm-6">

- 	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>

- 	                  <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_atomic_libvag_cloud']}</p>

+ 	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['manual_pre_atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>

+ 	                  <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['manual_pre_atomic_libvag_cloud']}</p>

  	              </div>

  	            </div>

  	          </div>

@@ -266,9 +260,9 @@ 

  	              <div class="col-xs-12">

  	              	<h4 class="bold">${_('Vagrant Downloads using Vagrant tools')}</h4>

  	              	<p>${Markup(_('You can use the following command to grab the Vagrant Box images from &lt;a href="%s"&gt;HashiCorp\'s Atlas&lt;/a&gt;.') % ('https://atlas.hashicorp.com/fedora'))}</p>

- 	                <pre>vagrant box add fedora/${global_variables.release['next_atomic_id']}_${global_variables.release['curr_atomic_state']}-atomic-host</pre>

+ 	                <pre>vagrant box add fedora/prerelease-${global_variables.release['next_atomic_id']}-atomic-host</pre>

  	                <p>${Markup(_('If you\'ve previously run Fedora %(rel)s Atomic Host in Vagrant on your machine then you can get the latest version by running:')) % {'rel':global_variables.release['curr_atomic_id']}}</p>

- 	                <pre>vagrant box update --box=fedora/${global_variables.release['next_atomic_id']}_${global_variables.release['curr_atomic_state']}-atomic-host</pre>

+ 	                <pre>vagrant box update --box=fedora/prerelease-${global_variables.release['next_atomic_id']}-atomic-host</pre>

  	              </div>

  	            </div>

  	          </div>

@@ -292,14 +286,14 @@ 

  		          <div class="col-xs-12">

  		            <h5 class="bold">${_('qcow2 Image')}</h5>

  		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>

- 		            <a class="btn btn-success download-cloud" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>

- 		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}</p>

+ 		            <a class="btn btn-success download-cloud" href="${global_variables.release['manual_pre_atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>

+ 		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['manual_pre_atomic_qcow2_cloud']}</p>

  		          </div>

  		          <div class="col-xs-12">

  		            <h5 class="bold">${_('Raw Image')}</h5>

  		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>

- 		            <a class="btn btn-success download-cloud" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>

- 		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}</p>

+ 		            <a class="btn btn-success download-cloud" href="${global_variables.release['manual_pre_atomic_raw_cloud_url']}" role="button">${_('Download')}</a>

+ 		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['manual_pre_atomic_raw_cloud']}</p>

  		          </div>

  		      </div>

  		      <!-- Desktop -->

@@ -315,12 +309,12 @@ 

  		      </div>

  		      <div class="row hidden-xs">

  		          <div class="col-sm-6">

- 		            <a class="btn btn-success download-cloud" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>

- 		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}</p>

+ 		            <a class="btn btn-success download-cloud" href="${global_variables.release['manual_pre_atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>

+ 		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['manual_pre_atomic_qcow2_cloud']}</p>

  		          </div>

  		          <div class="col-sm-6">

- 		            <a class="btn btn-success download-cloud" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>

- 		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}</p>

+ 		            <a class="btn btn-success download-cloud" href="${global_variables.release['manual_pre_atomic_raw_cloud_url']}" role="button">${_('Download')}</a>

+ 		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['manual_pre_atomic_raw_cloud']}</p>

  		          </div>

  		      </div>

        <!-- end Base images -->

@@ -332,9 +326,7 @@ 

      <div class="col-md-3 col-xs-12 col-md-offset-1 top-margin">

          <h3>${_('Other Downloads')}</h3>

            <ul>

-             <li><p><a class="download-cloud-splash" href="${global_variables.path['download_atomic']}/stable/Fedora-Atomic-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}/Atomic/x86_64/iso/Fedora-Atomic-ostree-x86_64-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}.iso">${_('Atomic Host ISO image (%sMB)') % global_variables.iso_size['pre_atomic_iso']}</a></p></li>

-             <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['pre_x86_64_docker']}</a></p></li>

-             <li><p><a href="https://cloud.fedoraproject.org/">Fedora Cloud Base images</a></p></li>

+             <li><p><a href="${global_variables.release['manual_pre_atomic_iso_url']}">${_('Atomic Host ISO image (%sMB)') % global_variables.iso_size['manual_pre_atomic_iso']}</a></p></li>

            </ul>

          <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>

no initial comment

rebased

2 years ago

Pull-Request has been merged by robyduck

2 years ago