Author: simonetripodi
Date: Wed Dec 21 20:57:18 2011
New Revision: 1221878
URL: http://svn.apache.org/viewvc?rev=1221878&view=rev
Log:
GoogleSearch cleanup - maintaining too many config parameters causes search
enabled on undefined variable
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/pom.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-14/pom.xml
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/it/mskins-13/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/pom.xml?rev=1221878&r1=1221877&r2=1221878&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/pom.xml Wed Dec 21
20:57:18 2011
@@ -22,6 +22,7 @@
<groupId>org.apache.maven.skins.its</groupId>
<artifactId>mskins-13</artifactId>
<version>1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org/skins/maven-fluido-skin/</url>
<properties>
<skinName>Apache Maven Fluido Skin</skinName>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-14/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-14/pom.xml?rev=1221878&r1=1221877&r2=1221878&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-14/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-14/pom.xml Wed Dec 21
20:57:18 2011
@@ -22,6 +22,7 @@
<groupId>org.apache.maven.skins.its</groupId>
<artifactId>mskins-14</artifactId>
<version>1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org/skins/maven-fluido-skin/</url>
<properties>
<skinName>@project.name@</skinName>
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=1221878&r1=1221877&r2=1221878&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
Wed Dec 21 20:57:18 2011
@@ -526,8 +526,7 @@
#set( $startIndex = $project.url.indexOf("://") + 3 )
<form id="search-form" action="http://www.google.com/search"; method="get" #if
( $top )class="pull-right" #end>
- #if( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'googleSearch'
)
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'googleSearch' ).getChild( 'sitesearch' ) )
+ #if( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'googleSearch'
).getChild( 'sitesearch' ) )
#set( $sitesearchValue = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'googleSearch' ).getChild( 'sitesearch' ).getValue() )
#else
#set( $sitesearchValue = $project.url.substring( $startIndex,
$project.url.length() ) )
@@ -599,16 +598,12 @@
#set ( $sideBarEnabled = false )
#end
- #if ( $project.url
- || $project.url.length() > 0 )
- #set ( $searchEnabled = false )
- #elseif ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'googleSearch' ) )
- #set ( $searchEnabled = true )
- #elseif ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'searchEnabled' )
- && 'true' == $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'searchEnabled' ).getValue() )
- #set ( $searchEnabled = true )
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'googleSearch' )
+ && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'googleSearch' ).getChild( 'sitesearch' )
+ || $project.url ) )
+ #set ( $searchEnabled = true )
#else
- #set ( $searchEnabled = false )
+ #set ( $searchEnabled = false )
#end
#end
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=1221878&r1=1221877&r2=1221878&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 Wed Dec 21
20:57:18 2011
@@ -120,7 +120,7 @@ ${project.name}
</project>
+-----+
- * the <<<custom/fluidoSkin/googleSearch>>> element in <<<site.xml>>> or the
deprecated <<<custom/fluidoSkin/searchEnabled>>> :
+ * the <<<custom/fluidoSkin/googleSearch>>> element in <<<site.xml>>>:
+-----+
<project name="xxx">
