You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2011/10/17 20:38:20 UTC
svn commit: r1185322 -
/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Author: simonetripodi
Date: Mon Oct 17 18:38:20 2011
New Revision: 1185322
URL: http://svn.apache.org/viewvc?rev=1185322&view=rev
Log:
fixed DOXIA-150 turnaround for header elements
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1185322&r1=1185321&r2=1185322&view=diff
==============================================================================
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Mon Oct 17 18:38:20 2011
@@ -8,7 +8,6 @@
#end
#macro ( topMenu $menus )
- <!-- $menus -->
#foreach( $menu in $menus )
#if ( $menu.name )
<li class="dropdown" data-dropdown="dropdown" >
@@ -505,6 +504,26 @@
<link rel="stylesheet" href="$relativePath/css/bootstrap-1.3.0.min.css" />
<link rel="stylesheet" href="$relativePath/css/maven-base.css" />
<link rel="stylesheet" href="$relativePath/css/maven-theme.css" />
+
+ #if ( $decoration.body.head )
+ #foreach( $item in $decoration.body.head.getChildren() )
+ ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
+ ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
+ ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
+
+ #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
+ #end
+
<script type="text/javascript" src="$relativePath/js/jquery-1.6.4.min.js"></script>
<script type="text/javascript" src="$relativePath/js/bootstrap-1.3.0-dropdown.js"></script>
<script type="text/javascript">
@@ -557,19 +576,6 @@
#if ( $locale )
<meta http-equiv="Content-Language" content="$locale.language" />
#end
- #if ( $decoration.body.head )
- #foreach( $item in $decoration.body.head.getChildren() )
- ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
- ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
- ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
- #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
- #if ( $item.name == "script" )
- $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" )
- #else
- $StringUtils.replace( $item.toString(), $documentHeader, "" )
- #end
- #end
- #end
$headContent
#googleAnalytics( $decoration.googleAnalyticsAccountId )
</head>
Re: svn commit: r1185322 - /maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Posted by Simone Tripodi <si...@apache.org>.
Done, thanks for the suggestion!!!
All the best,
Simo
http://people.apache.org/~simonetripodi/
http://simonetripodi.livejournal.com/
http://twitter.com/simonetripodi
http://www.99soft.org/
On Tue, Oct 18, 2011 at 10:43 AM, Simone Tripodi
<si...@apache.org> wrote:
> Hi Lukas,
> I just copied it form our apache commons-skin, I'll give a try and let you know!
> Thanks!
> Simo
>
> http://people.apache.org/~simonetripodi/
> http://simonetripodi.livejournal.com/
> http://twitter.com/simonetripodi
> http://www.99soft.org/
>
>
>
> On Tue, Oct 18, 2011 at 8:21 AM, Lukas Theussl <lt...@apache.org> wrote:
>>
>> Hi Simone,
>>
>> Why is this necessary? DOXIA-150 has been fixed a long time ago...
>>
>> -Lukas
>>
>>
>> On 10/17/2011 08:38 PM, simonetripodi@apache.org wrote:
>>>
>>> Author: simonetripodi
>>> Date: Mon Oct 17 18:38:20 2011
>>> New Revision: 1185322
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1185322&view=rev
>>> Log:
>>> fixed DOXIA-150 turnaround for header elements
>>>
>>> Modified:
>>>
>>> maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
>>>
>>> Modified:
>>> maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
>>> URL:
>>> http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1185322&r1=1185321&r2=1185322&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
>>> (original)
>>> +++
>>> maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
>>> Mon Oct 17 18:38:20 2011
>>> @@ -8,7 +8,6 @@
>>> #end
>>>
>>> #macro ( topMenu $menus )
>>> -<!-- $menus -->
>>> #foreach( $menu in $menus )
>>> #if ( $menu.name )
>>> <li class="dropdown" data-dropdown="dropdown">
>>> @@ -505,6 +504,26 @@
>>> <link rel="stylesheet"
>>> href="$relativePath/css/bootstrap-1.3.0.min.css" />
>>> <link rel="stylesheet" href="$relativePath/css/maven-base.css" />
>>> <link rel="stylesheet" href="$relativePath/css/maven-theme.css" />
>>> +
>>> + #if ( $decoration.body.head )
>>> + #foreach( $item in $decoration.body.head.getChildren() )
>>> + ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
>>> + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
>>> + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
>>> +
>>> + #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
>>> + #end
>>> +
>>> <script type="text/javascript"
>>> src="$relativePath/js/jquery-1.6.4.min.js"></script>
>>> <script type="text/javascript"
>>> src="$relativePath/js/bootstrap-1.3.0-dropdown.js"></script>
>>> <script type="text/javascript">
>>> @@ -557,19 +576,6 @@
>>> #if ( $locale )
>>> <meta http-equiv="Content-Language" content="$locale.language" />
>>> #end
>>> - #if ( $decoration.body.head )
>>> - #foreach( $item in $decoration.body.head.getChildren() )
>>> - ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
>>> - ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
>>> - ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
>>> - #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>'
>>> )
>>> - #if ( $item.name == "script" )
>>> - $StringUtils.replace( $item.toUnescapedString(),
>>> $documentHeader, "" )
>>> - #else
>>> - $StringUtils.replace( $item.toString(), $documentHeader, "" )
>>> - #end
>>> - #end
>>> - #end
>>> $headContent
>>> #googleAnalytics( $decoration.googleAnalyticsAccountId )
>>> </head>
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1185322 - /maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Posted by Simone Tripodi <si...@apache.org>.
Hi Lukas,
I just copied it form our apache commons-skin, I'll give a try and let you know!
Thanks!
Simo
http://people.apache.org/~simonetripodi/
http://simonetripodi.livejournal.com/
http://twitter.com/simonetripodi
http://www.99soft.org/
On Tue, Oct 18, 2011 at 8:21 AM, Lukas Theussl <lt...@apache.org> wrote:
>
> Hi Simone,
>
> Why is this necessary? DOXIA-150 has been fixed a long time ago...
>
> -Lukas
>
>
> On 10/17/2011 08:38 PM, simonetripodi@apache.org wrote:
>>
>> Author: simonetripodi
>> Date: Mon Oct 17 18:38:20 2011
>> New Revision: 1185322
>>
>> URL: http://svn.apache.org/viewvc?rev=1185322&view=rev
>> Log:
>> fixed DOXIA-150 turnaround for header elements
>>
>> Modified:
>>
>> maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
>>
>> Modified:
>> maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
>> URL:
>> http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1185322&r1=1185321&r2=1185322&view=diff
>>
>> ==============================================================================
>> ---
>> maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
>> (original)
>> +++
>> maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
>> Mon Oct 17 18:38:20 2011
>> @@ -8,7 +8,6 @@
>> #end
>>
>> #macro ( topMenu $menus )
>> -<!-- $menus -->
>> #foreach( $menu in $menus )
>> #if ( $menu.name )
>> <li class="dropdown" data-dropdown="dropdown">
>> @@ -505,6 +504,26 @@
>> <link rel="stylesheet"
>> href="$relativePath/css/bootstrap-1.3.0.min.css" />
>> <link rel="stylesheet" href="$relativePath/css/maven-base.css" />
>> <link rel="stylesheet" href="$relativePath/css/maven-theme.css" />
>> +
>> + #if ( $decoration.body.head )
>> + #foreach( $item in $decoration.body.head.getChildren() )
>> + ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
>> + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
>> + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
>> +
>> + #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
>> + #end
>> +
>> <script type="text/javascript"
>> src="$relativePath/js/jquery-1.6.4.min.js"></script>
>> <script type="text/javascript"
>> src="$relativePath/js/bootstrap-1.3.0-dropdown.js"></script>
>> <script type="text/javascript">
>> @@ -557,19 +576,6 @@
>> #if ( $locale )
>> <meta http-equiv="Content-Language" content="$locale.language" />
>> #end
>> - #if ( $decoration.body.head )
>> - #foreach( $item in $decoration.body.head.getChildren() )
>> - ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
>> - ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
>> - ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
>> - #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>'
>> )
>> - #if ( $item.name == "script" )
>> - $StringUtils.replace( $item.toUnescapedString(),
>> $documentHeader, "" )
>> - #else
>> - $StringUtils.replace( $item.toString(), $documentHeader, "" )
>> - #end
>> - #end
>> - #end
>> $headContent
>> #googleAnalytics( $decoration.googleAnalyticsAccountId )
>> </head>
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1185322 - /maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Posted by Lukas Theussl <lt...@apache.org>.
Hi Simone,
Why is this necessary? DOXIA-150 has been fixed a long time ago...
-Lukas
On 10/17/2011 08:38 PM, simonetripodi@apache.org wrote:
> Author: simonetripodi
> Date: Mon Oct 17 18:38:20 2011
> New Revision: 1185322
>
> URL: http://svn.apache.org/viewvc?rev=1185322&view=rev
> Log:
> fixed DOXIA-150 turnaround for header elements
>
> Modified:
> maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
>
> Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
> URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1185322&r1=1185321&r2=1185322&view=diff
> ==============================================================================
> --- maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original)
> +++ maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Mon Oct 17 18:38:20 2011
> @@ -8,7 +8,6 @@
> #end
>
> #macro ( topMenu $menus )
> -<!-- $menus -->
> #foreach( $menu in $menus )
> #if ( $menu.name )
> <li class="dropdown" data-dropdown="dropdown">
> @@ -505,6 +504,26 @@
> <link rel="stylesheet" href="$relativePath/css/bootstrap-1.3.0.min.css" />
> <link rel="stylesheet" href="$relativePath/css/maven-base.css" />
> <link rel="stylesheet" href="$relativePath/css/maven-theme.css" />
> +
> + #if ( $decoration.body.head )
> + #foreach( $item in $decoration.body.head.getChildren() )
> + ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
> + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
> + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
> +
> + #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
> + #end
> +
> <script type="text/javascript" src="$relativePath/js/jquery-1.6.4.min.js"></script>
> <script type="text/javascript" src="$relativePath/js/bootstrap-1.3.0-dropdown.js"></script>
> <script type="text/javascript">
> @@ -557,19 +576,6 @@
> #if ( $locale )
> <meta http-equiv="Content-Language" content="$locale.language" />
> #end
> - #if ( $decoration.body.head )
> - #foreach( $item in $decoration.body.head.getChildren() )
> - ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
> - ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
> - ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
> - #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
> - #if ( $item.name == "script" )
> - $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" )
> - #else
> - $StringUtils.replace( $item.toString(), $documentHeader, "" )
> - #end
> - #end
> - #end
> $headContent
> #googleAnalytics( $decoration.googleAnalyticsAccountId )
> </head>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org