You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/02/11 21:20:58 UTC

svn commit: r1729885 - in /maven/skins/trunk/maven-fluido-skin/src: main/resources/META-INF/maven/site.vm site/apt/index.apt.vm

Author: michaelo
Date: Thu Feb 11 20:20:57 2016
New Revision: 1729885

URL: http://svn.apache.org/viewvc?rev=1729885&view=rev
Log:
[MSKINS-124] Update skins when DOXIASITETOOLS-155 has been published

Modified:
    maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
    maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm

Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1729885&r1=1729884&r2=1729885&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Thu Feb 11 20:20:57 2016
@@ -877,20 +877,9 @@
 
     <script type="text/javascript" src="$relativePath/js/apache-maven-fluido-@project.version@.min.js"></script>
 
-    #if ( $decoration.body.head )
-      #foreach( $item in $decoration.body.head.getChildren() )
-        #set ( $head = $item.toString().trim() )
-        #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
-        #if ( $item.name == "script" )
-          #set ( $head = $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" ) )
-        #else
-          #set ( $head = $StringUtils.replace( $item.toString(), $documentHeader, "" ) )
-        #end
-
-        $StringUtils.replace( $head, '@relativePath@', ${relativePath} )
-      #end
+    #if( $decoration.body.head )
+      $render.eval( $decoration.body.head )
     #end
-
     #if( $headContent )$headContent#end
     #googleAnalytics( $decoration.googleAnalyticsAccountId )
     #flattrHead()

Modified: maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm?rev=1729885&r1=1729884&r2=1729885&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm Thu Feb 11 20:20:57 2016
@@ -236,9 +236,9 @@ Welcome to ${project.name}!
 </project>
 +-----+
 
-** Footer placeholders
+** head/footer placeholders
 
- This skin will pass your custom footer to <<<${esc.d}render.eval()>>> and replace all variables
+ This skin will pass your custom head/footer to <<<${esc.d}render.eval()>>> and replace all variables
  known to the Velocity context.
 
 ** GitHub ribbons