From f9940354cac6ad7ff35aa7cf10bb89e7d0c0ceae Mon Sep 17 00:00:00 2001 From: Ben Cotton Date: Nov 15 2022 06:23:40 +0000 Subject: [PATCH 1/3] Promote Fedora CoreOS to edition status Part of F37 release Fixes #269 Signed-off-by: Ben Cotton --- diff --git a/sites/getfedora.org/site/index.html b/sites/getfedora.org/site/index.html index 8dccbf9..a2eb5f8 100644 --- a/sites/getfedora.org/site/index.html +++ b/sites/getfedora.org/site/index.html @@ -75,6 +75,15 @@ learnmorelink=url_for("iot", lang_code=lang_code) )}} +
+ {{editions_card(color="blue", + logo="/static/images/fedora-coreos-logo.png", + official=True, + description=_('Fedora CoreOS is an automatically updating, minimal, container-focused operating system.'), + download_link=url_for("coreos_download", lang_code=lang_code), + learnmorelink=url_for("coreos", lang_code=lang_code) + )}} +
@@ -88,12 +97,6 @@
-
- {{link_card(logo="/static/images/fedora-coreos-logo.png", - description=_('Fedora CoreOS is an automatically updating, minimal, container-focused operating system.'), - learnmorelink=url_for("coreos", lang_code=lang_code) - )}} -
{{link_card(logo="/static/images/fedora-silverblue-logo.png", From 534a4627e3bf2e395bdb64f5825b57b0e3aa7cb1 Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Nov 15 2022 06:23:40 +0000 Subject: [PATCH 2/3] add Fedora Cloud as an official edition --- diff --git a/sites/getfedora.org/main.py b/sites/getfedora.org/main.py index a48b720..f2d8190 100644 --- a/sites/getfedora.org/main.py +++ b/sites/getfedora.org/main.py @@ -240,6 +240,8 @@ export_route('server', '/server/') export_route('server_download', '/server/download/') export_route('coreos', '/coreos/') export_route('coreos_download', '/coreos/download/') +export_route('cloud', '/cloud/') +export_route('cloud_download', '/cloud/download/') export_route('silverblue', '/silverblue/') export_route('silverblue_download', '/silverblue/download/') export_route('iot', '/iot/') diff --git a/sites/getfedora.org/partials/submenu.html b/sites/getfedora.org/partials/submenu.html index 4b3c96d..02c0542 100644 --- a/sites/getfedora.org/partials/submenu.html +++ b/sites/getfedora.org/partials/submenu.html @@ -11,9 +11,12 @@ {% 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 == "cloud" %} + {% set logoimage = 'Fedora Cloud Logo' %} + {% set activeclass = "active border-bottom border-fedora-purple border-width-3"%} {% endif %}
diff --git a/sites/getfedora.org/site/cloud/download/index.html b/sites/getfedora.org/site/cloud/download/index.html new file mode 100644 index 0000000..67296d4 --- /dev/null +++ b/sites/getfedora.org/site/cloud/download/index.html @@ -0,0 +1,11 @@ +{% extends "master_getfedora.html" %} +{% block meta %} + +{% endblock %} +{% from "submenu.html" import submenu with context %} +{% from "export_regulations.html" import export_regulations %} +{% block title %}{% trans trimmed %}Download Fedora Cloud{% endtrans %}{% endblock %} + +{% block content %} +{{submenu(edition="cloud", active="download")}} +{% endblock %} diff --git a/sites/getfedora.org/site/cloud/index.html b/sites/getfedora.org/site/cloud/index.html new file mode 100644 index 0000000..5845436 --- /dev/null +++ b/sites/getfedora.org/site/cloud/index.html @@ -0,0 +1,107 @@ +{% extends "master_getfedora.html" %} +{% from "submenu.html" import submenu with context %} + +{% block title %}{% trans trimmed %}Fedora Cloud{% endtrans %}{% endblock %} + +{% block content %} +{{submenu(edition="cloud", active="overview")}} +
+
+
+
+

Fedora Cloud.

+
{% trans trimmed %}The Fedora Cloud Edition is the foundation for accelerating testing and advanced solutions requiring a complete +operating system image, including Vagrant.{% endtrans %}
+
+ +
+
+
+
+
+
+
+ +
+
+

{% trans trimmed %}Agility and Flexibility{% endtrans %}

+
+ {% trans trimmed %} + The Fedora Cloud edition provides maximum flexibility and use in many different cloud environments. Deploy pre-built, Fedora images directly from your public cloud tools while maintaining all of the benefits of running a cutting edge, highly performant operating system that matches your on-premises requirements. + {% endtrans %} +
+
+
+
+
+ +
+
+
+
+

{% trans trimmed %}Ready to Deploy images{% endtrans %}

+
+ {% trans trimmed %} + The ability to spin up new Fedora compute instances in a matter of seconds reshapes the agility and speed of software development. Fedora Cloud edition users can easily test new ideas and design application architecture without the need to own their own on-site hardware -- hardware that might be limited or suffer from slow procurement processes. + {% endtrans %} +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+

{% trans trimmed %}Available right to the edge{% endtrans %}

+
+ {% trans trimmed %} + Fedora Cloud edition is easily deployed for all you computing requirements across a wide range of hardware including many options that extend the cloud across hybrid and edge locations in the virtual environment of your choice. Build, deploy, and run hybrid and edge computing on Fedora Cloud edition across virtually any datacenter for a consistent hybrid experience. + {% endtrans %} +
+
+
+
+
+ +
+
+
+
+

{% trans trimmed %}Support Resources{% endtrans %}

+
+


+
+
+
+

{% trans trimmed %}  Documentation{% endtrans %}


+
{% trans trimmed url="https://fedoraproject.org/wiki/Cloud" %}Information about Fedora Cloud is available on the Fedora Wiki.{% endtrans %}

+
+
+
+
+

{% trans trimmed %}  Email{% endtrans %}


+
{% trans trimmed url="https://admin.fedoraproject.org/mailman/listinfo/cloud" %}Users and developers are also available on the mailing list at cloud@lists.fedoraproject.org.{% endtrans %}
+
+
+
+
+

  Chat


+
{% trans trimmed url="https://web.libera.chat/?channels=#fedora-cloud" %}Users and developers are available in the #fedora-cloud IRC channel on irc.libera.chat for real-time chat.{% endtrans %}
+
+
+
+
+
+ +
+{% endblock %} diff --git a/sites/getfedora.org/site/index.html b/sites/getfedora.org/site/index.html index a2eb5f8..470b6b7 100644 --- a/sites/getfedora.org/site/index.html +++ b/sites/getfedora.org/site/index.html @@ -75,6 +75,17 @@ learnmorelink=url_for("iot", lang_code=lang_code) )}}
+ +
+ {{editions_card(color="purple", + logo="/static/images/fedora-cloud-logo.png", + official=True, + description=_('Fedora Cloud edition is a powerful and minimal base operating system image with tailored images available for both public and many private cloud uses.'), + download_link="https://alt.fedoraproject.org/en/cloud/", + learnmorelink=url_for("cloud", lang_code=lang_code) + )}} +
+
{{editions_card(color="blue", logo="/static/images/fedora-coreos-logo.png", diff --git a/sites/partials/templates/master.html b/sites/partials/templates/master.html index 990c9ed..c373c4d 100644 --- a/sites/partials/templates/master.html +++ b/sites/partials/templates/master.html @@ -33,6 +33,8 @@ {% trans trimmed %}Fedora Workstation{% endtrans %} {% trans trimmed %}Fedora Server{% endtrans %} {% trans trimmed %}Fedora IoT{% endtrans %} + {% trans trimmed %}Fedora Cloud{% endtrans %} + {% trans trimmed %}Fedora CoreOS{% endtrans %}