Author: michaelo Date: Thu Aug 1 18:37:10 2013 New Revision: 1509378 URL: http://svn.apache.org/r1509378 Log: [MSKINS-72] Add copyright notice position option
- Correcting fix for the copyrightClass - Includes an IT Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/ - copied from r1508340, maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/verify.groovy (with props) Modified: maven/skins/trunk/maven-fluido-skin/pom.xml maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/pom.xml maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/apt/index.apt.vm maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/site.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 maven/skins/trunk/maven-fluido-skin/src/site/site.xml Modified: maven/skins/trunk/maven-fluido-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1509378&r1=1509377&r2=1509378&view=diff ============================================================================== --- maven/skins/trunk/maven-fluido-skin/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/pom.xml Thu Aug 1 18:37:10 2013 @@ -592,6 +592,21 @@ </configuration> </execution> <execution> + <id>copy-mskins-72</id> + <phase>site</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <resources> + <resource> + <directory>${project.build.directory}/it/mskins-72/target/site/</directory> + </resource> + </resources> + <outputDirectory>${project.build.directory}/site/mskins-72/</outputDirectory> + </configuration> + </execution> + <execution> <id>copy-mskins-75</id> <phase>site</phase> <goals> Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/pom.xml?rev=1509378&r1=1508340&r2=1509378&view=diff ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/pom.xml Thu Aug 1 18:37:10 2013 @@ -25,12 +25,12 @@ </parent> <groupId>org.apache.maven.skins.its</groupId> - <artifactId>@project.artifactId@-mskins-22_default</artifactId> + <artifactId>@project.artifactId@-mskins-72</artifactId> <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>@project.name@ IT, MSKINS-22 (default)</name> - <url>http://maven.apache.org/skins/@project.artifactId@/mskins-22_default/</url> + <name>@project.name@ IT, MSKINS-72</name> + <url>http://maven.apache.org/skins/@project.artifactId@/mskins-72/</url> <properties> <skinName>@project.name@</skinName> Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/apt/index.apt.vm URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/apt/index.apt.vm?rev=1509378&r1=1508340&r2=1509378&view=diff ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/apt/index.apt.vm (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/apt/index.apt.vm Thu Aug 1 18:37:10 2013 @@ -1,14 +1,15 @@ ------ ${project.name} ------ - Simo + Michael Osipov ------ - 2011-12-26 + 2013-07-30 ------ ${project.name} - This is a test for ${skinName} with GitHub ribbon enabled. + This is a test for ${skinName} with copyright pulled to the right-hand side by + the css class <<<pull-right>>>. ${skinDescription} * Actual configuration Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/site.xml?rev=1509378&r1=1508340&r2=1509378&view=diff ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/site.xml (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/src/site/site.xml Thu Aug 1 18:37:10 2013 @@ -34,9 +34,7 @@ <!-- START SNIPPET: skin-custom-config --> <custom> <fluidoSkin> - <gitHub> - <projectId>apache/maven-skins</projectId> - </gitHub> + <copyrightClass>pull-right</copyrightClass> </fluidoSkin> </custom> <!-- END SNIPPET: skin-custom-config --> Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/verify.groovy URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/verify.groovy?rev=1509378&view=auto ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/verify.groovy (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/verify.groovy Thu Aug 1 18:37:10 2013 @@ -0,0 +1,11 @@ +File index = new File( basedir, "target/site/index.html" ) +int inceptionYear = 2002 +int currentYear = Calendar.getInstance().get(Calendar.YEAR) +assert index.exists() +assert 1 == index.getText().count( """\ + <p class="pull-right">Copyright © ${inceptionYear}–${currentYear} + <a href="http://www.apache.org/">The Apache Software Foundation</a>. + All rights reserved. + + </p> +""".replace( "\n", System.getProperty( "line.separator" ) ) ) Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/verify.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/verify.groovy ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision 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=1509378&r1=1509377&r2=1509378&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 Thu Aug 1 18:37:10 2013 @@ -202,7 +202,7 @@ #end #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false) </li> - + #end #end ## @@ -1159,10 +1159,10 @@ #else <div class="row"> #end - #if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('footerStyle') ) - #set ( $footerStyle = 'class="' + $decoration.custom.getChild( 'fluidoSkin' ).getChild('footerStyle').getValue() + '"' ) + #if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass') ) + #set ( $copyrightClass = 'class="' + $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass').getValue() + '"' ) #end - <p $!footerStyle>Copyright ©#copyright()All rights reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</p> + <p $!copyrightClass>Copyright ©#copyright()All rights reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</p> </div> #if ( $decoration.body.footer ) 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=1509378&r1=1509377&r2=1509378&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 Thu Aug 1 18:37:10 2013 @@ -220,16 +220,16 @@ Welcome to ${project.name}! </project> +-----+ -** Footer style +** Copyright class - Since version <<1.3.1>>, you can configure footer class. (default is span12) + Since version <<1.3.1>>, you can configure a copyright class. +-----+ <project name="xxx"> [...] <custom> <fluidoSkin> - <footerStyle>pull-right</footerStyle> + <copyrightClass>pull-right</copyrightClass> </fluidoSkin> </custom> [...] @@ -477,7 +477,7 @@ Welcome to ${project.name}! ** Skip generation date Since version <<1.3.1>>, you can skip generation date from the line "Generated by Apache Maven Doxia at \<date\>" - To enable it: + to enable it: +-----+ <project name="xxx"> Modified: maven/skins/trunk/maven-fluido-skin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/site/site.xml?rev=1509378&r1=1509377&r2=1509378&view=diff ============================================================================== --- maven/skins/trunk/maven-fluido-skin/src/site/site.xml (original) +++ maven/skins/trunk/maven-fluido-skin/src/site/site.xml Thu Aug 1 18:37:10 2013 @@ -84,6 +84,7 @@ under the License. <item name="MSKINS-34" href="./mskins-34/index.html"/> <item name="MSKINS-34 (topbar)" href="./mskins-34_topbar/index.html"/> <item name="MSKINS-41" href="./mskins-41/index.html"/> + <item name="MSKINS-72" href="./mskins-72/index.html"/> <item name="MSKINS-75" href="./mskins-75/index.html"/> <item name="MSKINS-76" href="./mskins-76/index.html"/> <item name="MSKINS-76 (topbar)" href="./mskins-76_topbar/index.html"/>