Assorted website updates

_includes/nav.html

@@ -31,6 +31,7 @@
             <li><a href="/support">Commercial Support</a></li>
             <li><a href="/issues">Issue Tracker</a></li>
             <li><a href="/devel">Community Development</a></li>
+            <li><a href="/sponsor">Sponsorship</a></li>
             <li><a href="/roadmap">Roadmap</a></li>
             <li><a href="{{ site.wiki_url }}/Home" target="_blank">Wiki</a></li>
             <li><a href="{{ site.git_url }}/graphs/contributors">Contributors</a></li>
@@ -41,5 +42,7 @@
       </ul>
     </div>
     <a href="https://github.com/geoserver/geoserver" target="_blank">
-      <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png"></a>
+      <img style="position: absolute; top: 0; right: 0; border: 0;"
+           decoding="async" loading="lazy" width="149" height="149" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_green_007200.png?resize=149%2C149" class="attachment-full size-full" alt="Fork me on GitHub" data-recalc-dims="1">
+    </a>
   </nav>

comm/index.html

@@ -39,12 +39,11 @@ <h3>User List</h3>
             <strong>Do <i>not</i> report security vulnerabilities here.  See the <i>Responsible disclosure</i> instructions above.</strong>
         </p>
         <ul>
-            <li>Sign up to <a href="https://lists.sourceforge.net/mailman/listinfo/geoserver-users">geoserver-users</a> email list on Source Forge.
+            <li>Sign up to <a href="https://lists.sourceforge.net/mailman/listinfo/geoserver-users">geoserver-users</a> email list on Source Forge. After subscribing you can post at geoserver-users@lists.sourceforge.net
               <div class="alert alert-info">
                  GeoServer activities follow the <a href="https://www.osgeo.org/code_of_conduct/">OSGeo code of conduct</a>, in addition please ensure you have read through the  <a href="userlist-guidelines.html" class="alert-link">post guidelines</a> before sending email to the user list.
               </div>
             </li>
-	    <li>After subscribing you can post at geoserver-users@lists.sourceforge.net</li>
             <li><a href="https://sourceforge.net/p/geoserver/mailman/geoserver-users/">List archive</a> from SourceForge.<br/>
                <form method="get" action="https://www.google.com/search">
                   <input type='text' name='q' size='50' value='' placeholder='GeoServer {{site.stable_version}} ' />
@@ -61,12 +60,6 @@ <h3>User List</h3>
                   <input type="submit" value="Search" />
                </form>
             </li>
-            <li>
-              <a href="http://osgeo-org.1560.x6.nabble.com/GeoServer-User-f3786390.html">Alternate archive</a> from nabble
-              <div class="alert alert-info">
-                 If you wish to post using nabble please pay attention to their instructions on subscribing - Nabble is full of frustrated users wondering why we do not reply!
-               </div>
-            </li>
         </ul>
     </section>
 </section>
@@ -86,15 +79,28 @@ <h2>Question and Answer Forum</h2>
     </p>
 </section>
 
+<a id="social"></a>
+<section>
+    <h2>Social Media</h2>
+    <p>
+    Connect with GeoServer enthusiasts world wide:
+    </p>
+    <ul>
+    <li><a href="https://www.linkedin.com/groups/813717/">LinkedIn</a></li>
+    <li><a href="https://fosstodon.org/@geoserver">@geoserver@fosstodon.org</a></li>
+    <li><a href="https://twitter.com/GeoserverO">@GeoserverO</a></li>
+    </ul>
+</section>
+
 <a id="slack"></a>
 <section>
     <h2>Chat</h2>
     <p>
     Connect with community members:
     </p>
     <ul>
+    <li><a href="https://matrix.to/#/#general:osgeo.org">general:osgeo.org</a> matrix channel (access from <a href="https://element.io/">element.io</a> or <a href="https://osgeo.slack.com/home">slack</a>)</li>
     <li><a href="https://thespatialcommunity.org">The Spatial Community</a> is an active slack group, drop into the #geoserver channel and introduce yourself.</li>
-    <li>OSGeo maintains a <a href="http://freenode.net/">Freenode</a> #osgeo channel on <a href="irc://freenode/osgeo">"IRC"</a>. Use your IRC client to connect, or the provided <a href="https://matrix.org">[matrix]</a> bridge to access from <a href="https://about.riot.im">Riot.IM</a> or <a href="https://osgeo.slack.com/home">slack</a>.</li>
     </ul>
     <p>
     Keep in mind this is a venue to meet others and not intended to be a live question and answer session.

devel/index.html

@@ -32,7 +32,12 @@ <h3><a href="https://lists.sourceforge.net/mailman/listinfo/geoserver-devel">Dev
             here.  See the <a href="https://osgeo-org.atlassian.net/projects/GEOS/summary">"Responsible disclosure"</a> instructions.</strong>
         </p>
          <ul>
-            <li><a href="http://sourceforge.net/p/geoserver/mailman/geoserver-devel">List archive</a> from SourceForge and <a href="https://lists.sourceforge.net/lists/listinfo/geoserver-devel">signup</a><br/>
+            <li>Sign up to <a href="https://lists.sourceforge.net/mailman/listinfo/geoserver-devel">geoserver-devel</a> email list on Source Forge.  After subscribing you can post at geoserver-devel@lists.sourceforge.net.
+              <div class="alert alert-info">
+                  The same <a href="https://www.osgeo.org/code_of_conduct/">OSGeo code of conduct</a> and <a href="/comm/userlist-guidelines.html" class="alert-link">post guidelines</a> as the user list apply to the developer list.
+              </div>
+            </li>
+            <li><a href="http://sourceforge.net/p/geoserver/mailman/geoserver-devel">List archive</a> from SourceForge.<br/>
                <form method="get" action="https://sourceforge.net/p/geoserver/mailman/search/">
                   <input type='text' name='q' size='50' value='' placeholder='GSIP'/>
                   <input type="submit" value="Search" />
@@ -51,14 +56,11 @@ <h3><a href="https://lists.sourceforge.net/mailman/listinfo/geoserver-devel">Dev
                   <input type="hidden" name='sitesearch' value='https://sourceforge.net/p/geoserver/mailman/geoserver-devel/' />
                   <input type="submit" value="Google" />
                </form>
-            <li>
-               <a href="http://osgeo-org.1560.x6.nabble.com/GeoServer-Dev-f3819232.html">Alternate archive</a> from nabble
             </li>
-	    <li>After subscribing you can post at geoserver-devel@lists.sourceforge.net</li>
         </ul>
        <p>
-        <div class="alert alert-info">
-            The same <a href="https://www.osgeo.org/code_of_conduct/">OSGeo code of conduct</a> and <a href="/comm/userlist-guidelines.html" class="alert-link">post guidelines</a> as the user list apply to the developer list.</p> 
+
+      </p> 
     </section>
 </section>
 
@@ -86,10 +88,17 @@ <h2>GeoServer Meeting</h2>
 </section>
 
 <section>
-    <h2>Monthly Bug Stomp</h2>
+    <h2>Chat</h2>
+    <p>
+    Development and release coordination:
+    </p>
+    <ul>
+    <li><a href="https://matrix.to/#/#geoserver_geoserver:gitter.im">geoserver_geoserver:gitter.im</a></li>
+    </ul>
+    <p>
+    Keep in mind this is a venue to work on GeoServer and not intended to be a live question and answer session.
+    </p>
     <p>
-        The GeoServer team has setup a bug stomp to work on GeoServer maintenance activities
-        on the last Friday of each month. If you would like to take part please introduce
-        yourself on the developper list - we look forward to working with you.
+
     </p>
 </section>

index.html

@@ -36,6 +36,11 @@
   margin-bottom: 10px;
 }
 
+#core-contributors img {
+  margin-left: 5px;
+  margin-right: 5px;
+}
+
 .ol-attribution {
   background: rgba(255,255,255,0.8);
   color: #333;
@@ -44,6 +49,8 @@
 .ol-attribution a {
   color: #7b98bc;
 }
+
+a.masto-link { display:none; }
 </style>
 <script>
 function init() {
@@ -117,34 +124,59 @@ <h4>OGC Implementation</h4>
       <p class="text-left">
         GeoServer implements industry standard OGC protocols such as Web Feature Service (WFS), Web Map Service (WMS), and Web Coverage Service (WCS). Additional formats and publication options are available as extensions including Web Processing Service (WPS), and Web Map Tile Service (WMTS).
       </p>
-      <p class="text-left">
-        GeoServer is working with the OSGeo Foundation to be certified as compliant and we need your help. Both <a href="https://github.com/geoserver/geoserver/wiki/Sponsor">financial support</a> and <a href="https://github.com/geoserver/geoserver/wiki/Restore-CITE-Certification">developers</a> are needed to complete this activity.
     </div>
     <div class="col-md-6">
       <h4>Part of a Vibrant Open Source Community</h4>
       <p class="text-left">
         GeoServer is developed, tested, and supported as community-driven project by a diverse group of individuals and organizations around the world. We are proud to be a recognized <a href="https://osgeo.org/projects/geoserver/">Open Source Geospatial Foundation</a> project.
       </p>
       <p class="text-left">
-        GeoServer participates in the annual <a href="https://foss4g.org/">Free and Open Source Software for Geospatial</a> conference <!--, join us for <a href="https://2022.foss4g.org/">FOSS4G 2022 - Firenze</a>-->!
+        GeoServer participates in the annual <a href="https://foss4g.org/">Free and Open Source Software for Geospatial</a> conference.
       </p>
       <a href="https://osgeo.org/projects/geoserver/">
         <img src="img/OSGeo_project.png" width="150" height="58"/>
       </a>
-      <!--a href="https://2022.foss4g.org/">
-        <img src="img/foss4g.png" width="150" height="54">
-    </a-->
+      <a href="https://foss4g.org/">
+        <img src="img/foss4g.png" width="90" height="50">
+      </a>
     </div>
   </div>
 </section>
 
-<section id="thanks" class="text-center">
-  <h2>Special Thanks</h2>
+<section id="support" class="text-center">
+  <h2>Supported by</h2>
   <p class="lead"></p>
   <div class="row">
-    <div class="col-md-6" id="sponsor">
+    <div class="col-md-6" id="core-contributors">
+       <p class="text-left">
+          Core contributors take on an ongoing responsibility for the GeoServer project.
+      </p>
+      <a href="https://www.geosolutionsgroup.com">
+        <img src="support/img/geosolutions-logo.png" height="52"
+             title="GeoSolutions"/>
+      </a>
+      <a href="http://www.astuntechnology.com/">
+        <img src="support/img/astun-logo.png" height="52"
+             title="Astun Technology"/>
+      </a>
+      <a href="https://www.geocat.net/">
+        <img src="support/img/geocat-logo.png" height="52"
+             title="GeoCat BV"/>
+      </a>
+    </div>
+    <div class="col-md-6" id="sponsors">
+       <p class="text-left">
+       2023 Sponsors:
+       </p>
+       <a href="https://northrivergeographic.com">
+         <img src="sponsor/img/north-river-geographic.png" height="52"
+              title="North River Geographic Systems Inc"/>
+       </a>
        <p class="text-left">
-          Thanks for your <a href="https://github.com/geoserver/geoserver/wiki/Sponsor">sponsorship</a> and <a href="https://github.com/sponsors/OSGeo">github</a> / <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4XZ76BZMEWZ24&source=url">paypal</a> donations. Financial support contributes to project sustainability by supporting underfunded <a href="https://github.com/geoserver/geoserver/wiki/Maintenance">maintenance</a>, <a href="https://github.com/geoserver/geoserver/blob/main/SECURITY.md">security</a>, and <a href="https://github.com/geoserver/geoserver/wiki/Restore-CITE-Certification">interoperability</a> activities.
+          Financial support contributes to project sustainability by supporting underfunded <a href="https://github.com/geoserver/geoserver/wiki/Maintenance">maintenance</a>, <a href="https://github.com/geoserver/geoserver/blob/main/SECURITY.md">security</a>, and <a href="https://github.com/geoserver/geoserver/wiki/Restore-CITE-Certification">interoperability</a> activities.
+       </p>
+       <p class="text-left">
+          <a href="sponsor/">GeoServer Sponsorship</a> is recognized by OSGeo sponsorship program offering increased visibility and promotion beyond this website.
       </p>
       <a href="mailto:treasurer@osgeo.org?subject=GeoServer Sponsorship&body=We would like to sponsor the GeoServer Project, as a member of the GeoServer community we recognize the value in supporting open source.%0d%0aPlease send us an invoice for $3000 USD. This brings our total sponsorship to the level to be recognized as an OSGeo Silver sponsor.">
         <img src="img/osgeo-logo.png" width="150" height="49"/>
@@ -155,6 +187,14 @@ <h2>Special Thanks</h2>
       <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4XZ76BZMEWZ24&source=url">
         <img src="img/btn_donateCC_LG.gif" width="147" height="47"/>
       </a>
+    </div>
+  </div>
+</section>
+<section id="thanks" class="text-center">
+  <h2>Acknowledgements</h2>
+  <p class="lead"></p>
+  <div class="row">
+    <div class="col-md-6" id="sponsor">
       <p class="text-left">
          Development tools provided to GeoServer as an open-source project:
       </p>
@@ -163,9 +203,10 @@ <h2>Special Thanks</h2>
     </div>
     <div class="col-md-6" id="books">
        <p class="text-left">
-         Purchase of <a href="https://www.packtpub.com/application-development/geoserver-beginner’s-guide">GeoServer Beginner's Guide</a>, <a href="https://www.packtpub.com/application-development/geoserver-cookbook">GeoServer Cookbook</a>, <a href="https://www.packtpub.com/networking-and-servers/mastering-geoserver">Mastering GeoServer</a>, <a href="https://www.packtpub.com/application-development/geoserver-beginner%E2%80%99s-guide-second-edition">GeoServer Beginner's Guide - Second Edition</a> <a href="https://www.packtpub.com/application-development/fundamentals-geoserver-video">Fundamentals of Geoserver [Video]</a> and <a href="https://www.packtpub.com/application-development/expert-geoserver">Expert Geoserver</a> from Packt Publishing help support the GeoServer team.
+         Purchase of <a href="https://www.packtpub.com/product/geoserver-beginners-guide-second-edition">GeoServer Beginner's Guide</a>, <a href="https://www.packtpub.com/application-development/geoserver-cookbook">GeoServer Cookbook</a>, <a href="https://www.packtpub.com/networking-and-servers/mastering-geoserver">Mastering GeoServer</a>, <a href="https://www.packtpub.com/application-development/fundamentals-geoserver-video">Fundamentals of GeoServer [Video]</a>, and <a href="https://www.packtpub.com/application-development/expert-geoserver">Expert GeoServer</a> from Packt Publishing help support the GeoServer team.
        </p>
-       <a href="http://www.packtpub.com/geoserver-share-edit-geospatial-data-beginners-guide/book"><img src="img/books.png"/ ></img></a>
+       <a href="https://subscription.packtpub.com/search?query=geoserver"><img src="img/books.png"/ ></img></a>
     </div>
   </div>
+  <a class="masto-link" rel="me" href="https://fosstodon.org/@geoserver">GeoServer on Mastodon</a>
 </section>