[MSKINS-237] Rework skin for new site model

This closes #56

pom.xml

@@ -98,7 +98,7 @@ under the License.
   <properties>
     <bootstrap.version>2.3.2</bootstrap.version>
     <jquery.version>1.11.2</jquery.version>
-    <sitePluginVersion>4.0.0-M9</sitePluginVersion>
+    <sitePluginVersion>4.0.0-M10</sitePluginVersion>
     <projectInfoReportsPluginVersion>3.4.5</projectInfoReportsPluginVersion>
     <project.build.outputTimestamp>2023-07-09T19:58:37Z</project.build.outputTimestamp>
     <anchorjs.version>4.3.1</anchorjs.version>

src/it/mskins-107/verify.groovy

@@ -20,4 +20,4 @@
 File index = new File( basedir, "target/site/index.html" )
 
 assert index.exists()
-assert index.text.contains("<meta name=\"generator\" content=\"Apache Maven Doxia Site Renderer 2.0.0-M11\" />")
+assert index.text.contains("<meta name=\"generator\" content=\"Apache Maven Doxia Site Renderer 2.0.0-M12-SNAPSHOT\" />")

src/it/mskins-28/src/site/site.xml

@@ -43,13 +43,15 @@
 
   <!-- START SNIPPET: skin-custom-config -->
   <poweredBy>
-    <logo name="First Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+    <logo name="First Logo" alt="First Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
     <!-- Second logo is wider than the sidebar -->
-    <logo name="Second Logo" width="500px" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+    <logo name="Second Logo" alt="Second Logo" width="500px" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
     <!-- Third and forth logo fit next to eachother in the sidebar -->
-    <logo name="Third Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
-    <logo name="Fourth Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
-    <logo name="Fifth Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+    <logo name="Third Logo" alt="Third Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+    <logo name="Fourth Logo" alt="Fourth Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+    <logo name="Fifth Logo" alt="Fifth Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+    <logo name="Sixth Logo" alt="Sixth Logo" img="./images/logos/maven-feather.png"/>
+    <logo name="Seventh Logo"/>
   </poweredBy>
   <!-- END SNIPPET: skin-custom-config -->
 

src/it/mskins-76/verify.groovy

@@ -21,17 +21,16 @@ File index = new File( basedir, "target/site/index.html" )
 assert index.exists()
 String text = index.text.normalize()
 assert text.contains( '''\
-<script>
-    /* <![CDATA[ */
+    <script>
         (function() {
             var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
             s.async = true;
             s.src = 'https://api.flattr.com/js/0.6/load.js?mode=auto';
             t.parentNode.insertBefore(s, t);
         })();
-    /* ]]> */</script>'''.normalize() )
+    </script>'''.normalize() )
 
 assert text.contains( '''\
 <a class="FlattrButton" style="display:none;"  href="http://opensource.org/"></a>
     <noscript><a href="https://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank">
-    <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.normalize() )
+    <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" style="border: 0;" /></a></noscript>'''.normalize() )

src/it/mskins-76_topbar/verify.groovy

@@ -21,17 +21,16 @@ File index = new File( basedir, "target/site/index.html" )
 assert index.exists()
 String text = index.text.normalize()
 assert text.contains( '''\
-<script>
-    /* <![CDATA[ */
+    <script>
         (function() {
             var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
             s.async = true;
             s.src = 'https://api.flattr.com/js/0.6/load.js?mode=auto';
             t.parentNode.insertBefore(s, t);
         })();
-    /* ]]> */</script>'''.normalize() )
+    </script>'''.normalize() )
 
 assert text.contains( '''\
 <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://opensource.org/"></a>
     <noscript><a href="https://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank">
-    <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.normalize() )
+    <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" style="border: 0;" /></a></noscript>'''.normalize() )

src/it/sidebar/verify.groovy

@@ -23,9 +23,9 @@ assert index.exists()
 // MSKINS-130 check that html structure is as clean as possible
 String html = index.text
 // active menu
-assert html.contains( '<li class="active"><a><span class="none"></span>About</a>' )
+assert html.contains( '<li class="active"><a>About</a>' )
 // inactive menu
-assert html.contains( '<li><a href="summary.html" title="Summary"><span class="none"></span>Summary</a>' )
-assert html.contains( '<li><a href="plugins.html" title="Plugins"><span class="none"></span>Plugins</a></li>' )
+assert html.contains( '<li><a href="summary.html">Summary</a>' )
+assert html.contains( '<li><a href="plugins.html">Plugins</a></li>' )
 // breadcrumb
-assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' )
+assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink">Apache</a><span class="divider">/</span></li>' )

src/it/topbar/verify.groovy

@@ -23,9 +23,9 @@ assert index.exists()
 // MSKINS-130 check that html structure is as clean as possible
 String html = index.text
 // active menu
-assert html.contains( '<li><a title="About">About</a></li>' )
+assert html.contains( '<li><a>About</a></li>' )
 // inactive menu
-assert html.contains( '<li><a href="summary.html" title="Summary">Summary</a></li>' )
-assert html.contains( '<li><a href="plugins.html" title="Plugins">Plugins</a></li>' )
+assert html.contains( '<li><a href="summary.html">Summary</a></li>' )
+assert html.contains( '<li><a href="plugins.html">Plugins</a></li>' )
 // breadcrumb
-assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' )
+assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink">Apache</a><span class="divider">/</span></li>' )