From adf51075d498fb06141b039e6ebaf6c7a7924f7d Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Oct 02 2017 15:11:44 +0000 Subject: [PATCH 1/2] atomic: remove duplicate pre-release side bar links There were two sets of side bar links pointing to pre-release material. Remove the one that referred to Beta. --- diff --git a/getfedora.org/data/content/atomic/download/index.html b/getfedora.org/data/content/atomic/download/index.html index c3e522b..4fd890d 100644 --- a/getfedora.org/data/content/atomic/download/index.html +++ b/getfedora.org/data/content/atomic/download/index.html @@ -334,32 +334,6 @@

  • ${_('Docker Image (%sMB)') % global_variables.iso_size['x86_64_docker']}

  • Fedora Cloud Base images

    • - -
    - - -
    -
    ${Markup(_('F%(rel)s Alpha')) % {'rel':global_variables.release['next_id']}}
    -

    ${_('Try a pre-release')}

    -

    ${_('We\'re working on our next release.')}
    - ${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_id']}}

    -

    ${Markup(_('Download F%(rel)s Alpha images')) % {'rel':global_variables.release['next_id']}}

    -

    ${_('How to test pre-releases')}

    -
    -     - -
    -
    ${Markup(_('F%(rel)s Beta')) % {'rel':global_variables.release['next_id']}}
    -

    ${_('Try a pre-release')}

    -

    ${_('We\'re working on our next release.')}
    - ${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_id']}}

    -

    ${Markup(_('Download F%(rel)s Beta images')) % {'rel':global_variables.release['next_id']}}

    -

    ${_('How to test pre-releases')}

    -
    -     -     -
    -

    ${_('Resources')}

    ${Markup(_('<a href="https://www.projectatomic.io/docs/quickstart/"><strong>Project Atomic: Getting Started</strong></a>'))}

    ${_('Documentation on getting started using Project Atomic / Atomic Host.')}

    From b9667d3cf950e0fdbff54c00f7f2ca67c4fd8d46 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Oct 02 2017 16:42:59 +0000 Subject: [PATCH 2/2] atomic: move pre-release box up higher on sidebar --- diff --git a/getfedora.org/data/content/atomic/download/index.html b/getfedora.org/data/content/atomic/download/index.html index 4fd890d..e5f004c 100644 --- a/getfedora.org/data/content/atomic/download/index.html +++ b/getfedora.org/data/content/atomic/download/index.html @@ -334,6 +334,22 @@

  • ${_('Docker Image (%sMB)') % global_variables.iso_size['x86_64_docker']}

  • Fedora Cloud Base images

    • + +
    + + +
    +
    ${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}
    +

    ${_('Try a pre-release')}

    +

    ${_('We\'re working on our next release.')}
    + ${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_atomic_id']}}

    +

    ${Markup(_('Download F%(rel)s %(state)s images')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}

    +

    ${_('How to test pre-releases')}

    +
    +     +     +
    +

    ${_('Resources')}

    ${Markup(_('<a href="https://www.projectatomic.io/docs/quickstart/"><strong>Project Atomic: Getting Started</strong></a>'))}

    ${_('Documentation on getting started using Project Atomic / Atomic Host.')}

    @@ -341,20 +357,6 @@

    ${Markup(_('Join the upstream mailing list at <a href="%s">atomic@projectatomic.io</a>.') % ('mailto:atomic@projectatomic.io'))}

    ${Markup(_('<a href="%s"><strong>Project Atomic: IRC Chat</strong></a>') % ('https://kiwiirc.com/client/irc.freenode.net'))}

    ${Markup(_('Join the Project Atomic channel <strong>#atomic</strong></a> on <strong>irc.freenode.org</strong></a>.'))}

    -
    - - -
    -
    ${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}
    -

    ${_('Try a pre-release')}

    -

    ${_('We\'re working on our next release.')}
    - ${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_atomic_id']}}

    -

    ${Markup(_('Download F%(rel)s %(state)s images')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}

    -

    ${_('How to test pre-releases')}

    -
    -     -     -