fedora-websites

Clone

#977 Fixes for 31 Beta
Merged 3 months ago by codeblock. Opened 3 months ago by pfrields.
pfrields/fedora-websites 31-beta-fixes  into  master

file modified
+8 -8 

@@ -7,9 +7,9 @@ 
 

      'next_id':     '31',
 

      'curr_name':   '',
 

      'next_name':   '',
 

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

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

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

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

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

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

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

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

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

@@ -60,12 +60,12 @@ 
 

      'RC_gold_aarch64': '1.2',     # RC Gold for aarch64
 

      'RC_gold_ppc64': '1.2',       # RC Gold for ppc64
 

      'RC_gold_s390x': '1.2',       # RC Gold for s390x
 

-     'RC_pre_gold': '1.8',         # insert the number of the prerelease RC version declared GOLD
 

+     'RC_pre_gold': '1.1',         # insert the number of the prerelease RC version declared GOLD
 

      'RC_pre_build': '2',        # sometimes releng use the RC build
 

-     'RC_pre_gold_aarch64': '1.8', # Pre RC Gold for aarch64
 

-     'RC_pre_gold_ppc64': '1.8',   # Pre RC Gold for ppc64
 

-     'RC_pre_gold_ppc64le': '1.8', # Pre RC Gold for ppc64le
 

-     'RC_pre_gold_s390x': '1.8',   # Pre RC Gold for s390x
 

+     'RC_pre_gold_aarch64': '1.1', # Pre RC Gold for aarch64
 

+     'RC_pre_gold_ppc64': '1.1',   # Pre RC Gold for ppc64
 

+     'RC_pre_gold_ppc64le': '1.1', # Pre RC Gold for ppc64le
 

+     'RC_pre_gold_s390x': '1.1',   # Pre RC Gold for s390x
 

  

      'atomic_qcow2_cloud_url': 'FIXME',
 

      'atomic_raw_cloud_url': 'FIXME',

file modified
+20 -16 

@@ -47,10 +47,10 @@ 
 

                  <a class="btn btn-success btn-pre" href="${global_variables.path['download_spins']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/x86_64/iso/Fedora-Astronomy_KDE-Live-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">64-bit image</a>
 

                  <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Astronomy']}</h5>
 

                </div>
 

-               <div class="col-xs-6 text-center">
 

-                 <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/i386/iso/Fedora-Astronomy_KDE-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-                 <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Astronomy']}</h5>
 

-               </div>
 

+               <!-- <div class="col-xs-6 text-center"> -->
 

+               <!--   <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/i386/iso/Fedora-Astronomy_KDE-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+               <!--   <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Astronomy']}</h5> -->
 

+               <!-- </div> -->
 

              </div>
 

             </div>
 

            </div>
 

@@ -69,15 +69,16 @@ 
 

      	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_spins']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/x86_64/iso/Fedora-Design_suite-Live-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">64-bit image</a>
 

      	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Design']}</h5>
 

    	  	  		</div>
 

-   	  	  		<div class="col-xs-6 text-center">
 

-     	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/i386/iso/Fedora-Design_suite-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-     	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Design']}</h5>
 

-   	  	  		</div>
 

+   	  	  		<!-- <div class="col-xs-6 text-center"> -->
 

+     	  	  		<!-- <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/i386/iso/Fedora-Design_suite-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+     	  	  		<!-- <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Design']}</h5> -->
 

+   	  	  		<!-- </div> -->
 

    	  	  	</div>
 

    	  	   </div>
 

    	  	  </div>
 

         </div>
 

  

+ <!--
 

         <div class="row top-margin">
 

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

      	  	<div class="col-xs-12 col-sm-4 text-center no-leftpadding">
 

@@ -97,7 +98,8 @@ 
 

    	  	  </div>
 

    	  	 </div>
 

    	   </div>
 

- 

+ -->
 

+        

  <!--
 

         <div class="high">
 

      	  <div class="row top-margin">
 

@@ -122,6 +124,7 @@ 
 

         </div>
 

  -->
 

  

+ <!--
 

         <div class="high">
 

          <div class="row top-margin">
 

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

@@ -131,10 +134,10 @@ 
 

            <div class="col-xs-12 col-sm-8 text-left">
 

              <p class="screenshot"><img src="${path}/static/images/python-classroom-lab-pre-banner.png" alt="Python Classroom Lab banner" /><br />
 

              <span class="grey">${_('Teach Python with ease.')}</span></p>
 

-               <!-- <div class="col-xs-6 text-center">
 

+               <div class="col-xs-6 text-center">
 

                  <a class="btn btn-success btn-pre" href="${global_variables.path['download_spins']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/x86_64/iso/Fedora-Python-Classroom-Live-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">64-bit image</a>
 

                  <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Python']}</h5>
 

- 	      </div>-->
 

+ 	      </div>
 

                <div class="col-xs-6 text-center">
 

                  <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/i386/iso/Fedora-Python-Classroom-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

                  <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Python']}</h5>
 

@@ -143,7 +146,8 @@ 
 

             </div>
 

            </div>
 

         </div>
 

- 

+ -->
 

+        

  <!--       <div class="high">
 

      	  <div class="row top-margin">
 

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

@@ -203,10 +207,10 @@ 
 

      	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_spins']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/x86_64/iso/Fedora-Security-Live-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">64-bit image</a>
 

      	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Security']}</h5>
 

    	  	  		</div>
 

-   	  	  		<div class="col-xs-6 text-center">
 

-     	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/i386/iso/Fedora-Security-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-     	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Security']}</h5>
 

-   	  	  		</div>
 

+   	  	  		<!-- <div class="col-xs-6 text-center"> -->
 

+     	  	  		<!-- <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Labs/i386/iso/Fedora-Security-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+     	  	  		<!-- <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Security']}</h5> -->
 

+   	  	  		<!-- </div> -->
 

    	  	  	</div>
 

    	  	   </div>
 

    	  	  </div>

file modified
+16 -16 

@@ -50,8 +50,8 @@ 
 

      	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_KDE']}</h5>
 

    	  	  		</div>
 

    	  	  		<div class="col-xs-6 text-center">
 

-     	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-KDE-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-     	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_KDE']}</h5>
 

+     	  	  		<!-- <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-KDE-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+     	  	  		<!-- <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_KDE']}</h5> -->
 

    	  	  		</div>
 

    	  	  	</div>
 

    	  	   </div>
 

@@ -72,8 +72,8 @@ 
 

      	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Xfce']}</h5>
 

    	  	  		</div>
 

    	  	  		<div class="col-xs-6 text-center">
 

-     	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-Xfce-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-     	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Xfce']}</h5>
 

+     	  	  		<!-- <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-Xfce-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+     	  	  		<!-- <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Xfce']}</h5> -->
 

    	  	  		</div>
 

    	  	  	</div>
 

    	  	   </div>
 

@@ -94,8 +94,8 @@ 
 

      	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_LXDE']}</h5>
 

    	  	  		</div>
 

    	  	  		<div class="col-xs-6 text-center">
 

-     	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-LXDE-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-     	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_LXDE']}</h5>
 

+     	  	  		<!-- <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-LXDE-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+     	  	  		<!-- <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_LXDE']}</h5> -->
 

    	  	  		</div>
 

    	  	  	</div>
 

    	  	   </div>
 

@@ -116,8 +116,8 @@ 
 

                  <h5>${Markup(_('%s GSB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_LXQt']}</h5>
 

                </div>
 

                <div class="col-xs-6 text-center">
 

-               <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-LXQt-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-                 <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_LXQt']}</h5>
 

+               <!-- <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-LXQt-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+               <!--   <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_LXQt']}</h5> -->
 

                </div>
 

              </div>
 

             </div>
 

@@ -138,8 +138,8 @@ 
 

      	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Mate']}</h5>
 

    	  	  		</div>
 

    	  	  		<div class="col-xs-6 text-center">
 

-     	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-MATE_Compiz-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-     	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Mate']}</h5>
 

+     	  	  		<!-- <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-MATE_Compiz-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+     	  	  		<!-- <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Mate']}</h5> -->
 

    	  	  		</div>
 

    	  	  	</div>
 

    	  	   </div>
 

@@ -159,9 +159,9 @@ 
 

      	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/x86_64/iso/Fedora-Cinnamon-Live-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">64-bit image</a>
 

      	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Cinnamon']}</h5>
 

    	  	  		</div>
 

-   	  	  		<div class="col-xs-6 text-center">
 

-     	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-Cinnamon-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-     	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Cinnamon']}</h5>
 

+    	  	  		<div class="col-xs-6 text-center">
 

+     	  	  		<!-- <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-Cinnamon-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+     	  	  		<!-- <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Cinnamon']}</h5> -->
 

    	  	  		</div>
 

    	  	  	</div>
 

    	  	   </div>
 

@@ -182,8 +182,8 @@ 
 

      	  	  		<h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Soas']}</h5>
 

    	  	  		</div>
 

    	  	  		<div class="col-xs-6 text-center">
 

-    	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-SoaS-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
 

-     	  	  		<h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_i686_Live_Soas']}</h5>
 

+    	  	  		<!-- <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-SoaS-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a> -->
 

+     	  	  		<!-- <h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_i686_Live_Soas']}</h5> -->
 

    	  	  		</div>
 

    	  	  	</div>
 

    	  	   </div>
 

@@ -204,7 +204,7 @@ 
 

                <a class="btn btn-default btn-topmargin" href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-x86_64-CHECKSUM">${_('Verify 64bit!')}</a>
 

              </div>
 

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

-               <a class="btn btn-default btn-topmargin" href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-i386-CHECKSUM">${_('Verify 32bit!')}</a>
 

+               <!-- <a class="btn btn-default btn-topmargin" href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-i386-CHECKSUM">${_('Verify 32bit!')}</a> -->
 

              </div>
 

            </div>
 

        </div>

This should put things in relatively reasonable order for 31 Beta.

Pull-Request has been merged by codeblock
3 months ago
Metadata
None
No Tags
Changes Summary 3
+8 -8
file changed
build.d/globalvar.py
+20 -16
file changed
labs.fedoraproject.org/data/content/prerelease.html
+16 -16
file changed
spins.fedoraproject.org/data/content/prerelease.html
Powered by Pagure 5.8.1
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© 2014-2019 Red Hat, Inc. and others.