Merge pull request #1494 from xsf/update-people

Update people

content/about/xmpp-standards-foundation.md

@@ -21,7 +21,7 @@ The Board of Directors of the XMPP Standards Foundation oversees the business af
 
 - __Dave Cridland__ is an independent consultant for Extensible Messaging Ltd, working mostly on XMPP-based messaging things for a number of clients. This isn't his first time on the Board, and he has been on the XMPP Council for a number of years as well. Will nobody ever learn? He has worked extensively on multiple XMPP server projects, including Isode's M-Link, Ignite Realtime's Openfire, and his own Metre project. His hobbies include working on XMPP servers, which is just as well, and writing about himself in the third person, which is really coming into its own right now. Drop him a message via [XMPP](xmpp:dwd@dave.cridland.net).
 - __Edward Maurer__ is working in engineering automation (energy sector, non-XMPP) and is volunteering in XMPP since more than five years already. Since 2020 he is thriving the [XSF Communication Team](https://xmpp.org/about/xsf/comm-team/). Besides successfully supporting the XMPP Community and its projects he is co-author of [XMPP Providers](https://providers.xmpp.net/). Find the contact and details in the [XMPP wiki profile](https://wiki.xmpp.org/web/User:Echolon).
-- __Ralph Meijer__ is the lead developer of several Jabber-related projects and services, including Wokkel and the XMPP support in Twisted, the Idavoll pubsub component, and Planet Jabber. Ralph has been member of the XMPP Council from 2004 to 2013 and Director since 2013. You can find him on [Twitter](http://twitter.com/ralphm) and chat with him on [XMPP](xmpp:ralphm@ik.nu).
+- __Ralph Meijer__ is an independent consultant for Nuntians Services B.V., working on real-time communications systems, event-driven architectures, and observability. He is the lead developer of several XMPP related projects and services, including Wokkel and the XMPP support in Twisted, the Idavoll pubsub component, and Planet Jabber. Ralph has been member of the XMPP Council from 2004 to 2013 and Director since 2013. You can contact him via [email](mailto:ralphm@ik.nu) or [XMPP](xmpp:ralphm@ik.nu).
 - __Florian Schmaus__ is a software developer and long-standing contributor to the XMPP community. He is leading the development of Smack, an XMPP client library targeting Android and Java. His interests include operating systems, parallel runtime systems, and systems software in general. Fittingly, Florian also conducts research in this area and helps students unravel the black box inside modern computing systems. Besides that, he enjoys spending time with his family.
 - __Arne-Bruen Vogelsang__ is the founder and lead developer of [monocles](https://monocles.eu/more/). Whereas he is maintaining two public XMPP servers and [monocles chat]( https://f-droid.org/packages/de.monocles.chat/) is a known XMPP chat client for Android, he's also working on other non-XMPP related open source projects.
 During his studies he learned a lot about the need for more ethical and fair digital and technological solutions. He also experienced the business side for founding a sustainable company providing open source solutions.

content/about/xsf/jabber-trademark/_index.md

@@ -22,4 +22,4 @@ For further information, visit any of the following pages:
 - [Trademark License Agreement](/about/xsf/jabber-trademark/trademark-license-agreement)
 - [Approved applications](/about/xsf/jabber-trademark/approved-applications)
 
-If you have any questions about the Jabber Trademark Licensing Program, please contact [trademark@jabber.org](mailto:trademark@jabber.org) or [Peter Saint-Andre](/about/xsf/people), the XSF’s Executive Director.
+If you have any questions about the Jabber Trademark Licensing Program, please contact [trademark@jabber.org](mailto:trademark@jabber.org) or [Peter Saint-Andre](/about/xsf/people).

content/about/xsf/organizational-documents.md

@@ -23,4 +23,4 @@ The Jabber Software Foundation (JSF) was incorporated in August 2001 and renamed
 
 Note: The original incorporator was the first Executive Director, Michael Bauer (then affiliated with Jabber Inc.), who worked with the law firm of Gray, Plant, Mooty, Mooty & Bennett on the incorporation. The initial Board of Directors consisted of Andre Durand (then of Jabber Inc.), James Barry (then of CollabNet), Jeremie Miller (inventor of Jabber technologies), and Dan Powers (then of IBM). The initial officers of the JSF were Michael Bauer (Executive Director), Andre Durand (Chair of the Board), Peter Saint-Andre (Secretary), and Stuart Lucko (Treasurer). Since that time, the various officers and Board members have changed in accordance with the procedures defined in the organization’s [Bylaws](/about/xsf/bylaws).
 
-If you have any questions about these documents, please contact Peter Saint-Andre, [Executive Director](/about/xsf/people) of the XSF.
+If you have any questions about these documents, please contact Peter Saint-Andre.

content/about/xsf/people.md

@@ -8,7 +8,7 @@ layout: single_xsf
 
 ### XSF Chair{#chair}
 
-Chairman of the XSF is Ralph Meijer. Ralph is the lead developer of several Jabber-related projects and services, including Wokkel and the XMPP support in Twisted, the Idavoll pubsub component, and Planet Jabber. Ralph has been member of the XMPP Council from 2004 to 2013 and Director since 2013. You can find him on [Twitter](http://twitter.com/ralphm) and chat with him on [XMPP](xmpp:ralphm@ik.nu)
+Chairman of the XSF is Ralph Meijer. Ralph is an independent consultant for Nuntians Services B.V., working on real-time communications systems, event-driven architectures, and observability. He is the lead developer of several XMPP related projects and services, including Wokkel and the XMPP support in Twisted, the Idavoll pubsub component, and Planet Jabber. Ralph has been member of the XMPP Council from 2004 to 2013 and Director since 2013. You can contact him via [email](mailto:ralphm@ik.nu) or [XMPP](xmpp:ralphm@ik.nu).
 
 ### Executive Director{#executive-director}
 

themes/xmpp.org/layouts/shortcodes/xsf-diagram.html

@@ -3,7 +3,7 @@
 {{- $emeriti := .Site.Data.members.emeriti -}}
 
 <div class="row gy-2 pb-2">
-    <div class="col-sm-6">
+    <div class="col">
         <div class="card border-secondary">
             <div class="card-header text-bg-secondary">
                 Council
@@ -22,7 +22,7 @@
             </div>
         </div>
     </div>
-    <div class="col-sm-6">
+    <div class="col">
         <div class="card border-secondary">
             <div class="card-header text-bg-secondary">
                 Board of Directors
@@ -55,44 +55,41 @@
             </div>
         </div>
     </div>
-</div>
-<div class="row gy-2 pb-2">
     <div class="col">
         <div class="card border-secondary">
             <div class="card-header text-bg-secondary">
-                XSF Secretary
+                XSF Officers
             </div>
             <ul class="list-group list-group-flush">
+                {{ range $members }}
+                    {{ if and (in .roles "board") (in .roles "chair") }}
+                        <li class="list-group-item small">
+                            Chair: <a href="/about/xsf/people#chair">{{ .name }}</a>
+                        </li>
+                    {{ end }}
+                {{ end }}
+                {{ range $members }}
+                    {{ if in .roles "ed" }}
+                        <li class="list-group-item small">
+                            Executive Director: <a href="/about/xsf/people#executive-director">{{ .name }}</a>
+                        </li>
+                    {{ end }}
+                {{ end }}
                 {{ range $members }}
                     {{ if in .roles "secretary" }}
                         <li class="list-group-item small">
-                            {{ .name }}
+                            Secretary: <a href="/about/xsf/people#secretary">{{ .name }}</a>
                         </li>
                     {{ end }}
                 {{ end }}
-            </ul>
-            <div class="card-footer">
-                <small class="text-body-secondary"><a href="/about/xsf/people#secretary">Read more…</a></small>
-            </div>
-        </div>
-    </div>
-    <div class="col">
-        <div class="card border-secondary">
-            <div class="card-header text-bg-secondary">
-                XSF Treasurer
-            </div>
-            <ul class="list-group list-group-flush">
                 {{ range $members }}
                     {{ if in .roles "treasurer" }}
                         <li class="list-group-item small">
-                            {{ .name }}
+                            Treasurer: <a href="/about/xsf/people#treasurer">{{ .name }}</a>
                         </li>
                     {{ end }}
                 {{ end }}
             </ul>
-            <div class="card-footer">
-                <small class="text-body-secondary"><a href="/about/xsf/people#treasurer">Read more…</a></small>
-            </div>
         </div>
     </div>
 </div>