Author: rfscholte Date: Tue Dec 6 23:42:37 2011 New Revision: 1211230 URL: http://svn.apache.org/viewvc?rev=1211230&view=rev Log: MSKINS-16: add IT and fix alt + border
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml?rev=1211230&view=auto ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/pom.xml Tue Dec 6 23:42:37 2011 @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.skins.its</groupId> + <artifactId>mskins-16</artifactId> + <version>1.0-SNAPSHOT</version> + + <properties> + <skinName>@project.name@</skinName> + <skinDescription>@project.description@</skinDescription> + <skinGroupId>@project.groupId@</skinGroupId> + <skinArtifactId>@project.artifactId@</skinArtifactId> + <skinVersion>@project.version@</skinVersion> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.0</version> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.4</version> + <configuration> + <dependencyDetailsEnabled>false</dependencyDetailsEnabled> + <dependencyLocationsEnabled>false</dependencyLocationsEnabled> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>index</report> + <report>summary</report> + <report>license</report> + <report>project-team</report> + <report>scm</report> + <report>issue-tracking</report> + <report>mailing-list</report> + <report>dependencies</report> + <report>cim</report> + <report>plugin-management</report> + <report>plugins</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + +</project> \ No newline at end of file Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml?rev=1211230&view=auto ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-16/src/site/site.xml Tue Dec 6 23:42:37 2011 @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + --> + +<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" + name="${skinName}"> + + <skin> + <groupId>${skinGroupId}</groupId> + <artifactId>${skinArtifactId}</artifactId> + <version>${skinVersion}</version> + </skin> + + <bannerLeft> + <href>http://www.apache.org</href> + <border>0</border> + <width>473</width> + <height>93</height> + <src>images/apache-maven-project-2.png</src> + </bannerLeft> + + <bannerRight> + <href>http://maven.apache.org</href> + <border>1</border> + <width>473</width> + <height>93</height> + <src>images/apache-maven-project-2.png</src> + </bannerRight> + + <body/> +</project> \ No newline at end of file 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=1211230&r1=1211229&r2=1211230&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 Tue Dec 6 23:42:37 2011 @@ -123,12 +123,14 @@ #set ( $src = $src.replaceAll( '\\', '/' ) ) #end #if ( $banner.alt ) - #set ( $alt = $banner.alt ) - #else - #set ( $alt = $banner.name ) + #set ( $alt = ' alt="' + $banner.alt + '"' ) + #elseif ( $banner.name ) + #set ( $alt = ' alt="' + $banner.name + '"' ) + #else + #set ( $alt = "" ) #end #if( $banner.border ) - #set ( $imgBorder = ' border="' + $border + '"' ) + #set ( $imgBorder = ' border="' + $banner.border + '"' ) #else #set ( $imgBorder = "" ) #end @@ -142,7 +144,7 @@ #else #set ( $imgHeight = "" ) #end - <img src="$src" alt="$alt"$imgBorder$imgWidth$imgHeight/> + <img src="$src" $alt$imgBorder$imgWidth$imgHeight/> #else <h2>$banner.name</h2> #end @@ -526,7 +528,7 @@ #end #end ## -#macro ( enableSearch $top ) +#macro ( googleSearch $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"/> @@ -591,8 +593,11 @@ #end #if ( $project.url - && $project.url.length() > 0 - && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'searchEnabled' ) + || $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 ) #else @@ -657,7 +662,7 @@ #topMenu( $decoration.body.menus ) </ul> #if ( $searchEnabled && !$sideBarEnabled ) - #enableSearch(true) + #googleSearch(true) #end #if( $decoration.body.links.size() > 0 ) <ul class="nav secondary-nav"> @@ -707,7 +712,7 @@ #end #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version ) #if ( $searchEnabled ) - #enableSearch( false ) + #googleSearch( false ) #end <div id="poweredBy"> #poweredByLogo( $decoration.poweredBy )