#1001 [spins] [labs] Remove verify and splash issues + misc. (#993)
Merged a month ago by codeblock. Opened a month ago by pfrields.
pfrields/fedora-websites issue-993  into  master

@@ -227,9 +227,6 @@ 

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

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

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

            </div>

        </div>

      </div>

@@ -35,9 +35,6 @@ 

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

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

          </div>

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

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

-         </div>

      </div>

  

      <div class="row bottom-space">

@@ -49,9 +46,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

              <p>${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}</p>

              <ul>

+                 <li><code>3C3359C4</code> - ${_('Fedora 31')}</li>

                  <li><code>CFC659B9</code> - ${_('Fedora 30')}</li>

                  <li><code>429476B4</code> - ${_('Fedora 29')}</li>

-                 <li><code>9DB62FB1</code> - ${_('Fedora 28')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

              <p>${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}</p>

@@ -8,11 +8,11 @@ 

  <!-- Blurb to show if the spin/lab fails the final build -->

    <div class="row">

      <div class="col-md-12 text-center">

-       <p class="warning">${Markup(_('Although the Design Suite, Jam, Robotics Suite and Scientific spins failed to compose for the actual prerelease, the nightly test compose contains the same package set, and should meet most users\' needs. You can download and verify the test compose images for &lt;a href="%(x86_64)s"&gt;64-bit&lt;/a&gt; and &lt;a href="%(i386)s"&gt;32-bit&lt;/a&gt; architectures.') % {'x86_64':global_variables.path['devel_labs'] + '/' + global_variables.release['next_id'] + '/Spins/x86_64/iso', 'i386':global_variables.path['devel_alt'] + '/' + global_variables.release['next_id'] + '/Spins/i386/iso'})}

+       <p class="warning">${Markup(_('Although the Design Suite, Jam, Robotics Suite and Scientific spins failed to compose for the actual prerelease, the nightly test compose contains the same package set, and should meet most users\' needs. You can download and verify the test compose images for &lt;a href="%(x86_64)s"&gt;64-bit&lt;/a&gt; architecture.') % {'x86_64':global_variables.path['devel_labs'] + '/' + global_variables.release['next_id'] + '/Spins/x86_64/iso'})}

        </p>

      </div>

    </div>

  <!-- end blurb -->

  

  

- </html> 

\ No newline at end of file

+ </html>

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

    <div class="row">

      <div class="col-md-12 text-center">

  	    <!--<p class="warning">${Markup(_('Although this spin failed to compose for the final release, this test compose contains fixes over the final content to allow for a successful compose and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for &lt;a href="%(x86_64)s"&gt;64-bit&lt;/a&gt; and &lt;a href="%(i386)s"&gt;32-bit&lt;/a&gt; images.') % {'x86_64':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/x86_64/Fedora-UNOFFICIAL-' + global_variables.release['curr_id']  + '-' + global_variables.release['unofficial_compose'] + '.1-x86_64-CHECKSUM', 'i386':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/i386/Fedora-UNOFFICIAL-' + global_variables.release['curr_id']  + '-' + global_variables.release['unofficial_compose'] + '.1-i386-CHECKSUM'})}-->

-       <p class="warning">${Markup(_('Although this spin failed to compose for the final release, this test compose contains fixes over the final content to allow for a successful compose and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for 64-bit and 32-bit images.'))}

+       <p class="warning">${Markup(_('Although this spin failed to compose for the final release, this test compose contains fixes over the final content to allow for a successful compose and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for 64-bit images.'))}

        </p>

      </div>

    </div>

@@ -203,9 +203,6 @@ 

              <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']}-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> -->

-             </div>

            </div>

        </div>

      </div>

@@ -35,9 +35,6 @@ 

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

            <a class="btn btn-default btn-topmargin" href="${path}/static/checksums/Fedora-Spins-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('Verify 64-bit!')}</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['curr_id']}-${global_variables.release['RC_gold']}-i386-CHECKSUM">${_('Verify 32-bit!')}</a>

-         </div>

      </div>

  

      <div class="row bottom-space">

@@ -49,9 +46,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

              <p>${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}</p>

              <ul>

+                 <li><code>3C3359C4</code> - ${_('Fedora 31')}</li>

                  <li><code>CFC659B9</code> - ${_('Fedora 30')}</li>

                  <li><code>429476B4</code> - ${_('Fedora 29')}</li>

-                 <li><code>9DB62FB1</code> - ${_('Fedora 28')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

              <p>${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}</p>

@@ -11,10 +11,6 @@ 

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

                <a class="btn btn-default btn-topmargin" href="${path}/static/checksums/Fedora-UNOFFICIAL-${global_variables.release['curr_id']}-${global_variables.release['RC_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['curr_id']}-${global_variables.release['RC_gold']}-i386-CHECKSUM">${_('Verify 32bit!')}</a>

-             </div>

- -->

            </div>

  

- </html> 

\ No newline at end of file

+ </html>

@@ -11,9 +11,6 @@ 

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

                <a class="btn btn-default btn-topmargin" href="${path}/static/checksums/Fedora-Spins-${global_variables.release['curr_id']}-${global_variables.release['RC_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['curr_id']}-${global_variables.release['RC_gold']}-i386-CHECKSUM">${_('Verify 32bit!')}</a>

-             </div>

  

            </div>