You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/02/21 22:37:00 UTC
svn commit: r1448812 - in /maven/skins/trunk/maven-fluido-skin: ./
src/it/mskins-76/ src/it/mskins-76/src/ src/it/mskins-76/src/site/
src/it/mskins-76/src/site/apt/ src/it/mskins-76_topbar/
src/it/mskins-76_topbar/src/ src/it/mskins-76_topbar/src/site/...
Author: olamy
Date: Thu Feb 21 21:36:59 2013
New Revision: 1448812
URL: http://svn.apache.org/r1448812
Log:
[MSKINS-76] Add Flattr button integration to Fluido skin
Submitted by Michael Koch.
Added:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/pom.xml (with props)
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/apt/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/apt/index.apt.vm (with props)
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/site.xml (with props)
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy (with props)
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/pom.xml (with props)
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/apt/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/apt/index.apt.vm (with props)
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/site.xml (with props)
maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy (with props)
Modified:
maven/skins/trunk/maven-fluido-skin/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
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=1448812&r1=1448811&r2=1448812&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Thu Feb 21 21:36:59 2013
@@ -64,6 +64,7 @@
</contributor>
<contributor>
<name>Michael Koch</name>
+ <email>tensberg AT gmx DOT net</email>
</contributor>
<contributor>
<name>Emmanuel Hugonnet</name>
@@ -605,6 +606,36 @@
<outputDirectory>${project.build.directory}/site/mskins-75/</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>copy-mskins-76</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/it/mskins-76/target/site/</directory>
+ </resource>
+ </resources>
+ <outputDirectory>${project.build.directory}/site/mskins-76/</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-mskins-76_topbar</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/it/mskins-76_topbar/target/site/</directory>
+ </resource>
+ </resources>
+ <outputDirectory>${project.build.directory}/site/mskins-76_topbar/</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/pom.xml?rev=1448812&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/pom.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/pom.xml Thu Feb 21 21:36:59 2013
@@ -0,0 +1,93 @@
+<?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>
+ <parent>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-parent</artifactId>
+ <version>21</version>
+ </parent>
+
+ <groupId>org.apache.maven.skins.its</groupId>
+ <artifactId>@project.artifactId@-mskins-76</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>@project.name@ IT, MSKINS-76</name>
+ <url>http://maven.apache.org/skins/@project.artifactId@/mskins-76/</url>
+
+ <properties>
+ <skinName>@project.name@</skinName>
+ <skinDescription>@project.description@</skinDescription>
+ <skinGroupId>@project.groupId@</skinGroupId>
+ <skinArtifactId>@project.artifactId@</skinArtifactId>
+ <skinVersion>@project.version@</skinVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <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>
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/apt/index.apt.vm?rev=1448812&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/apt/index.apt.vm (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/apt/index.apt.vm Thu Feb 21 21:36:59 2013
@@ -0,0 +1,16 @@
+ ------
+ ${project.name}
+ ------
+ Michael Koch
+ ------
+ 2013-02-19
+ ------
+
+${project.name}
+
+ This is a test for ${skinName} with a large Flattr button.
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/apt/index.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/apt/index.apt.vm
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/site.xml?rev=1448812&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/site.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/site.xml Thu Feb 21 21:36:59 2013
@@ -0,0 +1,50 @@
+<?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>
+
+ <!-- START SNIPPET: skin-custom-config -->
+ <custom>
+ <fluidoSkin>
+ <flattr>
+ <!-- if the Apache Software Foundation had its own thing we could use it instead -->
+ <thing>448050/Open-Source-Initiative-OSI</thing>
+ <url>http://opensource.org/</url>
+ <style>large</style>
+ </flattr>
+ </fluidoSkin>
+ </custom>
+ <!-- END SNIPPET: skin-custom-config -->
+
+ <publishDate format="yyyy-MM-dd" position="right" />
+ <version position="right" />
+
+</project>
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy?rev=1448812&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy Thu Feb 21 21:36:59 2013
@@ -0,0 +1,18 @@
+File index = new File( basedir, "target/site/index.html" )
+assert index.exists()
+assert 1 == index.getText().count( '''\
+<script type="text/javascript">
+ /* <![CDATA[ */
+ (function() {
+ var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+ s.type = 'text/javascript';
+ s.async = true;
+ s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+ t.parentNode.insertBefore(s, t);
+ })();
+ /* ]]> */</script>''' )
+
+assert 1 == index.getText().count( '''\
+<a class="FlattrButton" style="display:none;" href="http://opensource.org/"></a>
+ <noscript><a href="http://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank">
+ <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript>''' )
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/pom.xml?rev=1448812&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/pom.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/pom.xml Thu Feb 21 21:36:59 2013
@@ -0,0 +1,93 @@
+<?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>
+ <parent>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-parent</artifactId>
+ <version>21</version>
+ </parent>
+
+ <groupId>org.apache.maven.skins.its</groupId>
+ <artifactId>@project.artifactId@-mskins-76</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>@project.name@ IT, MSKINS-76</name>
+ <url>http://maven.apache.org/skins/@project.artifactId@/mskins-76/</url>
+
+ <properties>
+ <skinName>@project.name@</skinName>
+ <skinDescription>@project.description@</skinDescription>
+ <skinGroupId>@project.groupId@</skinGroupId>
+ <skinArtifactId>@project.artifactId@</skinArtifactId>
+ <skinVersion>@project.version@</skinVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <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>
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/apt/index.apt.vm?rev=1448812&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/apt/index.apt.vm (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/apt/index.apt.vm Thu Feb 21 21:36:59 2013
@@ -0,0 +1,16 @@
+ ------
+ ${project.name}
+ ------
+ Michael Koch
+ ------
+ 2013-02-19
+ ------
+
+${project.name}
+
+ This is a test for ${skinName} with a compact Flattr button placed in the top bar.
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/apt/index.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/apt/index.apt.vm
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/site.xml?rev=1448812&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/site.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/site.xml Thu Feb 21 21:36:59 2013
@@ -0,0 +1,52 @@
+<?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>
+
+ <!-- START SNIPPET: skin-custom-config -->
+ <custom>
+ <fluidoSkin>
+ <flattr>
+ <!-- if the Apache Software Foundation had its own thing we could use it instead -->
+ <thing>448050/Open-Source-Initiative-OSI</thing>
+ <url>http://opensource.org/</url>
+ <style>compact</style>
+ </flattr>
+ <topBarEnabled>true</topBarEnabled>
+ <sideBarEnabled>false</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
+ <!-- END SNIPPET: skin-custom-config -->
+
+ <publishDate format="yyyy-MM-dd" position="right" />
+ <version position="right" />
+
+</project>
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy?rev=1448812&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy Thu Feb 21 21:36:59 2013
@@ -0,0 +1,18 @@
+File index = new File( basedir, "target/site/index.html" )
+assert index.exists()
+assert 1 == index.getText().count( '''\
+<script type="text/javascript">
+ /* <![CDATA[ */
+ (function() {
+ var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+ s.type = 'text/javascript';
+ s.async = true;
+ s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+ t.parentNode.insertBefore(s, t);
+ })();
+ /* ]]> */</script>''' )
+
+assert 1 == index.getText().count( '''\
+<a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://opensource.org/"></a>
+ <noscript><a href="http://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank">
+ <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript>''' )
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-76_topbar/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=1448812&r1=1448811&r2=1448812&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 Feb 21 21:36:59 2013
@@ -779,6 +779,62 @@
#end
#end
##
+#macro ( flattrHead )
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' )
+ && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'thing' )
+ && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'url' )
+ || $project.url ) )
+ <script type="text/javascript">
+ /* <![CDATA[ */
+ (function() {
+ var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+ s.type = 'text/javascript';
+ s.async = true;
+ s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+ t.parentNode.insertBefore(s, t);
+ })();
+ /* ]]> */</script>
+ #end
+#end
+##
+#macro ( flattrBody $sideBarEnabled )
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' )
+ && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'thing' )
+ && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'url' )
+ || $project.url ) )
+ #set ( $flattrThing = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'thing' ).getValue() )
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'url' ) )
+ #set ( $flattrUrl = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'url' ).getValue() )
+ #else
+ #set ( $flattrUrl = $project.url )
+ #end
+
+ #set ( $styleModifier = '' )
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'style' ) )
+ #set ( $style = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'style' ).getValue() )
+ #if ( $style.equalsIgnoreCase( 'compact' ) )
+ #set ( $styleModifier = 'rev="flattr;button:compact;"' )
+ #end
+ #end
+
+ #if ( $sideBarEnabled )
+ <div id="flattr">
+ #else
+ <ul class="nav pull-right"><li>
+ #end
+
+ <a class="FlattrButton" style="display:none;" $styleModifier href="$flattrUrl"></a>
+ <noscript><a href="http://flattr.com/thing/$flattrThing" target="_blank">
+ <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript>
+
+ #if ( $sideBarEnabled )
+ </div>
+ #else
+ </li></ul>
+ #end
+ #end
+#end
+##
<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end>
<head>
<meta charset="${outputEncoding}" />
@@ -821,6 +877,7 @@
#if( $headContent )$headContent#end
#googleAnalytics( $decoration.googleAnalyticsAccountId )
+ #flattrHead()
</head>
#if ( $decoration.custom.getChild( 'fluidoSkin' )
&& $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarEnabled' )
@@ -935,6 +992,7 @@
#facebookLike( $sideBarEnabled )
#googlePlusOne( $sideBarEnabled )
#followTwitter( $sideBarEnabled )
+ #flattrBody( $sideBarEnabled )
#end
## MSKINS-31
@@ -1033,6 +1091,8 @@
<div class="clear"></div>
#followTwitter( $sideBarEnabled )
<div class="clear"></div>
+ #flattrBody( $sideBarEnabled )
+ <div class="clear"></div>
#builtByLogo( $decoration.poweredBy )
</div>
</div>
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=1448812&r1=1448811&r2=1448812&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 Feb 21 21:36:59 2013
@@ -445,6 +445,35 @@ Welcome to ${project.name}!
</project>
+-----+
+** Flattr button
+
+ Since version <<1.3.1>>,fluido-skin supports {{{http://flattr.com}Flattr}} {{{http://flattr.com/support/button}button}} integration.
+ Users have to declare:
+
+ * <<<custom.fluidoSkin.flattr.thing>>>: <<required>>, ID of the Flattr thing. This is the part after the <<<flattr.com/thing/>>> part of the URL of the Flattr button.
+
+ * <<<custom.fluidoSkin.flattr.url>>>: <<optional>>, URL of the Flattr thing. Either this or the <<<$\{project.url\}>>> must be set for the button to appear. (<<<$\{project.url\}>>> by default.)
+
+ * <<<custom.fluidoSkin.flattr.style>>>: <<optional>>, style of the Flattr button. <<<large>>> and <<<compact>>> are supported. (<<<large>>> by default.)
+
++-----+
+<project name="xxx">
+ [...]
+ <custom>
+ <fluidoSkin>
+ <flattr>
+ <thing>12345/Example-Org</thing>
+ <url>http://example.org/</url>
+ <style>compact</style>
+ </flattr>
+ </fluidoSkin>
+ </custom>
+ [...]
+</project>
++-----+
+
+ By default, it is rendered in the sidebar, if the topbar only is available it will be rendered there.
+
Acknowledgment
${project.name} contains/redistributes {{{http://glyphicons.com}Glyphicons Halflings}} as part of Bootstrap by Twitter,
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=1448812&r1=1448811&r2=1448812&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/site.xml Thu Feb 21 21:36:59 2013
@@ -79,6 +79,8 @@ under the License.
<item name="MSKINS-34 (topbar)" href="./mskins-34_topbar/index.html"/>
<item name="MSKINS-41" href="./mskins-41/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"/>
</menu>
<menu ref="reports"/>
@@ -88,4 +90,4 @@ under the License.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
</footer>
</body>
-</project>
\ No newline at end of file
+</project>