Author: tchemit Date: 2011-02-24 15:38:25 +0100 (Thu, 24 Feb 2011) New Revision: 626 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/626 Log: Anomalie #1361: Google search does not work at all (the extra suffix with * is not ok) Anomalie #1364: Google-Ads and Google analytics are in same div which makes no senses Evolution #1011: Add a parameter to customize the display (or not) of the donate stuff on project. Evolution #1358: Add a parameter to customize the display (or not) of the google analytics on project. Evolution #1360: Add a parameter to customize the display (or not) of the google search stuff on project. Evolution #1362: Add a parameter to customize the display (or not) of the google ads on project. Modified: trunk/src/main/resources/META-INF/maven/site.vm Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2011-02-24 14:22:45 UTC (rev 625) +++ trunk/src/main/resources/META-INF/maven/site.vm 2011-02-24 14:38:25 UTC (rev 626) @@ -380,6 +380,7 @@ <hr/> </div> </div> + <div id="leftColumn"> <div id="navcolumn"> #publishDate( "navigation-top" $decoration.publishDate $decoration.version ) @@ -387,81 +388,97 @@ ##poweredByLogo( $decoration.poweredBy ) #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version ) </div> - - - <!-- Search Google --> - <div id="Google-search"> - <form action="http://www.google.com/cse" id="cse-search-box"> - <div> - #if( $project.groupId == "org.nuiton" ) - <input type="hidden" name="cx" value="006400969094406405403:svbxely-vkg" /> - #elseif( $project.groupId == "org.chorem" ) - <input type="hidden" name="cx" value="006400969094406405403:qk_jy5z6gaw" /> - #end - <input type="hidden" name="ie" value="UTF-8" /> - <input type="text" name="q" size="17" /> - #if( $locale == "fr" ) - <input type="submit" name="sa" value="Rechercher" /> - #elseif( $locale == "en" ) - <input type="submit" name="sa" value="Search" /> - #end - <input type="hidden" name="as_sitesearch" value="$project.url*"/> - </div> - </form> - <script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&lang=fr"></script> - </div> - <!-- Search Google --> - - <!-- paypal --> - <div id="paypal"> - <!-- + + #if ( "$googleSearchEnabled" != "false" ) + <!-- Search Google --> + <div id="Google-search"> + <form action="http://www.google.com/cse" id="cse-search-box"> + <div> + #if( $project.groupId == "org.nuiton" ) + <input type="hidden" name="cx" + value="006400969094406405403:svbxely-vkg"/> + #elseif( $project.groupId == "org.chorem" ) + <input type="hidden" name="cx" + value="006400969094406405403:qk_jy5z6gaw"/> + #end + <input type="hidden" name="ie" value="UTF-8"/> + <input type="text" name="q" size="17"/> + #if( $locale == "fr" ) + <input type="submit" name="sa" value="Rechercher"/> + #elseif( $locale == "en" ) + <input type="submit" name="sa" value="Search"/> + #end + <input type="hidden" name="as_sitesearch" value="$project.url"/> + </div> + </form> + <script type="text/javascript" + src="http://www.google.com/cse/brand?form=cse-search-box&lang=fr"> + </script> + </div> + #end + + #if ( "$payPalEnabled" != "false" ) + <!-- Donate via Paypal --> + <div id="paypal"> + <!-- | FIXME probleme de recherche de nuiton-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( "maven-nuiton-skin", $locale, "whymakedonate.url" )"> $ i18n.getString( "maven-nuiton-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> - </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 = ""; - //--> + <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> + </div> + #end + + #if ( "$googleAdSenseEnabled" != "false" ) + <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> + #end + #if ( "$googleAnalyticsEnabled" != "false" ) + <script src="http://www.google-analytics.com/urchin.js" + type="text/javascript"> </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(); - // --> + <!-- + _uacct = "UA-1064192-2"; + _udn="labs.libre-entreprise.org"; + urchinTracker(); + // --> </script> <div id="googleAnalytics"> - <a class="tiny" href="http://www.codelutin.com/google">google analytics</a> + <a class="tiny" href="http://www.codelutin.com/google">google + analytics</a> </div> - </div> + #end </div> + <div id="bodyColumn"> <div id="contentBox"> $bodyContent