#746 atomic: remove duplicate pre-release side bar links
Merged 2 years ago by robyduck. Opened 2 years ago by dustymabe.
dustymabe/fedora-websites dusty-f27-beta  into  f27-beta

@@ -336,29 +336,19 @@ 

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

+           <py:choose>

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

+             <div class="prerelease-box">

+               <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 %(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>

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

@@ -367,20 +357,6 @@ 

            <div class="pull-right bottom-step"><p>${Markup(_('Join the upstream mailing list at &lt;a href="%s"&gt;atomic@projectatomic.io&lt;/a&gt;.') % ('mailto:atomic@projectatomic.io'))}</p></div>

            <p><i class="fa fa-fw fa-sm header-icon fa-comments-o"></i>${Markup(_('&lt;a href="%s"&gt;&lt;strong&gt;Project Atomic: IRC Chat&lt;/strong&gt;&lt;/a&gt;') % ('https://kiwiirc.com/client/irc.freenode.net'))}</p>

            <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'] == 'Pre-Release'">

-               <div class="prerelease-box">

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

-           </py:choose>

-           </div>

            <noscript>

            <div class="bottom-margin">

              <h3>${_('Verify')}</h3>

There were two sets of side bar links pointing to pre-release
material. Remove the one that referred to Beta.

1 new commit added

  • atomic: move pre-release box up higher on sidebar
2 years ago

Added a new commit that moves the box higher up on the side-bar

Pull-Request has been merged by robyduck

2 years ago
Metadata