GNOME.org
 

[gimp-web/wip/Jehan/issue-236-new-sponsor-page: 25/25] themes: less messy (hopefully) download page.


commit e85ef8741be951c2d9fe753cb13263864d805a2d
Author: Jehan <jehan girinstud io>
Date:   Sun Sep 19 19:17:19 2021 +0200

    themes: less messy (hopefully) download page.
    
    Instead of having various informations here and there around the
    download buttons, add a "Warnings and information" subsection just below
    download buttons and gather info there.
    
    Move the development version note in the new "Warnings and information"
    subsection (instead of the top of the page) because it should not be the
    most predominant info of the stable download page. Still add some fun
    emoticones to make this info stand out a bit more in the list.
    
    Also for Windows and macOS, show it depending on
    WINDOWS_FILE_DEVELOPMENT and MACOS_FILE_DEVELOPMENT respectively instead
    of the generic GIMP_VERSION_DEVELOPMENT. This way, we don't show this
    page for macOS in particular right now (since we don't have any macOS
    dev build yet!) hence don't give too high expectations.
    
    Tweak a bit more the "Source" section (and add a "User Manual"
    subsection there for a bit more separation, making things clearer).
    
    These various changes make the page a bit less messy, though I believe
    it still has too much information. Among the things to improve, all the
    part about the manual can probably be moved to its own workspace. This
    is in particular true for the list of Windows installers for the user
    manual. Maybe this will happen when we will have finally renewed the
    gimp-help publication process (work in progress).

 themes/newgimp/templates/downloads.html | 110 +++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 44 deletions(-)
---
diff --git a/themes/newgimp/templates/downloads.html b/themes/newgimp/templates/downloads.html
index 3a8be864..d7b9127d 100644
--- a/themes/newgimp/templates/downloads.html
+++ b/themes/newgimp/templates/downloads.html
@@ -19,10 +19,6 @@
     <h2>Current Stable Version</h2>
     <p>The current stable release of GIMP is <b>{{ GIMP_VERSION }}</b> ({{ RELEASE_DATE }}).</p>
 
-    {% if GIMP_VERSION_DEVELOPMENT is defined %}
-    <p>Pssst... want to check out the GIMP {{ GIMP_VERSION_DEVELOPMENT }} development release?<br />Get it 
on our <a href="/downloads/devel/">development downloads page</a>.</p>
-    {% endif %}
-
     <div class="OSTEST">
         <p>
             We think your OS is
@@ -45,6 +41,22 @@
 
     <div id='linux' class="os linux" markdown='1'>
         <h2>GIMP for Unix-like systems</h2>
+
+        <p class='buttons'>
+            <span class='win-button'>
+                <a href="https://flathub.org/repo/appstream/org.gimp.GIMP.flatpakref";>
+                    Install GIMP flatpak
+                </a>
+            </span>
+        </p>
+        <h3>Warnings and information</h3>
+        <ul>
+        <li><p>
+        Flatpak build available in: <strong>x86-64 and AArch64</strong>
+        (<em>note: i386 and ARM-32 versions used to be published, yet
+        are now stuck at GIMP 2.10.14 and 2.10.22 respectively</em>).
+        </p></li>
+        <li>
         <p>
         <strong>
         If available, the official package from your Unix-like
@@ -58,19 +70,16 @@
         Therefore choose your installation medium according to your
         needs.
         </p>
+        </li>
+        <li>
+        {% if GIMP_VERSION_DEVELOPMENT is defined %}
+          <p>🤫Pssst... want to check out the <strong>GIMP {{ GIMP_VERSION_DEVELOPMENT
+          }} development release?</strong> Get it on our <a
+          href="/downloads/devel/">development downloads page</a> 🧪.</p>
+        {% endif %}
+        </li>
 
-        <p class='buttons'>
-            <span class='win-button'>
-                <a href="https://flathub.org/repo/appstream/org.gimp.GIMP.flatpakref";>
-                    Install GIMP flatpak
-                </a>
-            </span>
-        </p>
-        <p>
-        Flatpak build available in: <strong>x86-64 and AArch64</strong>
-        (<em>note: i386 and ARM-32 versions used to be published, yet
-        are now stuck at GIMP 2.10.14 and 2.10.22 respectively</em>).
-        </p>
+        </ul>
 
         <h3>Flatpak additional instructions</h3>
        <p>The flatpak link above should open your software installer
@@ -127,7 +136,7 @@
         {% if MACOS_FILE is defined %}
 
         {% if MACOS_VER != GIMP_VERSION %}
-        <p>Note: the currently available package provides GIMP {{ MACOS_VER }} and has not yet updated to 
the latest version, GIMP {{ GIMP_VERSION }}. We're working on that, please check back later.</p>
+        <p><em>Note</em>: the currently available package provides GIMP {{ MACOS_VER }} and has not yet 
updated to the latest version, GIMP {{ GIMP_VERSION }}. We're working on that, please check back later.</p>
         {% endif %}
 
         {% if MACOS_COMMENT is defined %}
@@ -163,13 +172,21 @@
             </p>
         </small>
 
-        {% if MACOS_MIN_SUPPORT is defined %}
-        <p>
-            Supported OS: <strong>{{ MACOS_MIN_SUPPORT }}</strong> or over
-        </p>
-        {% endif %}
-
-        <p>Since the 2.8.2 version, GIMP runs on OSX natively. No X11 environment is required.</p>
+        <h3>Warnings and information</h3>
+        <ul>
+          {% if MACOS_MIN_SUPPORT is defined %}
+          <li><p>Supported OS: <strong>{{ MACOS_MIN_SUPPORT }}</strong> or over</p></li>
+          {% endif %}
+          <li><p>Since version 2.8.2, GIMP runs on OSX natively. No X11
+          environment is required.</p></li>
+          {% if MACOS_FILE_DEVELOPMENT is defined %}
+          <li>
+            <p>🤫Pssst... want to check out the <strong>GIMP {{ GIMP_VERSION_DEVELOPMENT
+            }} development release?</strong> Get it on our <a
+            href="/downloads/devel/">development downloads page</a> 🧪.</p>
+          </li>
+          {% endif %}
+        </ul>
 
         <h3>Native build</h3>
 
@@ -304,22 +321,25 @@
         </p>
     </small>
 
-    {% if WINDOWS_MIN_SUPPORT is defined %}
-    <p>
-        Supported OS: <strong>{{ WINDOWS_MIN_SUPPORT }}</strong> or over
-    </p>
-    {% endif %}
-    <p>
-        These links download the official GIMP installer for Windows (~200 MB).
-        The installer contains both 32-bit and 64-bit versions of GIMP, and will automatically use the 
appropriate one.
-        <!-- The installer contains the 64-bit version of GIMP. -->
-    </p>
-
-    <p>
-        BitTorrent is a peer-to-peer file sharing system. It works by downloading GIMP from a distributed 
network of BitTorrent users, and may improve download speed dramatically.
-        Choosing this option will download the torrent file for the GIMP installer.
-        You may need to install a torrent client to make use of this file. <a 
href="//en.wikipedia.org/wiki/BitTorrent" title="BitTorrent on Wikipedia">Learn more...</a>
-    </p>
+    <h3>Warnings and information</h3>
+    <ul>
+      <li>
+          These links download the official GIMP installer for Windows (~200 MB).
+          The installer contains both 32-bit and 64-bit versions of GIMP, and will automatically use the 
appropriate one.
+      </li>
+      <li>
+          BitTorrent is a peer-to-peer file sharing system. It works by downloading GIMP from a distributed 
network of BitTorrent users, and may improve download speed dramatically.
+          Choosing this option will download the torrent file for the GIMP installer.
+          You may need to install a torrent client to make use of this file. <a 
href="//en.wikipedia.org/wiki/BitTorrent" title="BitTorrent on Wikipedia">Learn more...</a>
+      </li>
+      {% if WINDOWS_FILE_DEVELOPMENT is defined %}
+      <li>
+          <p>🤫Pssst... want to check out the <strong>GIMP {{ GIMP_VERSION_DEVELOPMENT
+          }} development release?</strong> Get it on our <a
+          href="/downloads/devel/">development downloads page</a> 🧪.</p>
+      </li>
+      {% endif %}
+    </ul>
 
     <h3>Hash Sum</h3>
     <p>
@@ -402,10 +422,6 @@
     <a
     href='//download.gimp.org/mirror/pub/gimp/v{{ GIMP_MAJOR_MINOR_VERSION 
}}/'>https://download.gimp.org/mirror/pub/gimp/v{{ GIMP_MAJOR_MINOR_VERSION }}/</a>
     </p>
-    <p>For instructions, how to build GIMP from source code, please see <a href='/source/'>this page</a>.</p>
-
-    <p>You may want to read the <a
-    href='/release-notes/gimp-{{ GIMP_MAJOR_MINOR_VERSION }}.html'>Release Notes for GIMP {{ 
GIMP_MAJOR_MINOR_VERSION }}</a>.</p>
 
     <details class='hashes'>
       <summary>
@@ -433,6 +449,12 @@
     {% endif %}
     </details>
 
+    <p>For instructions, how to build GIMP from source code, please see <a href='/source/'>this page</a>.</p>
+
+    <p>You may want to read the <a
+    href='/release-notes/gimp-{{ GIMP_MAJOR_MINOR_VERSION }}.html'>Release Notes for GIMP {{ 
GIMP_MAJOR_MINOR_VERSION }}</a>.</p>
+
+    <h3>User Manual</h3>
 
     <p>
         GIMP help files are available at <a 
href='//download.gimp.org/mirror/pub/gimp/help/'>https://download.gimp.org/mirror/pub/gimp/help/</a>.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]