From 43899b3b11a18c026fa30faa4d7d156db45e2dac Mon Sep 17 00:00:00 2001 From: Meher Chinwala Date: Aug 13 2020 21:07:23 +0000 Subject: [PATCH 1/7] Added the KDE Desktop pages --- diff --git a/sites/getfedora.org/main.py b/sites/getfedora.org/main.py index e36f346..d421d82 100644 --- a/sites/getfedora.org/main.py +++ b/sites/getfedora.org/main.py @@ -247,6 +247,9 @@ export_route('iot_download', '/iot/download/', context={'iot_links': iot_links}) iot_checksums = iot_links['checksums'] export_route('security', '/security/', context={'iot_checksums': iot_checksums}) export_route('sponsors', '/sponsors/') +export_route('spins', '/spins/') +export_route('spins_kde', '/spins/kde/') +export_route('spins_kde_download', '/spins/kde/download/') diff --git a/sites/getfedora.org/partials/spins_download.html b/sites/getfedora.org/partials/spins_download.html new file mode 100644 index 0000000..6bf0d8f --- /dev/null +++ b/sites/getfedora.org/partials/spins_download.html @@ -0,0 +1,168 @@ +{% extends "master_getfedora.html" %} +{% from "export_regulations.html" import export_regulations %} +{% block content %} +
+
+
+
+

{% trans trimmed %}Download {% endtrans %} {% block desktop_name %}{% endblock %}.

+
+
+
+
+ +
+
+
+
    + {% if releaseinfo.ga.spins.download_override.live_x86_64 %} +
  • +
    + {% trans trimmed n=releaseinfo.ga.spins.release_number %}Fedora {{n}}: KDE Plasma Desktop{% endtrans %} +
    +
    + + {% trans trimmed %}Download{% endtrans %} + +
    +
    • + {% endif %} + + {% if releaseinfo.beta.show and releaseinfo.beta.spins.download_override.live_x86_64 %} +
  • +
    + {% trans trimmed n=releaseinfo.beta.spins.release_number %} + Fedora {{n}}: KDE Plasma Desktop + {% endtrans %} + {% trans trimmed %}Beta!{% endtrans %} +
    +
    + + {% trans trimmed %}Download{% endtrans %} + +
    +
    • + {% endif %} +
+
+

We take security seriously.


+

Once you have downloaded an image,
be sure to verify it for both security and integrity.

+ +
+
+
+ +
+

Before installing Fedora, you may want to confirm your system meets minimum requirements for Fedora.
Consult the online release notes to see minimum requirements and recommendations.

+

There is also a complete Installation Guide available
We recommend you look through it before installing to your system, since it answers many common questions.

+
+
+
+ +
+
+
+
+
+

{% trans trimmed %}What is a Live Image?{% endtrans %}

+
+

+
+

Fedora KDE Plasma Desktop is shipped as a live operating system. It's everything you need to try out Fedora's KDE Plasma Desktop - you don't have to erase anything on your current system to try it out, and it won't put your files at risk. Take Fedora for a test drive, and if you like it, you can install Fedora directly to your hard drive straight from the Live Media desktop if you like.

+

To use this image, you need a drive that can create or "burn" DVDs, or a USB flash drive at least as big as the image.

+
+
+
+

Other Downloads

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

{% trans trimmed %}Downloading{% endtrans %}

+
+
+
+

{% trans trimmed %}Spin downloads are offered via direct download, but you can also get them via BitTorrent. In this case you will need to install a BitTorrent client in order to download a spin. If you cannot use Bittorrent, some spins offer alternative download methods.{% endtrans %}


+
+ + {% trans trimmed %}Learn More{% endtrans %} + +
+
+
+
+
+

Installing

+
+
+
+

{% trans trimmed %}To install a spin, you run the spin on your computer and click the "Install to Hard Drive" link on the desktop. You'll be guided through the install process via a series of prompts.{% endtrans %}


+


+ +
+
+
+

{% trans trimmed %}Using{% endtrans %}

+
+
+
+

{% trans trimmed %}Spins are provided as ISO files. You may use the ISO file to create a new virtual machine, or you can burn the ISO in a special way to a USB stick or optical media to run the spin on hardware.{% endtrans %}


+

+
+ + {% trans trimmed %}Learn More{% endtrans %} + +
+
+
+
+
+
+ + +
+
+
+

Support Resources.

+
+
+
+
+

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


+

{% trans trimmed %}Specific documentation and tutorials are available at the{% endtrans %} {% block documentation_link %}{% endblock %}


+
+
+
+
+

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


+

{% trans trimmed %}Users and developers are also available on the mailing list at{% endtrans %} {% block mailing_list %}{% endblock %}

+
+
+
+
+

  Chat


+

{% trans trimmed %}Users and developers are available in the{% endtrans %} {% block irc_channel %}{% endblock %} IRC channel on irc.freenode.org for real-time chat

+
+
+
+
+
+{{export_regulations()}} +{% endblock %} diff --git a/sites/getfedora.org/release.yaml b/sites/getfedora.org/release.yaml index fd89336..91356d8 100644 --- a/sites/getfedora.org/release.yaml +++ b/sites/getfedora.org/release.yaml @@ -34,6 +34,15 @@ ga: pretty_name: Fedora IoT release_number: 32 + spins: + pretty_name: Fedora KDE Plasma Desktop + release_number: 32 + rc_version: 1.6 + download_override: + live_x86_64: default + checksum_prefix: Fedora-Spins + checksum_arches: [x86_64] + beta: # Should we show the beta stuff at all? show: false @@ -67,6 +76,15 @@ beta: netinst_aarch64: default raw_aarch64: default + spins: + pretty_name: Fedora KDE Plasma Desktop Beta + release_number: 32 + rc_version: 1.2 + download_override: + live_x86_64: default + checksum_prefix: Fedora-Spins + checksum_arches: [x86_64] + fmw: osx: version: 4.1.5 diff --git a/sites/getfedora.org/site/index.html b/sites/getfedora.org/site/index.html index 9a16b82..ee29d15 100644 --- a/sites/getfedora.org/site/index.html +++ b/sites/getfedora.org/site/index.html @@ -141,7 +141,7 @@
{{link_card(logo="/static/images/fedora-spins-logo.png", description=_('If you prefer an alternative desktop environment such as KDE Plasma Desktop or Xfce, you can download a Fedora Spin for your preferred desktop environment and use that to install Fedora, pre-configured for the desktop environment of your choice.'), - learnmorelink="https://spins.fedoraproject.org/" + learnmorelink=url_for('spins', lang_code=lang_code) )}}
diff --git a/sites/getfedora.org/site/security/index.html b/sites/getfedora.org/site/security/index.html index c472ded..b06ff9c 100644 --- a/sites/getfedora.org/site/security/index.html +++ b/sites/getfedora.org/site/security/index.html @@ -96,6 +96,26 @@ {% endfor %} +
Fedora Spins
+ + {% if releaseinfo.beta.show %} +
+
Fedora Spins Beta
+ + {% endif %} diff --git a/sites/getfedora.org/site/spins/index.html b/sites/getfedora.org/site/spins/index.html new file mode 100644 index 0000000..199b7a2 --- /dev/null +++ b/sites/getfedora.org/site/spins/index.html @@ -0,0 +1,138 @@ +{% extends "master_getfedora.html" %} + +{% block title %}{% trans trimmed %}Fedora Spins{% endtrans %}{% endblock %} + +{% block content %} + +
+
+
+
+ +
+
+


KDE Plasma Desktop.


+

{% trans trimmed %}A complete, modern desktop built using the KDE Plasma Desktop.{% endtrans %}


+ +
+
+
+
+
+
+
+
+


XFCE Desktop.


+

{% trans trimmed %}A complete, well-integrated Xfce Desktop.{% endtrans %}


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


LXQT Desktop.


+

{% trans trimmed %}A lightweight, well-integrated LXQt desktop environment.{% endtrans %}


+ +
+
+
+
+
+
+
+
+


MATE-COMPIZ Desktop.


+

{% trans trimmed %}A classic Fedora Desktop with an additional 3D Windows Manager.{% endtrans %}


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


Cinnamon Desktop.


+

{% trans trimmed %}A modern desktop featuring traditional Gnome user experience.{% endtrans %}


+ +
+
+
+
+
+
+
+
+
+


LXDE Desktop.


+

{% trans trimmed %}A light, fast, less-resource hungry desktop environment.{% endtrans %}


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


SOAS Desktop.


+

{% trans trimmed %}Discover. Reflect. Share. Learn.{% endtrans %}


+ +
+
+
+
+
+ +{% endblock %} +{% block js %} +{{ super() }} +{% endblock %} diff --git a/sites/getfedora.org/site/spins/kde/download/index.html b/sites/getfedora.org/site/spins/kde/download/index.html new file mode 100644 index 0000000..2ebab0c --- /dev/null +++ b/sites/getfedora.org/site/spins/kde/download/index.html @@ -0,0 +1,16 @@ +{% extends "spins_download.html" %} + +{% block title %}{% trans trimmed %}Fedora Spins - KDE{% endtrans %}{% endblock %} + +{% block desktop_name %}KDE Plasma Desktop{% endblock %} + +{% block general_download_link %}{{dl(releaseinfo.ga.spins.download_override.live_x86_64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/%d/Spins/x86_64/iso/Fedora-KDE-Live-x86_64-%d-%s.iso' % (releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.rc_version))}}{% endblock %} +{% block beta_download_link %}{{dl(releaseinfo.beta.spins.download_override.live_x86_64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/test/%d_Beta/Spins/x86_64/iso/Fedora-KDE-Live-x86_64-%d_Beta-%s.iso' % (releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.rc_version))}}{% endblock %} + +{% block documentation_link %}KDE project upstream website{% endblock %} +{% block mailing_list %}kde@lists.fedoraproject.org{% endblock %} +{% block irc_channel %}#fedora-kde{% endblock %} + +{% block js %} +{{ super() }} +{% endblock %} diff --git a/sites/getfedora.org/site/spins/kde/index.html b/sites/getfedora.org/site/spins/kde/index.html new file mode 100644 index 0000000..5a2d8ff --- /dev/null +++ b/sites/getfedora.org/site/spins/kde/index.html @@ -0,0 +1,200 @@ +{% extends "master_getfedora.html" %} + +{% block title %}{% trans trimmed %}Fedora Spins{% endtrans %}{% endblock %} + +{% block content %} + + + +
+
+
+

Going Online

+
+
+
+ Network Manager +

Network Manager

+

Just a click and you're connected to your wireless LAN router, or online via many supported 3G mobile broadband cards.

+
+ +
+ Konqueror +

Konqueror

+

Explore the World Wide Web with Konqueror, the full featured KDE web browser.

+
+ +
+ Telepathy +

Telepathy

+

Stay connected with your friends and colleagues using Telepathy Instant Messaging client. It supports all common IM protocols.

+
+ +
+ KTorrent and KGet +

KTorrent & KGet

+

Are you a downloader? Use KTorrent or KGet to get new versions of Fedora KDE Plasma Desktop Edition!

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

Utilities & Configuration

+
+
+
+ Konsole +

Konsole

+

Fedora KDE Plasma Desktop ships a terminal, the gateway to the real power of any UNIX/linux machine, called Konsole.

+
+
+ System Settings +

System Settings

+

No need to know cryptic commands and config files. Click the options you like to change and choose the settings that make you happy.

+
+
+
+
+
+

Office & Productivity Suite

+
+
+
+ Calligra +

Calligra

+

Calligra is an integrated office suite built on KDE Platform. It utilizes free and open standards like OpenDocument for its document formats and components.

+
+
+ Kontact +

Kontact

+

Kontact is the integrated personal information manager of KDE Plasma Desktop. The Kontact suite unites mature and proven KDE PIM applications under one easy to use application.

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

Multimedia

+
+
+
+ Amarok +

Amarok

+

Amarok supports playlists, including dynamically generated ones, with cover art, lyrics and even info on the current track or band. Amarok also has integration with Last.fm and other music services.

+
+ +
+ Dragon Player +

Dragon Player

+

Dragon Player is a multimedia player where the focus is on simplicity, instead of features. Its simple interface is designed not to get in your way and instead empower you to simply play multimedia files.

+
+ +
+ K3B +

K3B

+

K3B allows you to easily back up your multimedia files as it's a full featured CD/DVD writing software. K3B supports writing data CDs/DVDs, audio CDs, video CDs, DVDs, copying, CD ripping and more.

+
+
+
+
+ + +
+
+
+

Education

+
+
+
+ Marble +

Marble

+

Marble is a virtual globe and world atlas in your computer. You can learn a lot about Earth or you can just enjoy virtual trips around our planet.

+
+ +
+ Parley +

Parley

+

Parley is a vocabulary trainer that helps you memorize things via virtual flashcards. It provides a rich set of tools to manage your card sets.

+
+ +
+ Kiten +

Kiten

+

Kiten is a Japanese dictionary application as well as a Japanese language reference. It includes a kanji lookup tool and browsing interface.

+
+ +
+ Kalzium +

Kalzium

+

Kalzium allows you to explore the periodic table of elements. It has a 3D molecule editor plus multiple simulators and calculators.

+
+
+
+
+ +
+
+
+
+

Support Resources.

+
+
+

+
+
+
+

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


+

{% trans trimmed %}Specific documentation and tutorials are available at the KDE project upstream website{% endtrans %}


+
+
+
+
+

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


+

{% trans trimmed %}Users and developers are also available on the mailing list at{% endtrans %} kde@lists.fedoraproject.org

+
+
+
+
+

  Chat


+

{% trans trimmed %}Users and developers are available in the{% endtrans %} #fedora-kde IRC channel on irc.freenode.org for real-time chat

+
+
+
+
+
+ +{% endblock %} +{% block js %} +{{ super() }} +{% endblock %} diff --git a/sites/static/images/spins/kde/amarok.png b/sites/static/images/spins/kde/amarok.png new file mode 100644 index 0000000..996fc7a Binary files /dev/null and b/sites/static/images/spins/kde/amarok.png differ diff --git a/sites/static/images/spins/kde/calligra.png b/sites/static/images/spins/kde/calligra.png new file mode 100644 index 0000000..545ecda Binary files /dev/null and b/sites/static/images/spins/kde/calligra.png differ diff --git a/sites/static/images/spins/kde/dragonplayer.png b/sites/static/images/spins/kde/dragonplayer.png new file mode 100644 index 0000000..c622334 Binary files /dev/null and b/sites/static/images/spins/kde/dragonplayer.png differ diff --git a/sites/static/images/spins/kde/k3b.png b/sites/static/images/spins/kde/k3b.png new file mode 100644 index 0000000..37e6ccd Binary files /dev/null and b/sites/static/images/spins/kde/k3b.png differ diff --git a/sites/static/images/spins/kde/kaffeine.png b/sites/static/images/spins/kde/kaffeine.png new file mode 100644 index 0000000..bcd652e Binary files /dev/null and b/sites/static/images/spins/kde/kaffeine.png differ diff --git a/sites/static/images/spins/kde/kalzium.png b/sites/static/images/spins/kde/kalzium.png new file mode 100644 index 0000000..5d7a608 Binary files /dev/null and b/sites/static/images/spins/kde/kalzium.png differ diff --git a/sites/static/images/spins/kde/kiten.png b/sites/static/images/spins/kde/kiten.png new file mode 100644 index 0000000..b1bb38a Binary files /dev/null and b/sites/static/images/spins/kde/kiten.png differ diff --git a/sites/static/images/spins/kde/koffice.png b/sites/static/images/spins/kde/koffice.png new file mode 100644 index 0000000..e0ad7df Binary files /dev/null and b/sites/static/images/spins/kde/koffice.png differ diff --git a/sites/static/images/spins/kde/konqueror.png b/sites/static/images/spins/kde/konqueror.png new file mode 100644 index 0000000..1428603 Binary files /dev/null and b/sites/static/images/spins/kde/konqueror.png differ diff --git a/sites/static/images/spins/kde/konsole.png b/sites/static/images/spins/kde/konsole.png new file mode 100644 index 0000000..f758061 Binary files /dev/null and b/sites/static/images/spins/kde/konsole.png differ diff --git a/sites/static/images/spins/kde/kontact.png b/sites/static/images/spins/kde/kontact.png new file mode 100644 index 0000000..208b7e6 Binary files /dev/null and b/sites/static/images/spins/kde/kontact.png differ diff --git a/sites/static/images/spins/kde/kopete.png b/sites/static/images/spins/kde/kopete.png new file mode 100644 index 0000000..a4983da Binary files /dev/null and b/sites/static/images/spins/kde/kopete.png differ diff --git a/sites/static/images/spins/kde/kscd.png b/sites/static/images/spins/kde/kscd.png new file mode 100644 index 0000000..8376b3c Binary files /dev/null and b/sites/static/images/spins/kde/kscd.png differ diff --git a/sites/static/images/spins/kde/ktorrent.png b/sites/static/images/spins/kde/ktorrent.png new file mode 100644 index 0000000..649ef90 Binary files /dev/null and b/sites/static/images/spins/kde/ktorrent.png differ diff --git a/sites/static/images/spins/kde/marble.png b/sites/static/images/spins/kde/marble.png new file mode 100644 index 0000000..808dbb5 Binary files /dev/null and b/sites/static/images/spins/kde/marble.png differ diff --git a/sites/static/images/spins/kde/network.png b/sites/static/images/spins/kde/network.png new file mode 100644 index 0000000..14e2a30 Binary files /dev/null and b/sites/static/images/spins/kde/network.png differ diff --git a/sites/static/images/spins/kde/parley.png b/sites/static/images/spins/kde/parley.png new file mode 100644 index 0000000..40c765a Binary files /dev/null and b/sites/static/images/spins/kde/parley.png differ diff --git a/sites/static/images/spins/kde/settings.png b/sites/static/images/spins/kde/settings.png new file mode 100644 index 0000000..a8edc1e Binary files /dev/null and b/sites/static/images/spins/kde/settings.png differ diff --git a/sites/static/images/spins/kde/telepathy.png b/sites/static/images/spins/kde/telepathy.png new file mode 100644 index 0000000..0065cca Binary files /dev/null and b/sites/static/images/spins/kde/telepathy.png differ diff --git a/sites/static/images/spins/screenshots/screenshot-cinnamon.jpg b/sites/static/images/spins/screenshots/screenshot-cinnamon.jpg new file mode 100644 index 0000000..aea77f1 Binary files /dev/null and b/sites/static/images/spins/screenshots/screenshot-cinnamon.jpg differ diff --git a/sites/static/images/spins/screenshots/screenshot-kde.jpg b/sites/static/images/spins/screenshots/screenshot-kde.jpg new file mode 100644 index 0000000..ce40dc9 Binary files /dev/null and b/sites/static/images/spins/screenshots/screenshot-kde.jpg differ diff --git a/sites/static/images/spins/screenshots/screenshot-lxde.jpg b/sites/static/images/spins/screenshots/screenshot-lxde.jpg new file mode 100644 index 0000000..6719054 Binary files /dev/null and b/sites/static/images/spins/screenshots/screenshot-lxde.jpg differ diff --git a/sites/static/images/spins/screenshots/screenshot-lxqt.jpg b/sites/static/images/spins/screenshots/screenshot-lxqt.jpg new file mode 100644 index 0000000..0594060 Binary files /dev/null and b/sites/static/images/spins/screenshots/screenshot-lxqt.jpg differ diff --git a/sites/static/images/spins/screenshots/screenshot-matecompiz.jpg b/sites/static/images/spins/screenshots/screenshot-matecompiz.jpg new file mode 100644 index 0000000..64bf017 Binary files /dev/null and b/sites/static/images/spins/screenshots/screenshot-matecompiz.jpg differ diff --git a/sites/static/images/spins/screenshots/screenshot-soas.jpg b/sites/static/images/spins/screenshots/screenshot-soas.jpg new file mode 100644 index 0000000..5f4cc50 Binary files /dev/null and b/sites/static/images/spins/screenshots/screenshot-soas.jpg differ diff --git a/sites/static/images/spins/screenshots/screenshot-xfce.jpg b/sites/static/images/spins/screenshots/screenshot-xfce.jpg new file mode 100644 index 0000000..2bd7a35 Binary files /dev/null and b/sites/static/images/spins/screenshots/screenshot-xfce.jpg differ From bf30d04ae18e7f394e2247741850737127a65900 Mon Sep 17 00:00:00 2001 From: Meher Chinwala Date: Aug 13 2020 21:10:55 +0000 Subject: [PATCH 2/7] Added links for armhfp --- diff --git a/sites/getfedora.org/partials/spins_download.html b/sites/getfedora.org/partials/spins_download.html index 6bf0d8f..61e3749 100644 --- a/sites/getfedora.org/partials/spins_download.html +++ b/sites/getfedora.org/partials/spins_download.html @@ -14,14 +14,17 @@
-
    +
      +
      + {% trans trimmed %}For x86_64:{% endtrans %} +
      {% if releaseinfo.ga.spins.download_override.live_x86_64 %}
    • {% trans trimmed n=releaseinfo.ga.spins.release_number %}Fedora {{n}}: KDE Plasma Desktop{% endtrans %}
      - + {% trans trimmed %}Download{% endtrans %}
      @@ -37,14 +40,47 @@ {% trans trimmed %}Beta!{% endtrans %}
- + + {% trans trimmed %}Download{% endtrans %} + +
+ + {% endif %} + +
    +
    + {% trans trimmed %}For ARMv7 (armhfp):{% endtrans %} +
    + {% if releaseinfo.ga.spins.download_override.raw_armhfp %} +
  • +
    + {% trans trimmed n=releaseinfo.ga.spins.release_number %}Fedora {{n}}: KDE Plasma Desktop{% endtrans %} +
    +
    + + {% trans trimmed %}Download{% endtrans %} + +
    +
    • + {% endif %} + + {% if releaseinfo.beta.show and releaseinfo.beta.spins.download_override.raw_armhfp %} +
  • +
    + {% trans trimmed n=releaseinfo.beta.spins.release_number %} + Fedora {{n}}: KDE Plasma Desktop + {% endtrans %} + {% trans trimmed %}Beta!{% endtrans %} +
    +
    + {% trans trimmed %}Download{% endtrans %}
    • {% endif %}
-
+

We take security seriously.


Once you have downloaded an image,
be sure to verify it for both security and integrity.

diff --git a/sites/getfedora.org/release.yaml b/sites/getfedora.org/release.yaml index 91356d8..5151ead 100644 --- a/sites/getfedora.org/release.yaml +++ b/sites/getfedora.org/release.yaml @@ -40,8 +40,9 @@ ga: rc_version: 1.6 download_override: live_x86_64: default + raw_armhfp: default checksum_prefix: Fedora-Spins - checksum_arches: [x86_64] + checksum_arches: [x86_64, armhfp] beta: # Should we show the beta stuff at all? @@ -82,8 +83,9 @@ beta: rc_version: 1.2 download_override: live_x86_64: default + raw_armhfp: default checksum_prefix: Fedora-Spins - checksum_arches: [x86_64] + checksum_arches: [x86_64, armhfp] fmw: osx: diff --git a/sites/getfedora.org/site/spins/kde/download/index.html b/sites/getfedora.org/site/spins/kde/download/index.html index 2ebab0c..3c737d5 100644 --- a/sites/getfedora.org/site/spins/kde/download/index.html +++ b/sites/getfedora.org/site/spins/kde/download/index.html @@ -4,8 +4,10 @@ {% block desktop_name %}KDE Plasma Desktop{% endblock %} -{% block general_download_link %}{{dl(releaseinfo.ga.spins.download_override.live_x86_64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/%d/Spins/x86_64/iso/Fedora-KDE-Live-x86_64-%d-%s.iso' % (releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.rc_version))}}{% endblock %} -{% block beta_download_link %}{{dl(releaseinfo.beta.spins.download_override.live_x86_64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/test/%d_Beta/Spins/x86_64/iso/Fedora-KDE-Live-x86_64-%d_Beta-%s.iso' % (releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.rc_version))}}{% endblock %} +{% block general_x86_64_download %}{{dl(releaseinfo.ga.spins.download_override.live_x86_64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/%d/Spins/x86_64/iso/Fedora-KDE-Live-x86_64-%d-%s.iso' % (releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.rc_version))}}{% endblock %} +{% block beta_x86_64_download %}{{dl(releaseinfo.beta.spins.download_override.live_x86_64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/test/%d_Beta/Spins/x86_64/iso/Fedora-KDE-Live-x86_64-%d_Beta-%s.iso' % (releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.rc_version))}}{% endblock %} +{% block general_armhfp_download %}{{dl(releaseinfo.ga.spins.download_override.raw_armhfp, 'https://download.fedoraproject.org/pub/fedora/linux/releases/%d/Spins/armhfp/images/Fedora-KDE-armhfp-%d-%s-sda.raw.xz' % (releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.rc_version))}}{% endblock %} +{% block beta_armhfp_download %}{{dl(releaseinfo.beta.spins.download_override.raw_armhfp, 'https://download.fedoraproject.org/pub/fedora/linux/releases/test/%d_Beta/Spins/armhfp/images/Fedora-KDE-armhfp-%d_Beta-%s-sda.raw.xz' % (releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.rc_version))}}{% endblock %} {% block documentation_link %}KDE project upstream website{% endblock %} {% block mailing_list %}kde@lists.fedoraproject.org{% endblock %} From b0ad04616a6d74cd94123df7566d013bf92dceaa Mon Sep 17 00:00:00 2001 From: Meher Chinwala Date: Aug 13 2020 21:11:10 +0000 Subject: [PATCH 3/7] Added xfce, modified kde --- diff --git a/sites/getfedora.org/main.py b/sites/getfedora.org/main.py index d421d82..566d975 100644 --- a/sites/getfedora.org/main.py +++ b/sites/getfedora.org/main.py @@ -250,6 +250,8 @@ export_route('sponsors', '/sponsors/') export_route('spins', '/spins/') export_route('spins_kde', '/spins/kde/') export_route('spins_kde_download', '/spins/kde/download/') +export_route('spins_xfce', '/spins/xfce/') +export_route('spins_xfce_download', '/spins/xfce/download/') diff --git a/sites/getfedora.org/partials/spins_download.html b/sites/getfedora.org/partials/spins_download.html index 61e3749..0903b22 100644 --- a/sites/getfedora.org/partials/spins_download.html +++ b/sites/getfedora.org/partials/spins_download.html @@ -5,7 +5,7 @@
-

{% trans trimmed %}Download {% endtrans %} {% block desktop_name %}{% endblock %}.

+

{% trans trimmed %}Download {% endtrans %} {{desktop}}.

@@ -21,7 +21,7 @@ {% if releaseinfo.ga.spins.download_override.live_x86_64 %}
  • - {% trans trimmed n=releaseinfo.ga.spins.release_number %}Fedora {{n}}: KDE Plasma Desktop{% endtrans %} + {% trans trimmed n=releaseinfo.ga.spins.release_number %}Fedora {{n}}: {{desktop}}{% endtrans %}
    @@ -34,9 +34,7 @@ {% if releaseinfo.beta.show and releaseinfo.beta.spins.download_override.live_x86_64 %}
  • - {% trans trimmed n=releaseinfo.beta.spins.release_number %} - Fedora {{n}}: KDE Plasma Desktop - {% endtrans %} + {% trans trimmed n=releaseinfo.beta.spins.release_number %}Fedora {{n}}: {{desktop}}{% endtrans %} {% trans trimmed %}Beta!{% endtrans %}
    @@ -54,7 +52,7 @@ {% if releaseinfo.ga.spins.download_override.raw_armhfp %}
  • - {% trans trimmed n=releaseinfo.ga.spins.release_number %}Fedora {{n}}: KDE Plasma Desktop{% endtrans %} + {% trans trimmed n=releaseinfo.ga.spins.release_number %}Fedora {{n}}: {{desktop}}{% endtrans %}
    @@ -67,9 +65,7 @@ {% if releaseinfo.beta.show and releaseinfo.beta.spins.download_override.raw_armhfp %}
  • - {% trans trimmed n=releaseinfo.beta.spins.release_number %} - Fedora {{n}}: KDE Plasma Desktop - {% endtrans %} + {% trans trimmed n=releaseinfo.beta.spins.release_number %}Fedora {{n}}: {{desktop}}{% endtrans %} {% trans trimmed %}Beta!{% endtrans %}
    @@ -81,8 +77,8 @@ {% endif %}
    -

    We take security seriously.


    -

    Once you have downloaded an image,
    be sure to verify it for both security and integrity.

    +

    {% 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 %}

     @@ -91,8 +87,8 @@
    -

    Before installing Fedora, you may want to confirm your system meets minimum requirements for Fedora.
    Consult the online release notes to see minimum requirements and recommendations.

    -

    There is also a complete Installation Guide available
    We recommend you look through it before installing to your system, since it answers many common questions.

    +

    {% trans trimmed %}Before installing Fedora, you may want to confirm your system meets minimum requirements for Fedora.
    Consult the online release notes to see minimum requirements and recommendations.{% endtrans %}

    +

    {% trans trimmed %}There is also a complete Installation Guide available
    We recommend you look through it before installing to your system, since it answers many common questions.{% endtrans %}

    • @@ -106,16 +102,16 @@


    -

    Fedora KDE Plasma Desktop is shipped as a live operating system. It's everything you need to try out Fedora's KDE Plasma Desktop - you don't have to erase anything on your current system to try it out, and it won't put your files at risk. Take Fedora for a test drive, and if you like it, you can install Fedora directly to your hard drive straight from the Live Media desktop if you like.

    -

    To use this image, you need a drive that can create or "burn" DVDs, or a USB flash drive at least as big as the image.

    +

    {% trans trimmed %}Fedora {{desktop}} is shipped as a live operating system. It's everything you need to try out Fedora's {{desktop}} - you don't have to erase anything on your current system to try it out, and it won't put your files at risk. Take Fedora for a test drive, and if you like it, you can install Fedora directly to your hard drive straight from the Live Media desktop if you like.{% endtrans %}

    +

    {% trans trimmed %}To use this image, you need a drive that can create or "burn" DVDs, or a USB flash drive at least as big as the image.{% endtrans %}

    -

    Other Downloads

    +

    {% trans trimmed %}Other Downloads{% endtrans %}


    @@ -141,7 +137,7 @@
    -

    Installing

    +

    {% trans trimmed %}Installing{% endtrans %}


    @@ -176,7 +172,7 @@
    -

    Support Resources.

    +

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

    diff --git a/sites/getfedora.org/site/spins/index.html b/sites/getfedora.org/site/spins/index.html index 199b7a2..319dd98 100644 --- a/sites/getfedora.org/site/spins/index.html +++ b/sites/getfedora.org/site/spins/index.html @@ -38,7 +38,7 @@


    XFCE Desktop.


    {% trans trimmed %}A complete, well-integrated Xfce Desktop.{% endtrans %}


    diff --git a/sites/getfedora.org/site/spins/kde/download/index.html b/sites/getfedora.org/site/spins/kde/download/index.html index 3c737d5..d615888 100644 --- a/sites/getfedora.org/site/spins/kde/download/index.html +++ b/sites/getfedora.org/site/spins/kde/download/index.html @@ -1,8 +1,8 @@ {% extends "spins_download.html" %} -{% block title %}{% trans trimmed %}Fedora Spins - KDE{% endtrans %}{% endblock %} +{% block title %}{% trans trimmed %}Download Fedora Spins - KDE{% endtrans %}{% endblock %} -{% block desktop_name %}KDE Plasma Desktop{% endblock %} +{% set desktop = "KDE Plasma Desktop" %} {% block general_x86_64_download %}{{dl(releaseinfo.ga.spins.download_override.live_x86_64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/%d/Spins/x86_64/iso/Fedora-KDE-Live-x86_64-%d-%s.iso' % (releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.release_number, releaseinfo.ga.spins.rc_version))}}{% endblock %} {% block beta_x86_64_download %}{{dl(releaseinfo.beta.spins.download_override.live_x86_64, 'https://download.fedoraproject.org/pub/fedora/linux/releases/test/%d_Beta/Spins/x86_64/iso/Fedora-KDE-Live-x86_64-%d_Beta-%s.iso' % (releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.release_number, releaseinfo.beta.spins.rc_version))}}{% endblock %} diff --git a/sites/getfedora.org/site/spins/kde/index.html b/sites/getfedora.org/site/spins/kde/index.html index 5a2d8ff..f385603 100644 --- a/sites/getfedora.org/site/spins/kde/index.html +++ b/sites/getfedora.org/site/spins/kde/index.html @@ -1,6 +1,6 @@ {% extends "master_getfedora.html" %} -{% block title %}{% trans trimmed %}Fedora Spins{% endtrans %}{% endblock %} +{% block title %}{% trans trimmed %}Fedora KDE Plasma Desktop{% endtrans %}{% endblock %} {% block content %}