From tchemit@users.nuiton.org Thu Feb 24 15:38:25 2011
From: tchemit@users.nuiton.org
To: maven-nuiton-skin-commits@list.nuiton.org
Subject:
 [Maven-nuiton-skin-commits] r626 -	trunk/src/main/resources/META-INF/maven
Date: Thu, 24 Feb 2011 15:38:25 +0100
Message-ID: <20110224143825.17FF416BDA@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2043120576909136262=="

--===============2043120576909136262==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 * i=
s not ok)
Anomalie #1364: Google-Ads and Google analytics are in same div which makes n=
o senses
Evolution #1011: Add a parameter to customize the display (or not) of the don=
ate stuff on project.
Evolution #1358: Add a parameter to customize the display (or not) of the goo=
gle analytics on project.
Evolution #1360: Add a parameter to customize the display (or not) of the goo=
gle search stuff on project.
Evolution #1362: Add a parameter to customize the display (or not) of the goo=
gle ads on project.


Modified:
   trunk/src/main/resources/META-INF/maven/site.vm

Modified: trunk/src/main/resources/META-INF/maven/site.vm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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>
+   =20
     <div id=3D"leftColumn">
       <div id=3D"navcolumn">
        #publishDate( "navigation-top" $decoration.publishDate $decoration.ve=
rsion )
@@ -387,81 +388,97 @@
        ##poweredByLogo( $decoration.poweredBy )
        #publishDate( "navigation-bottom" $decoration.publishDate $decoration=
.version )
       </div>
-     =20
-     =20
-      <!-- Search Google -->
-      <div id=3D"Google-search">
-	      <form action=3D"http://www.google.com/cse" id=3D"cse-search-box">
-  		<div>
-		#if( $project.groupId =3D=3D "org.nuiton" )
-		<input type=3D"hidden" name=3D"cx" value=3D"006400969094406405403:svbxely-=
vkg" />
-		#elseif( $project.groupId =3D=3D "org.chorem" )
-		<input type=3D"hidden" name=3D"cx" value=3D"006400969094406405403:qk_jy5z6=
gaw" />
-		#end		   =20
-		    <input type=3D"hidden" name=3D"ie" value=3D"UTF-8" />
-		    <input type=3D"text" name=3D"q" size=3D"17" />
-		#if( $locale =3D=3D "fr" )
-		    <input type=3D"submit" name=3D"sa" value=3D"Rechercher" />
-		#elseif( $locale =3D=3D "en" )
-		    <input type=3D"submit" name=3D"sa" value=3D"Search" />
-		#end		   =20
-			<input type=3D"hidden" name=3D"as_sitesearch" value=3D"$project.url*"/>
-  		</div>
-		</form>
-		<script type=3D"text/javascript" src=3D"http://www.google.com/cse/brand?fo=
rm=3Dcse-search-box&lang=3Dfr"></script>
-	</div>
-      <!-- Search Google -->
-     =20
-      <!-- paypal -->
-      <div id=3D"paypal">
-        <!--
+
+      #if ( "$googleSearchEnabled" !=3D "false" )
+        <!-- Search Google -->
+        <div id=3D"Google-search">
+          <form action=3D"http://www.google.com/cse" id=3D"cse-search-box">
+            <div>
+              #if( $project.groupId =3D=3D "org.nuiton" )
+                <input type=3D"hidden" name=3D"cx"
+                       value=3D"006400969094406405403:svbxely-vkg"/>
+              #elseif( $project.groupId =3D=3D "org.chorem" )
+                <input type=3D"hidden" name=3D"cx"
+                       value=3D"006400969094406405403:qk_jy5z6gaw"/>
+              #end
+              <input type=3D"hidden" name=3D"ie" value=3D"UTF-8"/>
+              <input type=3D"text" name=3D"q" size=3D"17"/>
+              #if( $locale =3D=3D "fr" )
+                <input type=3D"submit" name=3D"sa" value=3D"Rechercher"/>
+              #elseif( $locale =3D=3D "en" )
+                <input type=3D"submit" name=3D"sa" value=3D"Search"/>
+              #end
+              <input type=3D"hidden" name=3D"as_sitesearch" value=3D"$projec=
t.url"/>
+            </div>
+          </form>
+          <script type=3D"text/javascript"
+                  src=3D"http://www.google.com/cse/brand?form=3Dcse-search-b=
ox&lang=3Dfr">
+          </script>
+        </div>
+      #end
+
+      #if ( "$payPalEnabled" !=3D "false" )
+        <!-- Donate via Paypal -->
+        <div id=3D"paypal">
+          <!--
          | FIXME probleme de recherche de nuiton-site-skin_XX.properties, da=
ns doute pas dans le classpath :(, mais ou mettre la dependance :( - test dan=
s le plugin declaration, dans dep du projet, marche pas
          |       <a href=3D" # $ i18n.getString( "maven-nuiton-skin", $local=
e, "whymakedonate.url" )"> $ i18n.getString( "maven-nuiton-skin", $locale, "w=
hymakedonate" )</a>
          +-->
-        <a href=3D"http://www.codelutin.com/whymakedonate/en">Why make donat=
e</a>
-        <form action=3D"https://www.paypal.com/cgi-bin/webscr" method=3D"pos=
t">
-          <input type=3D"hidden" name=3D"cmd" value=3D"_xclick"/>
-          <input type=3D"hidden" name=3D"business" value=3D"paypal@codelutin=
.com"/>
-          <input type=3D"hidden" name=3D"item_name" value=3D"$project.artifa=
ctId"/>
-          <input type=3D"hidden" name=3D"item_number" value=3D"Don"/>
-          <input type=3D"hidden" name=3D"no_shipping" value=3D"2"/>
-          <input type=3D"hidden" name=3D"no_note" value=3D"1"/>
-          <input type=3D"hidden" name=3D"currency_code" value=3D"EUR"/>
-          <input type=3D"hidden" name=3D"tax" value=3D"0"/>
-          <input type=3D"hidden" name=3D"lc" value=3D"FR"/>
-          <input type=3D"hidden" name=3D"bn" value=3D"PP-DonationsBF"/>
-          <input type=3D"image" src=3D"images/paypal.gif" border=3D"0" name=
=3D"submit" alt=3D"Effectuez vos dons via PayPal"/>
-        </form>
-      </div>
-      <div id=3D"Google-AdSense">
-        <script type=3D"text/javascript">
-        <!--
-          google_ad_client =3D "pub-5067547915349883";
-          google_ad_width =3D 120;
-          google_ad_height =3D 240;
-          google_ad_format =3D "120x240_as";
-          google_ad_type =3D "text";
-          google_ad_channel =3D "";
-        //-->
+          <a href=3D"http://www.codelutin.com/whymakedonate/en">Why make
+            donate</a>
+
+          <form action=3D"https://www.paypal.com/cgi-bin/webscr" method=3D"p=
ost">
+            <input type=3D"hidden" name=3D"cmd" value=3D"_xclick"/>
+            <input type=3D"hidden" name=3D"business" value=3D"paypal@codelut=
in.com"/>
+            <input type=3D"hidden" name=3D"item_name" value=3D"$project.arti=
factId"/>
+            <input type=3D"hidden" name=3D"item_number" value=3D"Don"/>
+            <input type=3D"hidden" name=3D"no_shipping" value=3D"2"/>
+            <input type=3D"hidden" name=3D"no_note" value=3D"1"/>
+            <input type=3D"hidden" name=3D"currency_code" value=3D"EUR"/>
+            <input type=3D"hidden" name=3D"tax" value=3D"0"/>
+            <input type=3D"hidden" name=3D"lc" value=3D"FR"/>
+            <input type=3D"hidden" name=3D"bn" value=3D"PP-DonationsBF"/>
+            <input type=3D"image" src=3D"images/paypal.gif" border=3D"0" nam=
e=3D"submit"
+                   alt=3D"Effectuez vos dons via PayPal"/>
+          </form>
+        </div>
+      #end
+
+      #if ( "$googleAdSenseEnabled" !=3D "false" )
+        <div id=3D"Google-AdSense">
+          <script type=3D"text/javascript">
+            <!--
+              google_ad_client =3D "pub-5067547915349883";
+              google_ad_width =3D 120;
+              google_ad_height =3D 240;
+              google_ad_format =3D "120x240_as";
+              google_ad_type =3D "text";
+              google_ad_channel =3D "";
+            //-->
+          </script>
+          <script type=3D"text/javascript"
+                  src=3D"http://pagead2.googlesyndication.com/pagead/show_ad=
s.js">
+          </script>
+        </div>
+      #end
+      #if ( "$googleAnalyticsEnabled" !=3D "false" )
+        <script src=3D"http://www.google-analytics.com/urchin.js"
+                type=3D"text/javascript">
         </script>
-        <script type=3D"text/javascript"
-          src=3D"http://pagead2.googlesyndication.com/pagead/show_ads.js">
-        </script>
-       =20
-        <script src=3D"http://www.google-analytics.com/urchin.js" type=3D"te=
xt/javascript">
-        </script>
         <script type=3D"text/javascript">
-        <!--
-        _uacct =3D "UA-1064192-2";
-        _udn=3D"labs.libre-entreprise.org";
-        urchinTracker();
-        // -->
+          <!--
+         _uacct =3D "UA-1064192-2";
+         _udn=3D"labs.libre-entreprise.org";
+         urchinTracker();
+         // -->
         </script>
         <div id=3D"googleAnalytics">
-            <a class=3D"tiny" href=3D"http://www.codelutin.com/google">googl=
e analytics</a>
+          <a class=3D"tiny" href=3D"http://www.codelutin.com/google">google
+            analytics</a>
         </div>
-      </div>
+      #end
     </div>
+   =20
     <div id=3D"bodyColumn">
       <div id=3D"contentBox">
         $bodyContent


--===============2043120576909136262==--