This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit e39a0c67a0f4284f23cd298d83965d87062d4f6d Author: Michael Osipov <[email protected]> AuthorDate: Sat Apr 30 22:30:33 2022 +0200 [MSKINS-181] Replace deprecated Velocity context parameters --- src/main/resources/META-INF/maven/site-macros.vm | 36 ++++++++++++------------ src/main/resources/META-INF/maven/site.vm | 4 ++- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm index cf24948..aa0151f 100644 --- a/src/main/resources/META-INF/maven/site-macros.vm +++ b/src/main/resources/META-INF/maven/site-macros.vm @@ -374,7 +374,7 @@ $indent </ul>## ## #macro ( copyright ) #**##if ( $project ) -#* *##set ( $currentYear = ${currentDate.year} + 1900 ) +#* *##set ( $currentYear = ${date.year} ) ## #* *##if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) ) ${project.inceptionYear}–${currentYear} @@ -394,11 +394,11 @@ $indent </ul>## ## #macro ( publishDate $position $decorationPublishDate $version ) #**##if ( $publishDate ) -#* *##set ( $dateValue = $dateFormat.format( $publishDate ) ) +#* *##set ( $dateValue = $date.format( $publishDate ) ) #**##elseif ( $decoration.custom.getChild( 'publishDate' ) ) #* *##set ( $dateValue = $decoration.custom.getChild( 'publishDate' ).getValue() ) #**##else -#* *##set ( $dateValue = $dateFormat.format( $currentDate ) ) +#* *##set ( $dateValue = $date ) #**##end ## #**##set ( $datePosition = $decorationPublishDate.position ) @@ -417,7 +417,7 @@ $indent </ul>## ## #**##if ( $datePosition.equalsIgnoreCase( $position ) ) #* *##if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) ) - <li id="publishDate" class="pull-right">$prefix$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue</li> + <li id="publishDate" class="pull-right">$prefix$text.get( "template.lastpublished" ): $dateValue</li> #* *##if ( $versionPosition.equalsIgnoreCase( $position ) ) <li id="projectVersion" class="pull-right">## #* *##if ( !$topBarEnabled @@ -425,24 +425,24 @@ $indent </ul>## && $decoration.body.links.size() > 0 ) #* *#<span class="divider">|</span>## #* *##end -#* *#$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}## +#* *#$text.get( "template.version" ): ${project.version}## #* *#</li> #* *##end #* *##elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) ) <div id="lastPublished"> - <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue</span> + <span id="publishDate">$text.get( "template.lastpublished" ): $dateValue</span> #* *##if ( $versionPosition.equalsIgnoreCase( $position ) ) - <span class="divider">|</span> <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span> + <span class="divider">|</span> <span id="projectVersion">$text.get( "template.version" ): ${project.version}</span> #* *##end </div> #* *##elseif ( $datePosition.equalsIgnoreCase("left") ) - <li id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue## + <li id="publishDate">$text.get( "template.lastpublished" ): $dateValue## #* *##if ( $versionPosition.equalsIgnoreCase( $position ) || $breadcrumbs && $breadcrumbs.size() > 0) #* *#<span class="divider">|</span> #* *##end #* *#</li> #* *##if ( $versionPosition.equalsIgnoreCase( $position ) ) - <li id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}## + <li id="projectVersion">$text.get( "template.version" ): ${project.version}## #* *##if ( $breadcrumbs && $breadcrumbs.size() > 0 ) #* *#<span class="divider">|</span>## #* *##end @@ -454,15 +454,15 @@ $indent </ul>## #* *##end #**##elseif ( $versionPosition.equalsIgnoreCase( $position ) ) #* *##if ( $versionPosition.equalsIgnoreCase( "right" ) ) - <li id="projectVersion" class="pull-right">$prefix$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</li> + <li id="projectVersion" class="pull-right">$prefix$text.get( "template.version" ): ${project.version}</li> #* *##elseif ( $versionPosition.equalsIgnoreCase( "bottom" ) ) - <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span> + <span id="projectVersion">$text.get( "template.version" ): ${project.version}</span> #* *##elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) ) <div id="lastPublished"> - <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span> + <span id="projectVersion">$text.get( "template.version" ): ${project.version}</span> </div> #* *##elseif ( $versionPosition.equalsIgnoreCase("left") ) - <li id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}## + <li id="projectVersion">$text.get( "template.version" ): ${project.version}## #* *##if ( $breadcrumbs && $breadcrumbs.size() > 0 ) #* *#<span class="divider">|</span>## #* *##end @@ -491,7 +491,7 @@ $indent </ul>## #* *##if( $item.name ) #* *##set ( $name = $item.name ) #* *##else -#* *##set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" ) ) +#* *##set ( $name = $text.get( "template.builtby" ) ) #* *##set ( $name = "${name} Maven" ) #* *##end ## @@ -534,13 +534,13 @@ $indent </ul>## #* *#</a> #**##end #**##if( $poweredBy.isEmpty() ) -#* *#<a href="http://maven.apache.org/"; title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">## -#* *#<img class="builtBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />## +#* *#<a href="http://maven.apache.org/"; title="$text.get( "template.builtby" ) Maven" class="poweredBy">## +#* *#<img class="builtBy" alt="$text.get( "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />## #* *#</a> #**##end #**##else -#**#<a href="http://maven.apache.org/"; title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">## -#* *#<img class="builtBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />## +#**#<a href="http://maven.apache.org/"; title="$text.get( "template.builtby" ) Maven" class="poweredBy">## +#* *#<img class="builtBy" alt="$text.get( "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />## #**#</a> #**##end #end diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm index 5230723..3a7232f 100644 --- a/src/main/resources/META-INF/maven/site.vm +++ b/src/main/resources/META-INF/maven/site.vm @@ -24,7 +24,7 @@ #**##if( $docRenderingContext.generator ) $docRenderingContext.generator#end## #**##if( $docRenderingContext.doxiaSource ) $docRenderingContext.doxiaSourcePath#end## #end -#if ( !$skipGenerationDate ) at $dateFormat.format( $currentDate )#end +#if ( !$skipGenerationDate ) at $date.systemDate#end | Rendered using Apache Maven Fluido Skin @project.version@ --> @@ -41,7 +41,9 @@ #if ( $documentDate ) <meta name="date" content="$documentDate" /> #end +#if ( $title ) <title>$title</title> +#end <link rel="stylesheet" href="$relativePath/css/[email protected][email protected]" /> <link rel="stylesheet" href="$relativePath/css/site.css" /> <link rel="stylesheet" href="$relativePath/css/print.css" media="print" />
