You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2012/03/18 23:27:07 UTC
svn commit: r1302237 - in /maven/skins/trunk/maven-fluido-skin: ./
src/it/mskins-34/ src/it/mskins-34/src/site/ src/it/mskins-34_topbar/
src/it/mskins-34_topbar/src/site/ src/main/resources/META-INF/maven/
src/main/resources/css/ src/site/
Author: simonetripodi
Date: Sun Mar 18 22:27:06 2012
New Revision: 1302237
URL: http://svn.apache.org/viewvc?rev=1302237&view=rev
Log:
first attempt [MSKINS-34]; good but css still needs a little work to be finalize
Added:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/
- copied from r1302231, maven/skins/trunk/maven-fluido-skin/src/it/mskins-33/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/
- copied from r1302231, maven/skins/trunk/maven-fluido-skin/src/it/mskins-33_topbar/
Modified:
maven/skins/trunk/maven-fluido-skin/pom.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/pom.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/pom.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/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/main/resources/css/maven-theme.css
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=1302237&r1=1302236&r2=1302237&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Sun Mar 18 22:27:06 2012
@@ -468,6 +468,36 @@
<outputDirectory>${project.build.directory}/site/mskins-33_topbar/</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>copy-mskins-34</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/it/mskins-34/target/site/</directory>
+ </resource>
+ </resources>
+ <outputDirectory>${project.build.directory}/site/mskins-34/</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-mskins-34_topbar</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/it/mskins-34_topbar/target/site/</directory>
+ </resource>
+ </resources>
+ <outputDirectory>${project.build.directory}/site/mskins-34_topbar/</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/pom.xml?rev=1302237&r1=1302231&r2=1302237&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/pom.xml Sun Mar 18 22:27:06 2012
@@ -25,12 +25,12 @@
</parent>
<groupId>org.apache.maven.skins.its</groupId>
- <artifactId>@project.artifactId@-mskins-33</artifactId>
+ <artifactId>@project.artifactId@-mskins-34</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>@project.name@ IT, MSKINS-33</name>
- <url>http://maven.apache.org/skins/@project.artifactId@/mskins-23/</url>
+ <name>@project.name@ IT, MSKINS-34</name>
+ <url>http://maven.apache.org/skins/@project.artifactId@/mskins-34/</url>
<properties>
<skinName>@project.name@</skinName>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/src/site/site.xml?rev=1302237&r1=1302231&r2=1302237&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-34/src/site/site.xml Sun Mar 18 22:27:06 2012
@@ -34,7 +34,7 @@
<!-- START SNIPPET: skin-custom-config -->
<custom>
<fluidoSkin>
- <facebookLike />
+ <googlePlusOne />
</fluidoSkin>
</custom>
<!-- END SNIPPET: skin-custom-config -->
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/pom.xml?rev=1302237&r1=1302231&r2=1302237&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/pom.xml Sun Mar 18 22:27:06 2012
@@ -25,12 +25,12 @@
</parent>
<groupId>org.apache.maven.skins.its</groupId>
- <artifactId>@project.artifactId@-mskins-33</artifactId>
+ <artifactId>@project.artifactId@-mskins-34</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>@project.name@ IT, MSKINS-33</name>
- <url>http://maven.apache.org/skins/@project.artifactId@/mskins-23/</url>
+ <name>@project.name@ IT, MSKINS-34</name>
+ <url>http://maven.apache.org/skins/@project.artifactId@/mskins-34/</url>
<properties>
<skinName>@project.name@</skinName>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/src/site/site.xml?rev=1302237&r1=1302231&r2=1302237&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-34_topbar/src/site/site.xml Sun Mar 18 22:27:06 2012
@@ -34,7 +34,7 @@
<!-- START SNIPPET: skin-custom-config -->
<custom>
<fluidoSkin>
- <facebookLike />
+ <googlePlusOne />
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>false</sideBarEnabled>
</fluidoSkin>
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=1302237&r1=1302236&r2=1302237&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 Sun Mar 18 22:27:06 2012
@@ -591,6 +591,19 @@
#end
#end
##
+#macro ( googlePlusOne $sideBarEnabled )
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'googlePlusOne' )
+ && $project.url )
+ #set( $dataSize = 'tall' )
+ #if( !$sideBarEnabled )
+ #set( $dataSize = 'medium' )
+ #end
+
+ <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+ <div class="g-plusone" data-href="$project.url" data-size="$dataSize" #if( !$sideBarEnabled ) class="pull-right" style="margin-top: 10px;" #end></div>
+ #end
+#end
+##
#macro ( facebookLike $sideBarEnabled )
#if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'facebookLike' )
&& $project.url )
@@ -607,7 +620,7 @@
#set( $colorscheme = 'dark' )
#end
- #set( $frameWidth = 'width:48px; height:80px' )
+ #set( $frameWidth = 'width:48px; height:63px' )
#if( !$sideBarEnabled )
#set( $frameWidth = 'width:80px; height:20px' )
#end
@@ -837,9 +850,7 @@
#if ( !$sideBarEnabled )
#facebookLike( $sideBarEnabled )
- #end
-
- #if ( !$sideBarEnabled )
+ #googlePlusOne( $sideBarEnabled )
#followTwitter( $sideBarEnabled )
#end
@@ -919,6 +930,8 @@
<hr class="divider" />
<div id="poweredBy">
+ #googlePlusOne( $sideBarEnabled )
+ <div class="clear"></div>
#facebookLike( $sideBarEnabled )
<div class="clear"></div>
#followTwitter( $sideBarEnabled )
Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css?rev=1302237&r1=1302236&r2=1302237&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css Sun Mar 18 22:27:06 2012
@@ -48,6 +48,7 @@ body.topBarEnabled{padding-top: 60px;}
body.topBarDisabled{padding-top: 20px;}
#poweredBy{text-align: center;}
+.poweredBy{margin-top: 10px;}
/* Tweaks to the bootstrap theme
--------------------------------- */
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=1302237&r1=1302236&r2=1302237&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/site.xml Sun Mar 18 22:27:06 2012
@@ -38,6 +38,7 @@ under the License.
<custom>
<fluidoSkin>
+ <googlePlusOne />
<facebookLike />
</fluidoSkin>
</custom>
@@ -73,7 +74,9 @@ under the License.
<item name="MSKINS-25" href="./mskins-25/index.html"/>
<item name="MSKINS-31" href="./mskins-31/index.html"/>
<item name="MSKINS-33" href="./mskins-33/index.html"/>
- <item name="MSKINS-33 topbar)" href="./mskins-33_topbar/index.html"/>
+ <item name="MSKINS-33 (topbar)" href="./mskins-33_topbar/index.html"/>
+ <item name="MSKINS-34" href="./mskins-34/index.html"/>
+ <item name="MSKINS-34 (topbar)" href="./mskins-34_topbar/index.html"/>
</menu>
<menu ref="reports"/>