Replace old DB icon

src/main/asciidoc/index.adoc

@@ -6,11 +6,9 @@
 
 [[index]]
 
-image:images/db-logo-blue.png[float="right"]
-
 '''''
 
-== Welcome!
+== Welcome to the Apache DB Project!
 
 [#DB_Mission]
 == DB Mission

src/main/asciidoc/whoweare.adoc

@@ -117,6 +117,8 @@ others can also learn from common mistakes and as a community we all grow togeth
 
   |Tomohito Nakayama |tmnk |tmnk@apache.org |The Apache Software Foundation |PMC Member, Derby
 
+  |Tobias Bouschen |tobous |tobous@apache.org | The Apache Software Foundation |PMC Member, JDO
+
   |Thomas Dudziak |tomdz |tomdz@apache.org |The Apache Software Foundation |PMC Member
 
   |Thomas Vandahl |tv |tv@apache.org |The Apache Software Foundation |PMC Member, Torque
@@ -134,6 +136,4 @@ All DB PMC member listed above are DB commiters, plus the following Apache commi
 
   |Brett Bergquist |bbergquist |bbergquist@apache.org | |
 
-  |Tobias Bouschen |tobous |tobous@apache.org | |
-
 |===

src/main/template/document.html.erb

@@ -13,7 +13,7 @@
 
     <title><%= doctitle(:sanitize => true) || (attr 'untitled-label') %></title>
 
-    <link rel="icon" type="image/png" href="<%= (attr :_basedir) %>images/db-logo-white.png"/>
+    <link rel="icon" type="image/png" href="https://www.apache.org/img/feather_glyph_notm.png"/>
 
     <!--
         Apache DB Documentation Template
@@ -94,8 +94,10 @@
             </button>
             <!-- 'style' added to align image with navbar. FIX THIS -->
             <a class="navbar-brand" href="https://db.apache.org/">
-                <!-- img style="margin-top: -12px;" alt="Brand" width="405.5" height="45.5" src="<%= (attr :_basedir) %>images/db-logo-blue.png"/ -->
-                <img style="margin-top: -12px;" alt="Brand" width="250" height="45.5" src="<%= (attr :_basedir) %>images/db-logo-white.png"/>
+                <div style="display: flex; align-items: center; margin-top: -12px;">
+                    <img alt="Brand" style="height: 45px; padding-right: 5px" src="https://www.apache.org/img/feather_glyph_notm.png"/>
+                    <label style="margin-bottom: 0px; font-weight: normal;">Apache DB</label>
+                </div>
             </a>
             <!-- TODO Any way to abstract the version from Maven? -->
             <!-- a class="navbar-brand" href="<%= (attr :_basedir) %>index.html">Apache DB</a -->
@@ -161,7 +163,7 @@
 
             </ul>
            <!-- 'style' added to fix height of input box. FIX THIS -->
-            <form class="navbar-form navbar-left" role="search" id="search-form" action="https://www.google.com/search" method="get" style="padding: 1px 15px;">
+            <form class="navbar-form navbar-right" role="search" id="search-form" action="https://www.google.com/search" method="get" style="padding: 1px 15px;">
                 <div class="form-group">
                     <input name="sitesearch" value="db.apache.org" type="hidden">
                     <input name="q" type="text" class="form-control" placeholder="Search" style="margin-top: 7px; padding: 1px; border-radius: 5px; height: 30px; vertical-align: middle;">
@@ -207,8 +209,8 @@
 <% if is_footer? then %>
   <footer style="color:#fff; background-color:#222222; padding: 5px;">
   <div class="container">
-      <p class="text-center" style="margin-top:16px">Copyright &copy; 2005-2022 Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" title="Apache License">Apache License, Version 2.0.</a></p>
-      <p class="text-center" style="margin-top:16px">Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+      <p class="text-center" style="margin-top:16px">Copyright &copy; 2005-2025 Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" title="Apache License">Apache License, Version 2.0.</a></p>
+      <p class="text-center" style="margin-top:16px">Apache, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
   </div>
   </footer>
 <% end %>