[maven-fluido-skin] branch MSKINS-157 created (now 0123de7)

[mi...@apache.org]

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

michaelo pushed a change to branch MSKINS-157
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git.


      at 0123de7  [MSKINS-157] Fluido 1.8 has garbled footer

This branch includes the following new commits:

     new 0123de7  [MSKINS-157] Fluido 1.8 has garbled footer

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-fluido-skin] 01/01: [MSKINS-157] Fluido 1.8 has garbled footer

[mi...@apache.org]

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

michaelo pushed a commit to branch MSKINS-157
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git

commit 0123de78f09c741af306a73f5ed97593b3f386e0
Author: twogee <g....@gmail.com>
AuthorDate: Thu Jan 9 02:20:15 2020 +0100

    [MSKINS-157] Fluido 1.8 has garbled footer
    
    This closes #11
---
 src/it/mskins-72/verify.groovy                   |  2 +-
 src/main/resources/META-INF/maven/site-macros.vm | 14 ++++----------
 src/main/resources/META-INF/maven/site.vm        |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/it/mskins-72/verify.groovy b/src/it/mskins-72/verify.groovy
index 22729f5..176e8f8 100644
--- a/src/it/mskins-72/verify.groovy
+++ b/src/it/mskins-72/verify.groovy
@@ -21,4 +21,4 @@ File index = new File( basedir, "target/site/index.html" )
 int inceptionYear = 2002
 int currentYear = Calendar.getInstance().get(Calendar.YEAR)
 assert index.exists()
-assert 1 == index.getText().count( "<p class=\"pull-right\">Copyright &#169;" )
+assert 1 == index.getText().count( "<p class=\"pull-right\">&#169;" )
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index cd72bc2..c2594ed 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -374,25 +374,19 @@ $indent     </ul>##
 ##
 #macro ( copyright )
 #**##if ( $project )
-#*  *##if ( ${project.organization} && ${project.organization.name} )
-#*    *##set ( $period = "" )
-#*  *##else
-#*    *##set ( $period = "." )
-#*  *##end
-##
 #*  *##set ( $currentYear = ${currentDate.year} + 1900 )
 ##
 #*  *##if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
-      ${project.inceptionYear}&#x2013;${currentYear}${period}##
+      ${project.inceptionYear}&#x2013;${currentYear}
 #*  *##else
-      ${currentYear}${period}##
+      ${currentYear}
 #*  *##end
 ##
 #*  *##if ( ${project.organization} )
 #*    *##if ( ${project.organization.name} && ${project.organization.url} )
-#*      *#<a href="$project.organization.url">${project.organization.name}</a>.
+#*      *#<a href="$project.organization.url">${project.organization.name}</a>
 #*    *##elseif ( ${project.organization.name} )
-#*      *#${project.organization.name}.
+#*      *#${project.organization.name}
 #*    *##end
 #*  *##end
 #**##end
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 4a420a8..5f74a41 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -278,7 +278,7 @@
 #*      *##if ( $decoration.getCustomChild( 'fluidoSkin.copyrightClass' ) )
 #*        *##set ( $copyrightClass = ' class="' + $decoration.getCustomValue( 'fluidoSkin.copyrightClass' ) + '"' )
 #*      *##end
-            <p$!copyrightClass>Copyright &#169;#copyright().#publishDate( "bottom" $decoration.publishDate $decoration.version )</p>
+            <p$!copyrightClass>&#169;#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</p>
 #*    *##end
         </div>
 ##