From f61f598cdec29e6a81db1b52d4d1c867f0d32e29 Mon Sep 17 00:00:00 2001 From: Kamilla Kenzhekhankyzy Date: Apr 07 2020 15:38:31 +0000 Subject: [PATCH 1/2] porting alt.fedoraproject.org to getfedora.org --- diff --git a/sites/getfedora.org/main.py b/sites/getfedora.org/main.py index 4f4dba5..d1b2c0c 100644 --- a/sites/getfedora.org/main.py +++ b/sites/getfedora.org/main.py @@ -184,6 +184,7 @@ def export_route(name, path, template=None): if (re.search("^coreos_download_.*$", name)): return render_template(template or '/coreos/download/index.html') return render_template(template or path.strip('/') + '/index.html') + r.__name__ = name if freezing: # This is a bit hacky, but we want to generate index.html.langcode files @@ -221,6 +222,8 @@ export_route('iot', '/iot/') export_route('iot_download', '/iot/download/') export_route('security', '/security/') export_route('sponsors', '/sponsors/') +export_route('alt', '/alt/') +export_route('alt_download', '/alt/download/') # This is manually updated for now by calling: # python scripts/releases-json.py > static/releases.json diff --git a/sites/getfedora.org/partials/submenu.html b/sites/getfedora.org/partials/submenu.html index 4b3c96d..e0d5ffc 100644 --- a/sites/getfedora.org/partials/submenu.html +++ b/sites/getfedora.org/partials/submenu.html @@ -11,8 +11,11 @@ {% elif edition == "iot" %} {% set logoimage = 'Fedora IoT Logo' %} {% set activeclass = "active border-bottom border-fedora-purple border-width-3"%} - {% elif edition == "silverblue" %} -{% set logoimage = 'Fedora Silverblue Logo' %} +{% elif edition == "silverblue" %} + {% set logoimage = 'Fedora Silverblue Logo' %} + {% set activeclass = "active border-bottom border-fedora-darkblue border-width-3"%} +{% elif edition == "alt" %} + {% set logoimage = 'Fedora Alt Logo' %} {% set activeclass = "active border-bottom border-fedora-darkblue border-width-3"%} {% endif %}
diff --git a/sites/getfedora.org/release.yaml b/sites/getfedora.org/release.yaml index def8a24..83c082a 100644 --- a/sites/getfedora.org/release.yaml +++ b/sites/getfedora.org/release.yaml @@ -2,6 +2,64 @@ ga: announcement_url: https://fedoramagazine.org/announcing-fedora-31 announcement_release_number: 31 + alt: + server: + pretty_name: Fedora Server + release_number: 31 + rc_version: 1.9 + download_override: + netinst-x86_64: default + standard_aarch64: default + netinst_aarch64: default + standard_ppc64le: default + netinst_ppc64le: default + standard_s390x: default + netinst_s390x: default + workstation: + pretty_name: Fedora Workstation + release_number: 31 + rc_version: 1.9 + download_override: + raw_aarch64: default + minimal: + pretty_name: Fedora minimal + release_number: 31 + rc_version: 1.9 + download_override: + raw_aarch64: default + everything: + pretty_name: Everything + release_number: 31 + rc_version: 1.9 + download_override: + netinst_aarch64: default + netinst_ppc64le: default + netinst_s390x: default + cloud: + pretty_name: Fedora Cloud + release_number: 31 + rc_version: 1.9 + download_override: + qcow2_aarch64: default + qcow2_ppc64le: default + qcow2_s390x: default + cloud_raw_aarch64: default + cloud_raw_ppc64le: default + cloud_raw_s390x: default + container: + pretty_name: Fedora Container + release_number: 31 + rc_version: 1.9 + download_override: + base_aarch64: default + base_ppc64le: default + base_s390x: default + + + + + + editions: workstation: pretty_name: Fedora Workstation diff --git a/sites/getfedora.org/site/alt/download/index.html b/sites/getfedora.org/site/alt/download/index.html new file mode 100644 index 0000000..10542da --- /dev/null +++ b/sites/getfedora.org/site/alt/download/index.html @@ -0,0 +1,217 @@ +{% extends "master_getfedora.html" %} + +{% from "submenu.html" import submenu with context %} +{% from "export_regulations.html" import export_regulations %} + +{% block title %}{% trans trimmed %}Download Fedora Workstation{% endtrans %}{% endblock %} + +{% block content %} +{{submenu(edition="workstation", active="download")}} +
+
+
+
+

{% trans trimmed n=releaseinfo.ga.editions.workstation.release_number %}Download Fedora {{n}} Workstation.{% endtrans %}

+
{% trans trimmed %}We're so glad you've decided to give Fedora Workstation a try. We know you'll love it.{% endtrans %}
+
+
+
+
+ +
+
+
+
+
+

{% trans trimmed %}On Windows or MacOS?{% endtrans %}

+

+ {% trans trimmed %} + Get started by using Fedora Media Writer, which makes it super easy to give Fedora a try. + {% endtrans %} +

+
    +
  • +
    + {% trans trimmed %}Fedora Media Writer{% endtrans %} +
    +
    + + + + + + +
    +
    • +
+
+
+
+
+

{% trans trimmed %}On Linux or just want an ISO file?{% endtrans %}

+

+ {% trans trimmed link="https://docs.fedoraproject.org/en-US/quick-docs/creating-and-using-a-live-installation-image/index.html" %} + Not sure how to use this file? Learn here. + {% endtrans %} +

+
    + {% if releaseinfo.ga.editions.workstation.download_override.live_x86_64 %} +
  • +
    + {% trans trimmed n=releaseinfo.ga.editions.workstation.release_number %}Fedora {{n}}: x86_64 DVD ISO{% endtrans %} +
    +
    + + {% trans trimmed %}Download{% endtrans %} + +
    +
    • + {% endif %} + + {% if releaseinfo.beta.show and releaseinfo.beta.editions.workstation.download_override.live_x86_64 %} +
  • +
    + {% trans trimmed n=releaseinfo.beta.editions.workstation.release_number %} + Fedora {{n}}: x86_64 DVD ISO + {% endtrans %} + {% trans trimmed %}Beta!{% endtrans %} +
    +
    + + {% trans trimmed %}Download{% endtrans %} + +
    +
    • + {% endif %} + +
+
+
+
+
+
+ +
+
+
+
+

+ {% trans trimmed %}Learn more about Fedora Media Writer.{% endtrans %} +

+

+ {% trans trimmed %} + Getting going with Fedora is easier than ever. + All you need is a 2GB USB flash drive, and Fedora Media Writer. + {% endtrans %} +

+

+ {% trans trimmed %} + Once Fedora Media Writer is installed, it will set up your flash drive + to run a "Live" version of Fedora Workstation, meaning that you can boot + it from your flash drive and try it out right away without making any + permanent changes to your computer. Once you are hooked, installing it + to your hard drive is a matter of clicking a few buttons*. + {% endtrans %} +

+

+ + {% trans trimmed %} + * Fedora requires a minimum of 20GB disk, 2GB RAM, to install and run successfully. + Double those amounts is recommended. + {% endtrans %} + +

+
+
+ +
+
+
+
+ +
+
+
+
+

{% trans trimmed %}We take security seriously.{% endtrans %}

+

+ {% trans trimmed %} + Once you have downloaded an image, be sure to verify it for both security and integrity. + {% endtrans %} +

+ + {% trans trimmed %} + Verify your download. + {% endtrans %} + +
+
+

{% trans trimmed %}But wait! There's more.{% endtrans %}

+

+ {% trans trimmed %} + Need something a bit different? Check out our other Fedora + Workstation downloads here, featuring secondary architectures and + network-based installation images. + {% endtrans %} +

+
    + + {% if releaseinfo.ga.editions.workstation.download_override.live_i386 %} +
  • +
    + {% trans trimmed n=releaseinfo.ga.editions.workstation.release_number %} + Fedora {{n}}: 32-bit ISO + {% endtrans %} +
    + +
    • + {% endif %} + + {% if releaseinfo.ga.editions.workstation.download_override.netinst_x86_64 %} +
  • +
    + {% trans trimmed n=releaseinfo.ga.editions.workstation.release_number %} + Fedora {{n}}: 64-bit network install image + {% endtrans %} +
    + +
    • + {% endif %} + + {% if releaseinfo.ga.editions.workstation.download_override.netinst_i386 %} +
  • +
    + {% trans trimmed n=releaseinfo.ga.editions.workstation.release_number %} + Fedora {{n}}: 32-bit network install image + {% endtrans %} +
    + +
    • + {% endif %} + + {% if releaseinfo.beta.show and releaseinfo.beta.editions.workstation.download_override.netinst_x86_64 %} +
  • +
    + {% trans trimmed n=releaseinfo.beta.editions.workstation.release_number %} + Fedora {{n}}: 64-bit network install image + {% endtrans %} + {% trans trimmed %}Beta!{% endtrans %} +
    + +
    • + {% endif %} +
+
+
+
+
+ {{export_regulations()}} + {% endblock %} diff --git a/sites/getfedora.org/site/alt/index.html b/sites/getfedora.org/site/alt/index.html new file mode 100644 index 0000000..61e396f --- /dev/null +++ b/sites/getfedora.org/site/alt/index.html @@ -0,0 +1,173 @@ +{% extends "master_getfedora.html" %} + +{% from "feature_card.html" import feature_card with context %} +{% from "submenu.html" import submenu with context %} + +{% block title %}{% trans trimmed %}Fedora Server{% endtrans %}{% endblock %} + +{% block content %} +{{submenu(edition="alt", active="overview")}} +
+
+
+
+

{% trans trimmed %}Fedora Alternative Downloads.{% endtrans %}

+
{% trans trimmed %}Single central resource for locating alternative versions of Fedora.{% endtrans %}
+ {% trans trimmed %}Download Now{% endtrans %} +
+
+ +
+
+
+
+
+
+
+
+ +
+ {% trans trimmed %} + These Fedora downloads are either special-purpose - for testing, for specific architectures - or are more standard versions of Fedora in alternative formats such network installer format or formatted for bittorrent download. + {% endtrans %} +
+
+
+
+
+ +
+
+
+
+ +
+
+

{% trans trimmed %}Network Installers{% endtrans %}

+
+ {% trans trimmed %} + These are very small images you can use to install Fedora over the network. + {% endtrans %} +
+

{% trans trimmed %}Learn more.{% endtrans %}

+
+
+
+
+ +
+
+
+
+

{% trans trimmed %}Alternate Architectures{% endtrans %}

+
+ {% trans trimmed %} + These are additional architectures supported by Fedora beyond the standard set + {% endtrans %} +
+

{% trans trimmed %}Learn more.{% endtrans %}

+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+

{% trans trimmed %}Cloud Base Images{% endtrans %}

+
+ {% trans trimmed %} + Compressed Cloud Base Images, Cloud Images for Openstack, Vagrant and Amazon Public Cloud. + {% endtrans %} +
+

{% trans trimmed %}Learn more.{% endtrans %}

+
+
+
+
+ +
+
+
+
+

{% trans trimmed %}BitTorrent Downloads.{% endtrans %}

+
+ {% trans trimmed %} + Fedora offers many bittorrent downloads. Access our directory of torrents below: + {% endtrans %} +
+

{% trans trimmed %}Learn more.{% endtrans %}

+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+

{% trans trimmed %}Everything{% endtrans %}

+
+ {% trans trimmed %} + Choose from thousands of packages to customize your installation; requires a fast network connection. + {% endtrans %} +
+

{% trans trimmed %}Learn more.{% endtrans %}

+ +
+
+
+
+ +
+
+
+ +
+

{% trans trimmed %}Testing Images.{% endtrans %}

+
+ {% trans trimmed %} + These are unreleased development versions of Fedora made available for testing the next official Fedora release. + {% endtrans %} +
+

{% trans trimmed %}Learn more.{% endtrans %}

+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+

{% trans trimmed %}Rawhide{% endtrans %}

+
+ {% trans trimmed %} + Find out more about Rawhide, our ever-moving development version. Rawhide is targeted at advanced users, testers, and package maintainers. {% endtrans %} +
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/sites/getfedora.org/site/index.html b/sites/getfedora.org/site/index.html index 3ad43fe..19e4da8 100644 --- a/sites/getfedora.org/site/index.html +++ b/sites/getfedora.org/site/index.html @@ -155,7 +155,7 @@
{{link_card(logo="/static/images/fedora-alt-logo.png", description=_('The Fedora Alternative Downloads are either special-purpose - for testing, for specific architectures - or are more standard versions of Fedora in alternative formats such as network installer format or formatted for BitTorrent download.'), - learnmorelink="https://alt.fedoraproject.org/" + learnmorelink=url_for("alt", lang_code=lang_code) )}}
diff --git a/sites/getfedora.org/site/server/download/index.html b/sites/getfedora.org/site/server/download/index.html index 316dbeb..9f1474d 100644 --- a/sites/getfedora.org/site/server/download/index.html +++ b/sites/getfedora.org/site/server/download/index.html @@ -29,7 +29,7 @@
{% trans trimmed %}Using the x86_64 Architecture?{% endtrans %}