Merge branch 'upstream'

enhancement: add transparent background to sponsor images
public: make bittorrent and iso downloads from mirrors more visible
2024-09-16 17:49:26 -05:00 · 2024-09-14 11:22:27 +02:00 · 2024-09-14 11:14:52 +02:00
7 changed files with 6 additions and 4 deletions
--- a/sitestatic/hetzner_logo.png
+++ b/sitestatic/hetzner_logo.png
--- a/sitestatic/nitrokey_logo.png
+++ b/sitestatic/nitrokey_logo.png
--- a/sitestatic/pia_button.png
+++ b/sitestatic/pia_button.png
--- a/sitestatic/pia_logo.png
+++ b/sitestatic/pia_logo.png
--- a/sitestatic/shells_logo.png
+++ b/sitestatic/shells_logo.png
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -25,6 +25,8 @@
    It is intended for new installations only; an existing Arch Linux system
    can always be updated with <code>pacman -Syu</code>.</p>

+    <p>Images for installing Arch can be downloaded via <a href="#bittorrent-download">BitTorrent</a> or right here in your browser from one of the <a href="#http-downloads">Arch HTTP(S) mirrors down below</a>.</p>
+
    <ul>
        {% if release.version %}<li><strong>Current Release:</strong> {{ release.version }}</li>{% endif %}
        {% if release.kernel_version %}<li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>{% endif %}
@@ -52,7 +54,7 @@
    to update your existing system. You may be looking for
    <a href="{% url 'mirrorlist' %}">an updated mirrorlist</a> instead.</p>

-    <h3>BitTorrent Download (recommended)</h3>
+    <h3 id="bittorrent-download">BitTorrent Download (recommended)</h3>

    <p>If you can spare the bytes, please leave the client open after your
    download is finished, so you can seed it back to others.
@@ -91,10 +93,10 @@

    <p>Official virtual machine images are available for download on our <a href="https://gitlab.archlinux.org/archlinux/arch-boxes/-/packages">GitLab instance</a>, more information is available in the <a href="https://gitlab.archlinux.org/archlinux/arch-boxes/">README</a>.</p>

-    <h3>HTTP Direct Downloads</h3>
+    <h3 id="http-downloads">HTTP Direct Downloads</h3>

    <p>In addition to the BitTorrent links above, install images can also be
-    downloaded via HTTP from the mirror sites listed below. Please
+    downloaded via HTTP from the <a href="#download-mirrors">mirror sites listed below</a>. Please
    ensure the download image matches the checksum from the <code>sha256sums.txt</code> or <code>b2sums.txt</code> file linked below.</p>

    <h4 id="checksums">Checksums and signatures</h4>
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -203,7 +203,7 @@
    </a>

    <a href="https://www.privateinternetaccess.com/" title="Private Internet Access">
-        <img src="{% static "pia_button.png" %}"
+        <img src="{% static "pia_logo.png" %}"
            title="" alt="Private Internet Access logo"/>
    </a>
Author	SHA1	Message	Date
Cory Sanin	eda6dd9f3f	Merge branch 'upstream' All checks were successful Docker Image CI / build (push) Successful in 4m11s Details Github-Actions / build (push) Successful in 8m2s Details	2024-09-16 17:49:26 -05:00
Christian Heusel	fc191bbe84	enhancement: add transparent background to sponsor images	2024-09-14 11:22:27 +02:00
Jelle van der Waa	c68204d6bb	public: make bittorrent and iso downloads from mirrors more visible	2024-09-14 11:14:52 +02:00