You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2013/08/22 21:46:10 UTC
svn commit: r1516562 - in /maven/skins/trunk/maven-fluido-skin: ./
src/it/mskins-85/ src/it/mskins-85/src/site/ src/it/mskins-85/src/site/apt/
src/main/resources/META-INF/maven/ src/site/ src/site/apt/
Author: michaelo
Date: Thu Aug 22 19:46:09 2013
New Revision: 1516562
URL: http://svn.apache.org/r1516562
Log:
[MSKINS-85] Unify breadcrumb chevron of Fluido with other skins
Added:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/
- copied from r1513237, maven/skins/trunk/maven-fluido-skin/src/it/mskins-72/
Removed:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/verify.groovy
Modified:
maven/skins/trunk/maven-fluido-skin/pom.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/pom.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/src/site/apt/index.apt.vm
maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/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=1516562&r1=1516561&r2=1516562&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Thu Aug 22 19:46:09 2013
@@ -651,6 +651,21 @@
<outputDirectory>${project.build.directory}/site/mskins-76_topbar/</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>copy-mskins-85</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/it/mskins-85/target/site/</directory>
+ </resource>
+ </resources>
+ <outputDirectory>${project.build.directory}/site/mskins-85/</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/pom.xml?rev=1516562&r1=1513237&r2=1516562&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/pom.xml Thu Aug 22 19:46:09 2013
@@ -25,12 +25,12 @@
</parent>
<groupId>org.apache.maven.skins.its</groupId>
- <artifactId>@project.artifactId@-mskins-72</artifactId>
+ <artifactId>project.artifactId-mskins-85</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>@project.name@ IT, MSKINS-72</name>
- <url>http://maven.apache.org/skins/@project.artifactId@/mskins-72/</url>
+ <name>@project.name@ IT, MSKINS-85</name>
+ <url>http://maven.apache.org/skins/@project.artifactId@/mskins-85/</url>
<properties>
<skinName>@project.name@</skinName>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/src/site/apt/index.apt.vm?rev=1516562&r1=1513237&r2=1516562&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/src/site/apt/index.apt.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/src/site/apt/index.apt.vm Thu Aug 22 19:46:09 2013
@@ -3,15 +3,14 @@
------
Michael Osipov
------
- 2013-07-30
+ 2013-08-18
------
${project.name}
- This is a test for ${skinName} with copyright pulled to the right-hand side by
- the css class <<<pull-right>>>.
+ This is a test for ${skinName} with a custom breadcrumb divider <<<»>>> (guillemet).
${skinDescription}
-* Actual configuration
+* Actual Configuration
%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/src/site/site.xml?rev=1516562&r1=1513237&r2=1516562&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-85/src/site/site.xml Thu Aug 22 19:46:09 2013
@@ -34,7 +34,8 @@
<!-- START SNIPPET: skin-custom-config -->
<custom>
<fluidoSkin>
- <copyrightClass>pull-right</copyrightClass>
+ <!-- Cannot use multibyte chars due to https://jira.codehaus.org/browse/DOXIA-386 -->
+ <breadcrumbDivider>»</breadcrumbDivider>
</fluidoSkin>
</custom>
<!-- END SNIPPET: skin-custom-config -->
@@ -42,42 +43,4 @@
<publishDate format="yyyy-MM-dd" position="right" />
<version position="right" />
- <body>
- <breadcrumbs>
- <item name="skins" href="/skins/"/>
- <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
- </breadcrumbs>
-
- <menu name="Overview">
- <item name="Introduction" href="index.html"/>
- </menu>
-
- <menu ref="reports"/>
-
- <footer>
- <div class="row-fluid">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
- All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
- <div class="row-fluid">
- <div class="span4">
- <address>
- <strong>The Apache Software Foundation</strong><br/>
- <i>Dept. 9660</i><br/>
- <i>Los Angeles, CA 90084-9660</i><br/>
- <i>USA</i><br/>
- <abbr title="Fax">Fax:</abbr> <i>+1.919.573.9199</i>
- </address>
- </div>
- <div class="span4">
- <address>
- <strong>The Apache Software Foundation</strong><br/>
- <i>1901 Munsey Drive</i><br/>
- <i>Forest Hill, MD 21050-2747</i><br/>
- <i>USA</i><br/>
- <a href="mailto:apache at apache dot org">apache at apache dot org</a>
- </address>
- </div>
- </div>
- </footer>
- </body>
-
</project>
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=1516562&r1=1516561&r2=1516562&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 22 19:46:09 2013
@@ -216,7 +216,12 @@
##
<li class="$cssClass">
#link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false )
- <span class="divider">></span>
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'breadcrumbDivider' ) )
+ #set ( $breadcrumbDivider = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'breadcrumbDivider' ).getValue() )
+ #else
+ #set ( $breadcrumbDivider = '/' )
+ #end
+ <span class="divider">$breadcrumbDivider</span>
</li>
#end
#if ( $shortTitle )
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=1516562&r1=1516561&r2=1516562&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 22 19:46:09 2013
@@ -222,7 +222,7 @@ Welcome to ${project.name}!
** Copyright class
- Since version <<1.3.1>>, you can configure a copyright class.
+ Since version <<1.3.1>>, you can configure a copyright class:
+-----+
<project name="xxx">
@@ -447,7 +447,7 @@ Welcome to ${project.name}!
** Flattr button
- Since version <<1.3.1>>,fluido-skin supports {{{http://flattr.com}Flattr}} {{{http://flattr.com/support/button}button}} integration.
+ 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.
@@ -491,6 +491,21 @@ Welcome to ${project.name}!
</project>
+-----+
+** Breadcrumb Divider
+
+ Since version <<1.3.1>>, you can configure the breadcrumb divider (default is a slash):
+
++-----+
+<project name="xxx">
+ [...]
+ <custom>
+ <fluidoSkin>
+ <breadcrumbDivider>»</breadcrumbDivider>
+ </fluidoSkin>
+ </custom>
+ [...]
+</project>
++-----+
Acknowledgment
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=1516562&r1=1516561&r2=1516562&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 22 19:46:09 2013
@@ -87,6 +87,7 @@ under the License.
<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"/>
+ <item name="MSKINS-85" href="./mskins-85/index.html"/>
</menu>
<menu ref="reports"/>