Author: simonetripodi
Date: Sun Nov 6 20:14:01 2011
New Revision: 1198546
URL: http://svn.apache.org/viewvc?rev=1198546&view=rev
Log:
added the Google search form for the generated site
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/pom.xml
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/apt/index.apt.vm
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/site.xml
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/pom.xml
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/apt/index.apt.vm
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/site.xml
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm
Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/pom.xml?rev=1198546&r1=1198545&r2=1198546&view=diff
==============================================================================
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/pom.xml (original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/pom.xml Sun Nov
6 20:14:01 2011
@@ -30,7 +30,7 @@
<packaging>jar</packaging>
<name>@project.artifactId@ IT</name>
- <url>http://maven.apache.org/skins/@project.artifactId@/sample/</url>
+ <url>http://maven.apache.org/skins/@project.artifactId@/sidebar/</url>
<properties>
<skinName>@project.name@</skinName>
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/apt/index.apt.vm?rev=1198546&r1=1198545&r2=1198546&view=diff
==============================================================================
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/apt/index.apt.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/apt/index.apt.vm
Sun Nov 6 20:14:01 2011
@@ -65,17 +65,36 @@ ${skinName} test
</project>
+-----+
- That allows users having 4 skins in only 1!
+ Users can optionally enable the <<Google Search>> for the generated site,
requirements are:
- [[1]] sidebar only;
+ * the <<<project/url>>> property in <<<pom.xml>>>:
- [[2]] topbar only;
++-----+
+<project
+...
+ <url>http://maven.apache.org/skins/${project.artifactId}</url>
+...
+</project>
++-----+
+
+ * the <<<custom/fluidoSkin/searchEnabled>>> element in <<<site.xml>>>:
- [[3]] both side/top bars;
++-----+
+<project name="xxx">
+ ...
+ <custom>
+ <fluidoSkin>
+ <searchEnabled>true</searchEnabled>
+ </fluidoSkin>
+ </custom>
+ ...
+</project>
++-----+
- [[4]] none at all.
+ By default, the search form:
- Default skin setting is the option <<1>>.
+ * is <not> enabled;
+ * is rendered in the sidebar, if the topbar only is available it will be
rendered there.
Sample content
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/site.xml?rev=1198546&r1=1198545&r2=1198546&view=diff
==============================================================================
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/site.xml
(original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sidebar/src/site/site.xml
Sun Nov 6 20:14:01 2011
@@ -31,6 +31,12 @@
<version>${skinVersion}</version>
</skin>
+ <custom>
+ <fluidoSkin>
+ <searchEnabled>true</searchEnabled>
+ </fluidoSkin>
+ </custom>
+
<publishDate format="yyyy-MM-dd" position="right" />
<version position="right" />
Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/pom.xml?rev=1198546&r1=1198545&r2=1198546&view=diff
==============================================================================
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/pom.xml (original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/pom.xml Sun Nov 6
20:14:01 2011
@@ -30,7 +30,7 @@
<packaging>jar</packaging>
<name>@project.artifactId@ IT</name>
- <url>http://maven.apache.org/skins/@project.artifactId@/sample/</url>
+ <url>http://maven.apache.org/skins/@project.artifactId@/topbar/</url>
<properties>
<skinName>@project.name@</skinName>
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/apt/index.apt.vm?rev=1198546&r1=1198545&r2=1198546&view=diff
==============================================================================
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/apt/index.apt.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/apt/index.apt.vm
Sun Nov 6 20:14:01 2011
@@ -77,6 +77,37 @@ ${skinName} test
</project>
+-----+
+ Users can optionally enable the <<Google Search>> for the generated site,
requirements are:
+
+ * the <<<project/url>>> property in <<<pom.xml>>>:
+
++-----+
+<project
+...
+ <url>http://maven.apache.org/skins/${project.artifactId}</url>
+...
+</project>
++-----+
+
+ * the <<<custom/fluidoSkin/searchEnabled>>> element in <<<site.xml>>>:
+
++-----+
+<project name="xxx">
+ ...
+ <custom>
+ <fluidoSkin>
+ <searchEnabled>true</searchEnabled>
+ </fluidoSkin>
+ </custom>
+ ...
+</project>
++-----+
+
+ By default, the search form:
+
+ * is <not> enabled;
+ * is rendered in the sidebar, if the topbar only is available it will be
rendered there.
+
Sample content
Paragraph 1, line 1.
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/site.xml?rev=1198546&r1=1198545&r2=1198546&view=diff
==============================================================================
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/site.xml
(original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/it/topbar/src/site/site.xml
Sun Nov 6 20:14:01 2011
@@ -41,6 +41,7 @@
<href>/index.html</href>
</topBarIcon>
<sideBarEnabled>false</sideBarEnabled>
+ <searchEnabled>true</searchEnabled>
</fluidoSkin>
</custom>
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=1198546&r1=1198545&r2=1198546&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
Sun Nov 6 20:14:01 2011
@@ -490,6 +490,15 @@
#end
#end
##
+#macro ( enableSearch $top )
+ #set( $startIndex = $project.url.indexOf("://") + 3 )
+<form action="http://www.google.com/search"; method="get" #if ( $top
)class="pull-right"#end>
+ <input value="$project.url.substring( $startIndex, $project.url.length() )"
name="sitesearch" type="hidden"/>
+ <input class="mini" size="5" name="q" id="query" type="text"
value="search..." onclick="if(this.value == 'search...') {this.value = ''}"/>
+ <input name="Search" value="Go" type="submit"/>
+</form>
+#end
+##
<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale )
xml:lang="$locale.language" lang="$locale.language"#end>
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=${outputEncoding}" />
@@ -580,12 +589,22 @@
#googleAnalytics( $decoration.googleAnalyticsAccountId )
</head>
<body>
- #if ( $decoration.custom.getChild('fluidoSkin')
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'sideBarEnabled' )
+ #if ( $decoration.custom.getChild('fluidoSkin') )
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'sideBarEnabled' )
&& 'false' == $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'sideBarEnabled' ).getValue() )
- #set ( $sideBarEnabled = false )
- #else
- #set ( $sideBarEnabled = true )
+ #set ( $sideBarEnabled = false )
+ #else
+ #set ( $sideBarEnabled = true )
+ #end
+
+ #if ( $project.url
+ && $project.url.length() > 0
+ && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'searchEnabled' )
+ && 'true' == $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'searchEnabled' ).getValue() )
+ #set ( $searchEnabled = true )
+ #else
+ #set ( $searchEnabled = false )
+ #end
#end
#if ( $topBarEnabled )
@@ -644,6 +663,9 @@
<ul>
#topMenu( $decoration.body.menus )
</ul>
+ #if ( $searchEnabled && !$sideBarEnabled )
+ #enableSearch(true)
+ #end
#if( $decoration.body.links.size() > 0 )
<ul class="nav secondary-nav">
<li class="menu">
@@ -685,9 +707,14 @@
#publishDate( "navigation-top" $decoration.publishDate
$decoration.version )
#mainMenu( $decoration.body.menus )
#publishDate( "navigation-bottom" $decoration.publishDate
$decoration.version )
- </div>
- <div id="poweredBy">
- #poweredByLogo( $decoration.poweredBy )
+
+ #if ( $searchEnabled )
+ #enableSearch( false )
+ #end
+
+ <div id="poweredBy">
+ #poweredByLogo( $decoration.poweredBy )
+ </div>
</div>
</div>
#end
Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm?rev=1198546&r1=1198545&r2=1198546&view=diff
==============================================================================
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm
(original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm Sun
Nov 6 20:14:01 2011
@@ -97,3 +97,34 @@ ${project.name}
...
</project>
+-----+
+
+ Users can optionally enable the <<Google Search>> for the generated site,
requirements are:
+
+ * the <<<project/url>>> property in <<<pom.xml>>>:
+
++-----+
+<project
+...
+ <url>http://maven.apache.org/skins/${project.artifactId}</url>
+...
+</project>
++-----+
+
+ * the <<<custom/fluidoSkin/searchEnabled>>> element in <<<site.xml>>>:
+
++-----+
+<project name="xxx">
+ ...
+ <custom>
+ <fluidoSkin>
+ <searchEnabled>true</searchEnabled>
+ </fluidoSkin>
+ </custom>
+ ...
+</project>
++-----+
+
+ By default, the search form:
+
+ * is <not> enabled;
+ * is rendered in the sidebar, if the topbar only is available it will be
rendered there.
