commit f24b63686360851162f05939b30b502a204322ae
author Michael Osipov <michaelo@apache.org> Tue Jun 18 23:33:43 2019 +0200
committer Michael Osipov <michaelo@apache.org> Wed Jun 19 00:01:18 2019 +0200
tree 39b90b9f0bb4241c27edf0d8e792ccdfe355b61e
parent f66f1234c5e6b4a2d86ebed3f6184bd73e944f12

[MSKINS-149] Align common Velocity structures with Default Skin

src/it/mskins-72/verify.groovy

diff --git a/src/it/mskins-72/verify.groovy b/src/it/mskins-72/verify.groovy
index d75a681..22729f5 100644
--- a/src/it/mskins-72/verify.groovy
+++ b/src/it/mskins-72/verify.groovy
@@ -21,4 +21,4 @@
 int inceptionYear = 2002
 int currentYear = Calendar.getInstance().get(Calendar.YEAR)
 assert index.exists()
-assert 1 == index.getText().count( "<p class=\"pull-right\">Copyright &copy;" )
\ No newline at end of file
+assert 1 == index.getText().count( "<p class=\"pull-right\">Copyright &#169;" )

src/main/resources/META-INF/maven/site-macros.vm

diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index f4f769e..ece7e91 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -383,9 +383,9 @@
 #*  *##set ( $currentYear = ${currentDate.year} + 1900 )
 ##
 #*  *##if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
-#*    *#${project.inceptionYear}–${currentYear}${period}
+      ${project.inceptionYear}–${currentYear}${period}##
 #*  *##else
-#*    *#${currentYear}${period}
+      ${currentYear}${period}##
 #*  *##end
 ##
 #*  *##if ( ${project.organization} )

src/main/resources/META-INF/maven/site.vm

diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index c201b67..f3df1b8 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -46,7 +46,7 @@
     <link rel="stylesheet" href="$relativePath/css/site.css" />
     <link rel="stylesheet" href="$relativePath/css/print.css" media="print" />
 #**##prjProfile()
-    <script type="text/javascript" src="$relativePath/js/apache-maven-fluido-@project.version@.min.js"></script>
+    <script src="$relativePath/js/apache-maven-fluido-@project.version@.min.js"></script>
 #**##if( $decoration.body.head )
 #*  *#$render.eval( $decoration.body.head )
 #**##end
@@ -269,7 +269,7 @@
 #*      *##if ( $decoration.getCustomChild( 'fluidoSkin.copyrightClass' ) )
 #*        *##set ( $copyrightClass = ' class="' + $decoration.getCustomValue( 'fluidoSkin.copyrightClass' ) + '"' )
 #*      *##end
-            <p$!copyrightClass>Copyright &copy;#copyright().#publishDate( "bottom" $decoration.publishDate $decoration.version )</p>
+            <p$!copyrightClass>Copyright &#169;#copyright().#publishDate( "bottom" $decoration.publishDate $decoration.version )</p>
 #*    *##end
         </div>
 ##