Author: chatellier Date: 2008-10-10 12:27:23 +0000 (Fri, 10 Oct 2008) New Revision: 206 Added: maven-lutin-skin/trunk/src/main/resources/images/logos/build-by-maven-black.png maven-lutin-skin/trunk/src/main/resources/images/logos/build-by-maven-white.png maven-lutin-skin/trunk/src/main/resources/images/paypal_en.gif Modified: maven-lutin-skin/trunk/ maven-lutin-skin/trunk/pom.xml maven-lutin-skin/trunk/src/main/resources/META-INF/maven/site.vm maven-lutin-skin/trunk/src/main/resources/css/lutin.css maven-lutin-skin/trunk/src/main/resources/css/maven-base.css maven-lutin-skin/trunk/src/main/resources/css/maven-theme.css maven-lutin-skin/trunk/src/main/resources/css/print.css maven-lutin-skin/trunk/src/main/resources/images/logos/maven-feather.png Log: Update velocity template,etc... from maven-site-plugin (trunk) Property changes on: maven-lutin-skin/trunk ___________________________________________________________________ Name: svn:ignore - .settings target .classpath .project + .settings target .classpath .project THIRD-PARTY.txt Modified: maven-lutin-skin/trunk/pom.xml =================================================================== --- maven-lutin-skin/trunk/pom.xml 2008-10-08 23:21:50 UTC (rev 205) +++ maven-lutin-skin/trunk/pom.xml 2008-10-10 12:27:23 UTC (rev 206) @@ -20,7 +20,7 @@ <packaging>jar</packaging> <!--Version--> - <version>0.2</version> + <version>0.2.1-SNAPSHOT</version> <!--Description--> <description> Modified: maven-lutin-skin/trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- maven-lutin-skin/trunk/src/main/resources/META-INF/maven/site.vm 2008-10-08 23:21:50 UTC (rev 205) +++ maven-lutin-skin/trunk/src/main/resources/META-INF/maven/site.vm 2008-10-10 12:27:23 UTC (rev 206) @@ -1,11 +1,19 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +#macro ( link $href $name ) + #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) ) + <a href="$href" class="externalLink">$name</a> + #else + <a href="$href">$name</a> + #end +#end + #macro ( banner $banner $id ) #if ( $banner ) #if( $banner.href ) - <a href="$banner.href" id="$id"> + <a href="$banner.href" id="$id" #if( $banner.alt ) title="$banner.alt" #end > #else - <span id="$id"> + <div id="$id"> #end #if( $banner.src ) @@ -17,7 +25,7 @@ #if ( $banner.alt ) #set ( $alt = $banner.alt ) #else - #set ( $alt = "" ) + #set ( $alt = $banner.name ) #end <img src="$src" alt="$alt" /> #else @@ -27,7 +35,7 @@ #if( $banner.href ) </a> #else - </span> + </div> #end #end #end @@ -38,7 +46,7 @@ #set ( $counter = $counter + 1 ) #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) ) - <a href="$currentItemHref">$item.name</a> + #link( $currentItemHref $item.name ) #if ( $links.size() > $counter ) | #end @@ -55,7 +63,7 @@ #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" ) $item.name #else - <a href="$currentItemHref">$item.name</a> + #link( $currentItemHref $item.name ) #end #if ( $breadcrumbs.size() > $counter ) > @@ -68,7 +76,6 @@ #foreach( $subitem in $item.items ) #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) ) #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) ) - #if ( $alignedFileName == $subitemHref ) #set ( $display = true ) #end @@ -102,7 +109,7 @@ #if ( $item.img ) #if ( ! ( $item.img.toLowerCase().startsWith("http") || $item.img.toLowerCase().startsWith("https") ) ) #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) ) - #set ( $src = $item.img.replaceAll( "\\", "/" ) ) + #set ( $src = $src.replaceAll( "\\", "/" ) ) <img src="$src"/> #else <img src="$item.img" align="absbottom" style="border-width: 0"/> @@ -111,7 +118,7 @@ #if ( $alignedFileName == $currentItemHref ) <strong>$item.name</strong> #else - <a href="$currentItemHref">$item.name</a> + #link( $currentItemHref $item.name ) #end #if ( $item && $item.items && $item.items.size() > 0 ) #if ( $collapse == "expanded" ) @@ -130,11 +137,13 @@ #if ( $menu.name ) <h5>$menu.name</h5> #end + #if ( $menu.items && $menu.items.size() > 0 ) <ul> #foreach( $item in $menu.items ) #menuItem( $item ) #end </ul> + #end #end #end @@ -158,7 +167,7 @@ #if ( $publishDate && $publishDate.format ) #set ( $format = $publishDate.format ) #else - #set ( $format = "MM/dd/yyyy" ) + #set ( $format = "yyyy-MM-dd" ) #end $dateFormat.applyPattern( $format ) @@ -177,13 +186,23 @@ #else #set ( $versionPosition = "left" ) #end + #else + #set ( $version = "" ) + #set ( $versionPosition = "left" ) #end #set ( $breadcrumbs = $decoration.body.breadcrumbs ) + #set ( $links = $decoration.body.links ) + #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 ) + #set ( $prefix = " |" ) + #else + #set ( $prefix = "" ) + #end + #if ( $datePosition.equalsIgnoreCase( $position ) ) #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) ) - | $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday + $prefix $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday #if ( $versionPosition.equalsIgnoreCase( $position ) ) | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version} #end @@ -207,7 +226,7 @@ #end #elseif ( $versionPosition.equalsIgnoreCase( $position ) ) #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) ) - | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version} + $prefix $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version} #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) ) <div id="lastPublished"> $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version} @@ -252,31 +271,47 @@ #set ( $img = "images/logos/maven-feather.png" ) #end - <a href="$href" title="$name" id="poweredBy"> + <a href="$href" title="$name" class="poweredBy"> #set ( $img = $PathTool.calculateLink( $img, $relativePath ) ) #set ( $img = $img.replaceAll( "\\", "/" ) ) - <img alt="$name" src="$img" /> + <img class="poweredBy" + alt="$name" + src="$img" + width="90" + height="30" + /> </a> #end #if( $poweredBy.isEmpty() ) - <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" id="poweredBy"> - <img alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img> + <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy"> + <img class="poweredBy" + alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" + src="$relativePath/images/logos/maven-feather.png" + width="90" + height="30" + border="1" /> </a> #end #else - <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" id="poweredBy"> - <img alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img> + <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy"> + <img class="poweredBy" + alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" + src="$relativePath/images/logos/maven-feather.png" + width="90" + height="30" + border="1" + /> </a> #end #end -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>$title</title> <style type="text/css" media="all"> @import url("$relativePath/css/maven-base.css"); @import url("$relativePath/css/maven-theme.css"); - @import url("$relativePath/css/lutin.css"); + @import url("$relativePath/css/lutin.css"); @import url("$relativePath/css/site.css"); </style> <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" /> @@ -286,10 +321,15 @@ <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" /> #if ( $decoration.body.head ) #foreach( $item in $decoration.body.head.getChildren() ) + ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString() + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString() + #set ( $documentHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" ) + #set ( $documentHeader = $documentHeader.replaceAll( "\\", "" ) ) #if ( $item.name == "script" ) - $item.toUnescapedString() + $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" ) #else - $item.toString() + $StringUtils.replace( $item.toString(), $documentHeader, "" ) #end #end #end @@ -313,92 +353,97 @@ <div id="navcolumn"> #publishDate( "navigation-top" $decoration.publishDate $decoration.version ) #mainMenu( $decoration.body.menus ) + ##poweredByLogo( $decoration.poweredBy ) #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version ) </div> + + + <!-- Search Google --> <div id="Google-search"> -<!-- Search Google --> -<form method="get" action="http://www.google.fr/custom" target="_top"> - <input type="hidden" name="client" value="pub-5067547915349883"></input> - <input type="hidden" name="forid" value="1"></input> - <input type="hidden" name="ie" value="ISO-8859-15"></input> - <input type="hidden" name="oe" value="ISO-8859-15"></input> - <input type="hidden" name="cof" value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:336699;ALC:0000FF;LC:0000FF;T:000000;GFNT:0000FF;GIMP:0000FF;LH:50;LW:210;L:http://www.codelutin.com/images/ - <input type="hidden" name="hl" value="fr"></input> - -<table bgcolor="#eeeeee"> - <tr><td valign="top" align="right"> - <label for="sbi" style="display: none">Entrez les termes que vous recherchez.</label> - <input type="text" name="q" size="10" maxlength="255" value="" id="sbi"></input> - <label for="sbb" style="display: none">Envoyer un formulaire de recherche</label> -</td></tr> -<tr><td valign="top" align="right"> - <input type="submit" name="sa" value="Google" id="sbb"></input> -</td></tr></table> -</form> -<!-- Search Google --> + <form method="get" action="http://www.google.fr/custom" target="_top"> + <input type="hidden" name="client" value="pub-5067547915349883"></input> + <input type="hidden" name="forid" value="1"></input> + <input type="hidden" name="ie" value="ISO-8859-15"></input> + <input type="hidden" name="oe" value="ISO-8859-15"></input> + <input type="hidden" name="cof" value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:336699;ALC:0000FF;LC:0000FF;T:000000;GFNT:0000FF;GIMP:0000FF;LH:50;LW:210;L:http://www.codelutin.com/images/ + <input type="hidden" name="hl" value="fr"></input> + <table bgcolor="#eeeeee"> + <tr><td valign="top" align="right"> + <label for="sbi" style="display: none">Entrez les termes que vous recherchez.</label> + <input type="text" name="q" size="10" maxlength="255" value="" id="sbi"></input> + <label for="sbb" style="display: none">Envoyer un formulaire de recherche</label> + </td></tr> + <tr><td valign="top" align="right"> + <input type="submit" name="sa" value="Google" id="sbb"></input> + </td></tr></table> + </form> </div> - <div id="paypal"> -<!-- - | FIXME probleme de recherche de lutin-site-skin_XX.properties, dans doute pas dans le classpath :(, mais ou mettre la dependance :( - test dans le plugin declaration, dans dep du projet, marche pas - | <a href=" # $ i18n.getString( "lutin-site-skin", $locale, "whymakedonate.url" )"> $ i18n.getString( "lutin-site-skin", $locale, "whymakedonate" )</a> - +--> + <!-- Search Google --> + + <!-- paypal --> + <div id="paypal"> + <!-- + | FIXME probleme de recherche de lutin-site-skin_XX.properties, dans doute pas dans le classpath :(, mais ou mettre la dependance :( - test dans le plugin declaration, dans dep du projet, marche pas + | <a href=" # $ i18n.getString( "lutin-site-skin", $locale, "whymakedonate.url" )"> $ i18n.getString( "lutin-site-skin", $locale, "whymakedonate" )</a> + +--> <a href="http://www.codelutin.com/whymakedonate/en">Why make donate</a> -<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> -<input type="hidden" name="cmd" value="_xclick"> -<input type="hidden" name="business" value="paypal@codelutin.com"> -<input type="hidden" name="item_name" value="$project.artifactId"> -<input type="hidden" name="item_number" value="Don"> -<input type="hidden" name="no_shipping" value="2"> -<input type="hidden" name="no_note" value="1"> -<input type="hidden" name="currency_code" value="EUR"> -<input type="hidden" name="tax" value="0"> -<input type="hidden" name="lc" value="FR"> -<input type="hidden" name="bn" value="PP-DonationsBF"> -<input type="image" src="images/paypal.gif" border="0" name="submit" alt="Effectuez vos dons via PayPal"> -</form> + <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" name="business" value="paypal@codelutin.com"> + <input type="hidden" name="item_name" value="$project.artifactId"> + <input type="hidden" name="item_number" value="Don"> + <input type="hidden" name="no_shipping" value="2"> + <input type="hidden" name="no_note" value="1"> + <input type="hidden" name="currency_code" value="EUR"> + <input type="hidden" name="tax" value="0"> + <input type="hidden" name="lc" value="FR"> + <input type="hidden" name="bn" value="PP-DonationsBF"> + <input type="image" src="images/paypal.gif" border="0" name="submit" alt="Effectuez vos dons via PayPal"> + </form> + </div> + <div id="Google-AdSense"> + <script type="text/javascript"><!-- + google_ad_client = "pub-5067547915349883"; + google_ad_width = 120; + google_ad_height = 240; + google_ad_format = "120x240_as"; + google_ad_type = "text"; + google_ad_channel = ""; + //--></script> + <script type="text/javascript" + src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> + </script> + + <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"> + </script> + <script type="text/javascript"> + <!-- + _uacct = "UA-1064192-2"; + _udn="labs.libre-entreprise.org"; + urchinTracker(); + // --> + </script> + <a class="tiny" href="http://www.codelutin.com/google">google analytics</a> </div> - <div id="Google-AdSense"> -<script type="text/javascript"><!-- -google_ad_client = "pub-5067547915349883"; -google_ad_width = 120; -google_ad_height = 240; -google_ad_format = "120x240_as"; -google_ad_type = "text"; -google_ad_channel = ""; -//--></script> -<script type="text/javascript" - src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> -</script> - </div> </div> <div id="bodyColumn"> <div id="contentBox"> $bodyContent </div> </div> - <div id="poweredBy"> - #poweredByLogo( $decoration.poweredBy ) - </div> -<!-- + <div id="poweredBy"> + #poweredByLogo( $decoration.poweredBy ) + </div> <div class="clear"> <hr/> </div> ---> <div id="footer"> - <div class="xright">©#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</div> + <div class="xright"> + ©#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version ) + </div> <div class="clear"> <hr/> </div> </div> - -<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"> -</script> -<script type="text/javascript"> -_uacct = "UA-1064192-2"; -_udn="labs.libre-entreprise.org"; -urchinTracker(); -</script> -<a class="tiny" href="http://www.codelutin.com/google">google analytics</a> - </body> </html> Modified: maven-lutin-skin/trunk/src/main/resources/css/lutin.css =================================================================== --- maven-lutin-skin/trunk/src/main/resources/css/lutin.css 2008-10-08 23:21:50 UTC (rev 205) +++ maven-lutin-skin/trunk/src/main/resources/css/lutin.css 2008-10-10 12:27:23 UTC (rev 206) @@ -1,4 +1,4 @@ -#bannerLeft { +/*#bannerLeft { float: left; width: 20%; } @@ -9,8 +9,8 @@ } #banner img { -// height: 60px; -} + height: 60px; +}*/ #bodyColumn { min-height: 300px; @@ -52,9 +52,11 @@ } .tiny { - font-size: 50%; + font-size: 40%; } +/* unused ? + .field_list { display: table; border-spacing: 4pt; @@ -74,4 +76,4 @@ .field_body { display: table-cell; background-color: #ddd; -} +}*/ Modified: maven-lutin-skin/trunk/src/main/resources/css/maven-base.css =================================================================== --- maven-lutin-skin/trunk/src/main/resources/css/maven-base.css 2008-10-08 23:21:50 UTC (rev 205) +++ maven-lutin-skin/trunk/src/main/resources/css/maven-base.css 2008-10-10 12:27:23 UTC (rev 206) @@ -35,11 +35,9 @@ } .xleft, #bannerLeft img { float:left; - text-shadow: #7CFC00; } -.xright, #bannerRight img { +.xright, #bannerRight { float:right; - text-shadow: #7CFC00; } #banner { padding: 0px; @@ -101,9 +99,6 @@ #poweredBy img { display:block; margin: 20px 0 20px 17px; - border: 1px solid black; - width: 90px; - height: 30px; } #search img { margin: 0px; Modified: maven-lutin-skin/trunk/src/main/resources/css/maven-theme.css =================================================================== --- maven-lutin-skin/trunk/src/main/resources/css/maven-theme.css 2008-10-08 23:21:50 UTC (rev 205) +++ maven-lutin-skin/trunk/src/main/resources/css/maven-theme.css 2008-10-10 12:27:23 UTC (rev 206) @@ -1,3 +1,22 @@ +/* + * 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. + */ + body { padding: 0px 0px 10px 0px; } @@ -64,7 +83,7 @@ h5 { padding: 4px 4px 4px 6px; color: #900; - font-size: normal; + font-size: medium; } p { line-height: 1.3em; @@ -138,4 +157,3 @@ .infomark { background-image: url(../images/icon_info_sml.gif); } - Modified: maven-lutin-skin/trunk/src/main/resources/css/print.css =================================================================== --- maven-lutin-skin/trunk/src/main/resources/css/print.css 2008-10-08 23:21:50 UTC (rev 205) +++ maven-lutin-skin/trunk/src/main/resources/css/print.css 2008-10-10 12:27:23 UTC (rev 206) @@ -1,4 +1,4 @@ -#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #rightColumn, #navColumn { +#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn { display: none !important; } #bodyColumn, body.docs div.docs { Added: maven-lutin-skin/trunk/src/main/resources/images/logos/build-by-maven-black.png =================================================================== (Binary files differ) Property changes on: maven-lutin-skin/trunk/src/main/resources/images/logos/build-by-maven-black.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-lutin-skin/trunk/src/main/resources/images/logos/build-by-maven-white.png =================================================================== (Binary files differ) Property changes on: maven-lutin-skin/trunk/src/main/resources/images/logos/build-by-maven-white.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: maven-lutin-skin/trunk/src/main/resources/images/logos/maven-feather.png =================================================================== (Binary files differ) Added: maven-lutin-skin/trunk/src/main/resources/images/paypal_en.gif =================================================================== (Binary files differ) Property changes on: maven-lutin-skin/trunk/src/main/resources/images/paypal_en.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream