Randomly order organisation donation links too

app/resources/surveys/SurveysController.jl

@@ -182,7 +182,15 @@ function submit(forminfo::Dict; backpage::Bool=false)
     end
 end
 
-const DONATION_INDIVIDUALS = [
+const DONATION_ENTITIES = [
+    ("https://my.fsf.org/donate",
+     "The Free Software Foundation",
+     "https://www.fsf.org/",
+     "principle organisational sponsor of the GNU project"),
+    ("https://liberapay.com/org-mode/",
+     "The Org Project",
+     "https://orgmode.org",
+     ["org-mode" => "https://orgmode.org"]),
     ("https://liberapay.com/hlissner/",
      "Henrik Lissner", "hlissner",
      ["Doom Emacs" => "doomemacs/doomemacs", "assorted packages"]),
@@ -217,20 +225,7 @@ const DONATION_INDIVIDUALS = [
      ["this survey", "a few other things"])
 ]
 
-function donationlinks()
-    donate_org = ("https://liberapay.com/org-mode/",
-                  "The Org Project",
-                  "https://orgmode.org",
-                  ["org-mode" => "https://orgmode.org"])
-    donate_fsf = ("https://my.fsf.org/donate",
-                  "The Free Software Foundation",
-                  "https://www.fsf.org/",
-                  ["an assortment of projects"])
-    donate_specs = vcat(donate_org,
-                       shuffle(DONATION_INDIVIDUALS),
-                       donate_fsf)
-    donate_spec_to_link.(donate_specs)
-end
+donationlinks() = donate_spec_to_link.(shuffle(DONATION_ENTITIES))
 
 function donate_spec_to_link((link, name, site, projects))
     string("<li><a href=\"$link\"><b>Donate to</b></a> ",
@@ -246,26 +241,30 @@ function donate_spec_to_link((link, name, site, projects))
                  style=\"color: var(--secondary)\" \
                  title=\"GitHub profile\">@$site</a>"
            end,
-           " (responsible for ",
-           join(map(projects) do proj
-                    if proj isa String
-                        proj
-                    elseif proj isa Pair{String,String}
-                        string("<a href=\"",
-                               if occursin("http", proj[2])
-                                   proj[2]
-                               elseif occursin("/", proj[2])
-                                   "https://github.com/$(proj[2])"
-                               elseif !isnothing(site)
-                                   "https://github.com/$site/$(proj[2])"
-                               end,
-                               "\" target=\"_blank\" title=\"Project page\" \
-                                style=\"color: var(--h1-color)\">",
-                               proj[1], "</a>")
-                    else
-                        ""
-                    end
-                end, ", ", ", and "),
+           if projects isa String
+               " ($projects)"
+           else
+               " (responsible for ",
+               join(map(projects) do proj
+                        if proj isa string
+                            proj
+                        elseif proj isa pair{string,string}
+                            string("<a href=\"",
+                                if occursin("http", proj[2])
+                                    proj[2]
+                                elseif occursin("/", proj[2])
+                                    "https://github.com/$(proj[2])"
+                                elseif !isnothing(site)
+                                    "https://github.com/$site/$(proj[2])"
+                                end,
+                                "\" target=\"_blank\" title=\"project page\" \
+                                    style=\"color: var(--h1-color)\">",
+                                proj[1], "</a>")
+                        else
+                            ""
+                        end
+                    end, ", ", ", and ")
+               end,
            ")</li>")
 end
 

app/resources/surveys/views/thanks.jl.html

@@ -22,7 +22,8 @@
     the work they do and helps people find and justify the time they spend
     improving the state of Emacs' ecosystem.</p>
     <p>Should this sound like something you would be interested in, here
-    is a small selection of donation links that may be of interest.</p>
+    is a small (randomly ordered) selection of donation links that may be of
+    interest.</p>
     <ul>
         $(join(donateitems, '\n'))
     </ul>

public/css/style.css

@@ -150,9 +150,9 @@ kbd {
   --h6-color: #4d606d;
   --muted-color: #73828c;
   --muted-border-color: #edf0f3;
-  --primary: #622486;
-  --primary-hover: #3E0C5C;
-  --primary-focus: rgba(98, 36, 134, 0.125);
+  --primary: #624195;
+  --primary-hover: #4f3774;
+  --primary-focus: rgba(98, 65, 149, 0.125);
   --primary-inverse: #fff;
   --secondary: #596b78;
   --secondary-hover: #415462;
@@ -239,9 +239,9 @@ kbd {
     --h6-color: #aebbc3;
     --muted-color: #73828c;
     --muted-border-color: #1f2d38;
-    --primary: #622486;
+    --primary: #624195;
     --primary-hover: #7F5AB6;
-    --primary-focus: rgba(98, 36, 134, 0.25);
+    --primary-focus: rgba(98, 65, 149, 0.25);
     --primary-inverse: #fff;
     --secondary: #596b78;
     --secondary-hover: #73828c;
@@ -328,9 +328,9 @@ kbd {
   --h6-color: #aebbc3;
   --muted-color: #73828c;
   --muted-border-color: #1f2d38;
-  --primary: #622486;
+  --primary: #624195;
   --primary-hover: #7F5AB6;
-  --primary-focus: rgba(98, 36, 134, 0.25);
+  --primary-focus: rgba(98, 65, 149, 0.25);
   --primary-inverse: #fff;
   --secondary: #596b78;
   --secondary-hover: #73828c;

public/css/style.scss

@@ -9,8 +9,8 @@ $enable-classes: true;
 
 // Custom theme
 $primary-500: #7F5AB6;
-$primary-600: #622486;
-$primary-700: #3E0C5C;
+$primary-600: #624195;
+$primary-700: #4f3774;
 
 // Pico Lib
 // --------------------