Fix formatting for signatories & contributors (#308)

* Sort signatories * Use generalised list for contributors * Revert to separate shortcodes * Prevent wrap on names
Minimum-CD · Jun 28, 2023 · 3da87dd · 3da87dd
1 parent 5fd88b8
commit 3da87dd
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 124 deletions.
diff --git a/content/MinimumCD/_index.md b/content/MinimumCD/_index.md
@@ -84,6 +84,8 @@ Do you want to submit a translation, good practices, suggestions, or an experien
 
 Read our [contribution guidelines](https://github.com/Minimum-CD/cd-manifesto/blob/master/CONTRIBUTING.md).
 
+## Contributors
+
 {{< contributors >}}
 
 ## Signatories

diff --git a/content/Translations/German/_index.md b/content/Translations/German/_index.md
@@ -85,6 +85,8 @@ Möchten Sie eine Übersetzung, Best Practices, Vorschläge oder einen Erfahrung
 
 Lesen Sie unsere [Richtlinien für Beiträge](https://github.com/Minimum-CD/cd-manifesto/blob/master/CONTRIBUTING.md)
 
+## Mitwirkende
+
 {{< contributors >}}
 
 ## Unterzeichner

diff --git a/data/names/contributors.yml b/data/names/contributors.yml
@@ -1,144 +1,97 @@
 # For contact info, feel free to use LinkedIn, Twitter, GitHub,
 # or any other location. If you prefer, leave it blank.
 list:
-  - fName: Dave
-    lName: Farley
+  - name: Dave Farley
     contact: https://www.linkedin.com/in/dave-farley-a67927
-  - fName: Azlam
-    lName: Abdulsalam
+  - name: Azlam Abdulsalam
     contact: https://www.linkedin.com/in/azlam
-  - fName: Justin
-    lName: Abrahms
+  - name: Justin Abrahms
     contact: https://justin.abrah.ms
-  - fName: Austin
-    lName: Abro
+  - name: Austin Abro
     contact: https://www.linkedin.com/in/austinabro
-  - fName: Graham
-    lName: Allan
+  - name: Graham Allan
     contact: https://github.com/Grundlefleck
-  - fName: Tracy
-    lName: Bannon
+  - name: Tracy Bannon
     contact: https://www.linkedin.com/in/tracylbannon
-  - fName: Istvan
-    lName: Bathazi
+  - name: Istvan Bathazi
     contact: https://www.linkedin.com/in/istvan-bathazi
-  - fName: Kaine
-    lName: Bent
+  - name: Kaine Bent
     contact: https://www.ka1ne.com
-  - fName: Marc
-    lName: Boudreau
+  - name: Marc Boudreau
     contact: https://www.linkedin.com/in/marc-boudreau
-  - fName: Kelly
-    lName: Brownsberger
+  - name: Kelly Brownsberger
     contact: https://www.linkedin.com/in/kellybrownsberger
-  - fName: Shawn
-    lName: Button
+  - name: Shawn Button
     contact: https://www.linkedin.com/in/shawnbutton
-  - fName: Daniel
-    lName: Calle
+  - name: Daniel Calle
     contact: https://www.linkedin.com/in/danielcallesanchez
-  - fName: Patrice
-    lName: Corbard
+  - name: Patrice Corbard
     contact: https://www.linkedin.com/in/patricecorbard
-  - fName: Jeff
-    lName: Dunn
+  - name: Jeff Dunn
     contact: https://www.linkedin.com/in/jeffadunn
-  - fName: Nick
-    lName: Eggleston
+  - name: Nick Eggleston
     contact: https://www.linkedin.com/in/nick-eggleston-light
-  - fName: Alessandro
-    lName: Fardin
+  - name: Alessandro Fardin
     contact: https://www.linkedin.com/in/alessandro-fardin-61028b28
-  - fName: Javier Lopez
-    lName: Fernandez
+  - name: Javier Lopez Fernandez
     contact: mailto:[email protected]
-  - fName: Bryan
-    lName: Finster
+  - name: Bryan Finster
     contact: https://www.linkedin.com/in/bryan-finster
-  - fName: Tiago
-    lName: Gabriel
+  - name: Tiago Gabriel
     contact: https://dev.to/tgdraugr
-  - fName: Chris
-    lName: Gallivan
+  - name: Chris Gallivan
     contact: https://www.linkedin.com/in/christopher-gallivan-16a2b02
-  - fName: Chris
-    lName: Gossett
+  - name: Chris Gossett
     contact: https://www.linkedin.com/in/christopher-gossett-03b09347
-  - fName: Nathen
-    lName: Harvey
+  - name: Nathen Harvey
     contact: https://twitter.com/nathenharvey
-  - fName: Dave
-    lName: Hawes-Johnson
+  - name: Dave Hawes-Johnson
     contact: https://www.linkedin.com/in/davidhawesjohnson
-  - fName: Adam
-    lName: Hawkins
+  - name: Adam Hawkins
     contact: mailto:[email protected]
-  - fName: Ferrix
-    lName: Hovi
+  - name: Ferrix Hovi
     contact: https://www.linkedin.com/in/ferrix
-  - fName: Justin
-    lName: Thomsen
+  - name: Justin Thomsen
     contact: https://www.linkedin.com/in/juthomsen
-  - fName: Patrick S.
-    lName: Kelso
+  - name: Patrick S. Kelso
     contact: <https://www.linkedin.com/in/patrickkelso/>
-  - fName: Michael
-    lName: Kingery
+  - name: Michael Kingery
     contact: https://www.linkedin.com/in/kingerymike
-  - fName: Jan
-    lName: Krag
+  - name: Jan Krag
     contact: mailto:[email protected]
-  - fName: Andrea
-    lName: Laforgia
+  - name: Andrea Laforgia
     contact: https://www.linkedin.com/in/andrealaforgia
-  - fName: Jean-François
-    lName: Lépine
+  - name: Jean-François Lépine
     contact: https://www.linkedin.com/in/jean-fran%C3%A7ois-l%C3%A9pine-6a122726
-  - fName: Jesse
-    lName: Lin
+  - name: Jesse Lin
     contact: https://www.linkedin.com/in/jesse-lin
-  - fName: Javier A
-    lName: Magaña
+  - name: Javier A Magaña
     contact: https://www.linkedin.com/in/javier-a-magana-98108
-  - fName: Jerreck
-    lName: McWilliams
+  - name: Jerreck McWilliams
     contact: https://www.linkedin.com/in/jerreck
-  - fName: Nathan
-    lName: Nicholson
+  - name: Nathan Nicholson
     contact: https://www.linkedin.com/in/nathan-r-nicholson
-  - fName: Rosalind
-    lName: Radcliffe
+  - name: Rosalind Radcliffe
     contact: https://www.linkedin.com/in/rosalind-radcliffe
-  - fName: Christina
-    lName: Rhylander
+  - name: Christina Rhylander
     contact: https://www.linkedin.com/in/christina-rhylander-78683495
-  - fName: Prasanjit
-    lName: Singh
+  - name: Prasanjit Singh
     contact: https://www.linkedin.com/in/prasanjit-singh
-  - fName: Emiliano
-    lName: Sutil
+  - name: Emiliano Sutil
     contact: https://www.linkedin.com/in/emiliano-sutil-77a2091b
-  - fName: Luca
-    lName: Ingianni
+  - name: Luca Ingianni
     contact: https://www.linkedin.com/in/luca-ingianni
-  - fName: Falko
-    lName: Werner
+  - name: Falko Werner
     contact: https://www.linkedin.com/in/falkowerner
-  - fName: Ferenc
-    lName: Erki
+  - name: Ferenc Erki
     contact: https://ferki.it
-  - fName: Anthony
-    lName: Accioly
+  - name: Anthony Accioly
     contact: https://www.linkedin.com/in/aaccioly/
-  - fName: Sean
-    lName: Poulter
+  - name: Sean Poulter
     contact: https://ca.linkedin.com/in/seanpoulter
-  - fName: Doug
-    lName: Barrett
+  - name: Doug Barrett
     contact: https://dkb.nz/
-  - fName: Luiz
-    lName: Esmiralha
+  - name: Luiz Esmiralha
     contact: https://www.linkedin.com/in/luizesmiralha
-  - fName: Jason
-    lName: Krause
+  - name: Jason Krause
     contact: https://jasonkrause.me
diff --git a/layouts/shortcodes/contributors.html b/layouts/shortcodes/contributors.html
@@ -1,19 +1,19 @@
+{{ $sortedNames := slice }}
+{{ range .Site.Data.names.contributors.list }}
+    {{ $nameParts := split .name " " }}
+    {{ $lastName := index (last 1 $nameParts) 0 }}
+    {{ $newEntry := merge . (dict "lastName" $lastName) }}
+    {{ $sortedNames = $sortedNames | append $newEntry }}
+{{ end }}
+{{ $sortedNames = sort $sortedNames ".lastName" }}
 <div>
-    {{ with $.Site.Data.names.contributors }}
-    {{ $list := ( sort .list "lName" ) }}
-    {{ $len := (len $list) }}
-
-    <h2>Contributors</h2>
-    <h4>({{ $len }})</h4>
-        {{ range $index, $element := $list }}
-            {{ if gt $index 0 }}<bold> &bull; </bold>{{ end }}
-            {{ if .contact }}
-                <a href="{{ .contact }}" alt="{{ .fName }} {{ .lName }}" target="_blank">
-                    {{ .fName }}&nbsp;{{ .lName }}
-                </a>
-            {{ else }}
-                {{ .fName }}&nbsp;{{ .lName }}
-            {{ end }}
+    <h4>({{ len $sortedNames }})</h4>
+    {{ range $index, $element := $sortedNames }}
+        {{ if gt $index 0 }}&bull;{{ end }}
+        {{ if .contact }}
+            <a href="{{ .contact }}" target="_blank" class="nobr">{{ .name }}</a>
+        {{ else }}
+            <a href="#" class="nobr">{{ .name }}</a>
         {{ end }}
     {{ end }}
 </div>
diff --git a/layouts/shortcodes/signatures.html b/layouts/shortcodes/signatures.html
@@ -1,19 +1,12 @@
+{{ $names := .Site.Data.names.signatures.list }}
 <div>
-    {{ with $.Site.Data.names.signatures }}
-    {{ $list := .list }}
-    {{ $len := (len $list) }}
-
-    <h4>({{ $len }})</h4>
-        {{ range $index, $element := $list }}
-            {{ if gt $index 0 }}<bold> &bull; </bold>{{ end }}
-                {{ $fullName := split .name  " " }}
-                {{ if .contact }}
-                    <a href="{{ .contact }}" alt="{{ .name }}" target="_blank">
-                        {{ range $fullName }}{{ . }}&nbsp;{{ end }}
-                    </a>
-                {{ else }}
-                    {{ .name }}
-                {{ end }}
+    <h4>({{ len $names }})</h4>
+    {{ range $index, $element := $names }}
+        {{ if gt $index 0 }}&bull;{{ end }}
+        {{ if .contact }}
+            <a href="{{ .contact }}" target="_blank" class="nobr">{{ .name }}</a>
+        {{ else }}
+            <a href="#" class="nobr">{{ .name }}</a>
         {{ end }}
     {{ end }}
 </div>
diff --git a/static/css/style.css b/static/css/style.css
@@ -9,3 +9,7 @@ body header, header a, header nav {
       display: flex;
     }
 }
+
+.nobr {
+  white-space: nowrap;
+}