(turbine-site) branch master updated: Update Turbine main site with Apache Logo separated Logo text, relocate development to default subdir /turbine/turbine-7-1 in .asf.yaml

[gk]

This is an automated email from the ASF dual-hosted git repository.

gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c9be46  Update Turbine main site with Apache Logo separated Logo 
text, relocate development to default subdir /turbine/turbine-7-1 in .asf.yaml
1c9be46 is described below

commit 1c9be46134b8e45429ad2fae373b2cc789cae6e4
Author: Georg Kallidis <g...@apache.org>
AuthorDate: Wed Sep 10 15:11:57 2025 +0200

    Update Turbine main site with Apache Logo separated Logo text, relocate 
development to default subdir /turbine/turbine-7-1 in .asf.yaml
---
 src/site/site.xml       | 30 +++++++++++++++++-------------
 src/site/xdoc/index.xml |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index f4c8103..909768e 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,16 +18,21 @@
  under the License.
 -->
 
-<site xmlns="http://maven.apache.org/SITE/2.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 
https://maven.apache.org/xsd/site-2.0.0.xsd";
-  name="Apache Turbine" combine.self="merge">  
-
-  <bannerLeft href="https://turbine.apache.org/";>
-    <image src="https://turbine.apache.org/images/turbine-project.png"; 
alt="Apache Turbine" />
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 
https://maven.apache.org/xsd/decoration-1.8.0.xsd";
+  name="Apache Turbine" combine.self="merge"> 
+ 
+   <bannerLeft>
+    <name>The Apache Turbine project</name>
+    <src>https://www.apache.org/img/feather_glyph_notm.png</src>
+    <href>https://turbine.apache.org/</href>
+    <width>50px</width>
   </bannerLeft>
-
-   <bannerRight href="https://turbine.apache.org/";>
-       <image src="https://turbine.apache.org/images/logo.gif"; />
+  
+    <bannerRight>
+      <href>https://turbine.apache.org/</href>
+      <src>https://turbine.apache.org/images/logo.gif</src>
+      <alt>Apache Turbine</alt>
    </bannerRight>
     
     <publishDate format="dd MMMM yyyy" position="left" />
@@ -59,9 +64,8 @@
     </menu>
     
     <menu name="Events">
-      <item name="Apache Conferences" 
href="https://www.apache.org/events/current-event.html"; target="_blank">
-         <image src="https://www.apache.org/events/current-event-125x125.png"; 
alt=""/>
-      </item>
+      <item name="Apache Conferences" 
href="https://www.apache.org/events/current-event.html"; 
+      target="_blank" 
img="https://www.apache.org/events/current-event-125x125.png"; alt=""/>
     </menu>
 
     <menu name="Turbine Releases">
@@ -121,4 +125,4 @@
   </body>
   <!-- custom configured in parent site.xml -->
     
-</site>
+</project>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index f35b762..323c679 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -91,7 +91,7 @@
     
      <subsection name="Development">
           <ul>
-          <li><strong><a href="turbine/development/turbine-7-1/">Turbine 
7.1</a></strong> is  the current development master. It is Java 17 based.
+          <li><strong><a href="turbine/turbine-7-1/">Turbine 7.1</a></strong> 
is  the current development master. It is Java 17 based.
             </li>
            </ul>
      </subsection>