You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Dennis Lundberg <de...@apache.org> on 2012/08/20 22:39:37 UTC
Re: svn commit: r1375209 - /maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
3 of the 4 <meta> elements are within comments.
That must be a mistake.
On 2012-08-20 22:35, olamy@apache.org wrote:
> Author: olamy
> Date: Mon Aug 20 20:35:09 2012
> New Revision: 1375209
>
> URL: http://svn.apache.org/viewvc?rev=1375209&view=rev
> Log:
> [MSKINS-57] '<?xml version="1.0" encoding="UTF-8"?>' in generated head
> Submitted by Eric Barboni.
>
> Modified:
> maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.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=1375209&r1=1375208&r2=1375209&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 Mon Aug 20 20:35:09 2012
> @@ -736,6 +736,19 @@
> <head>
> <meta charset="${outputEncoding}" />
> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
> +## put meta together
> +#foreach( $author in $authors )
> + <meta name="author" content="$author" />
> +#end
> +#if ( $dateCreation )
> + <!-- <meta name="Date-Creation-yyyymmdd" content="$dateCreation" /> -->
> +#end
> +#if ( $dateRevision )
> + <!-- <meta name="Date-Revision-yyyymmdd" content="$dateRevision" /> -->
> +#end
> +#if ( $locale )
> + <!-- <meta http-equiv="Content-Language" content="$locale.language" /> -->
> +#end
> <title>$title</title>
> <link rel="stylesheet" href="$relativePath/css/apache-maven-fluido.min.css" />
> <link rel="stylesheet" href="$relativePath/css/site.css" />
> @@ -748,7 +761,7 @@
> #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
> @@ -759,18 +772,6 @@
> #end
> #end
>
> -#foreach( $author in $authors )
> - <meta name="author" content="$author" />
> -#end
> -#if ( $dateCreation )
> - <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
> -#end
> -#if ( $dateRevision )
> - <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
> -#end
> -#if ( $locale )
> - <meta http-equiv="Content-Language" content="$locale.language" />
> -#end
> #if( $headContent )$headContent#end
> #googleAnalytics( $decoration.googleAnalyticsAccountId )
> </head>
> @@ -986,6 +987,7 @@
> #if ( $sideBarEnabled )
> </div>
> #end
> + </div>
>
> <hr/>
>
>
>
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1375209 - /maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Posted by Olivier Lamy <ol...@apache.org>.
oups.
fixed now.
2012/8/20 Dennis Lundberg <de...@apache.org>:
> 3 of the 4 <meta> elements are within comments.
> That must be a mistake.
>
> On 2012-08-20 22:35, olamy@apache.org wrote:
>> Author: olamy
>> Date: Mon Aug 20 20:35:09 2012
>> New Revision: 1375209
>>
>> URL: http://svn.apache.org/viewvc?rev=1375209&view=rev
>> Log:
>> [MSKINS-57] '<?xml version="1.0" encoding="UTF-8"?>' in generated head
>> Submitted by Eric Barboni.
>>
>> Modified:
>> maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.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=1375209&r1=1375208&r2=1375209&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 Mon Aug 20 20:35:09 2012
>> @@ -736,6 +736,19 @@
>> <head>
>> <meta charset="${outputEncoding}" />
>> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
>> +## put meta together
>> +#foreach( $author in $authors )
>> + <meta name="author" content="$author" />
>> +#end
>> +#if ( $dateCreation )
>> + <!-- <meta name="Date-Creation-yyyymmdd" content="$dateCreation" /> -->
>> +#end
>> +#if ( $dateRevision )
>> + <!-- <meta name="Date-Revision-yyyymmdd" content="$dateRevision" /> -->
>> +#end
>> +#if ( $locale )
>> + <!-- <meta http-equiv="Content-Language" content="$locale.language" /> -->
>> +#end
>> <title>$title</title>
>> <link rel="stylesheet" href="$relativePath/css/apache-maven-fluido.min.css" />
>> <link rel="stylesheet" href="$relativePath/css/site.css" />
>> @@ -748,7 +761,7 @@
>> #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
>> @@ -759,18 +772,6 @@
>> #end
>> #end
>>
>> -#foreach( $author in $authors )
>> - <meta name="author" content="$author" />
>> -#end
>> -#if ( $dateCreation )
>> - <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
>> -#end
>> -#if ( $dateRevision )
>> - <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
>> -#end
>> -#if ( $locale )
>> - <meta http-equiv="Content-Language" content="$locale.language" />
>> -#end
>> #if( $headContent )$headContent#end
>> #googleAnalytics( $decoration.googleAnalyticsAccountId )
>> </head>
>> @@ -986,6 +987,7 @@
>> #if ( $sideBarEnabled )
>> </div>
>> #end
>> + </div>
>>
>> <hr/>
>>
>>
>>
>
>
> --
> Dennis Lundberg
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org