From ae44eff6975828e68ee8919f9a46fd3ceac80832 Mon Sep 17 00:00:00 2001
From: Tim Bishop <tim@bishnet.net>
Date: Wed, 5 Jun 2013 10:49:41 +0000
Subject: [PATCH] Remove adverts.

---
 www/bannerad.inc            | 20 ------------------
 www/cms/index.xhtml         |  1 -
 www/footer.inc              | 20 ------------------
 www/index.xhtml             | 29 +++++++++++++-------------
 www/libstatgrab/index.xhtml |  1 -
 www/menu-static.inc         | 41 -------------------------------------
 www/menu.inc                | 17 ---------------
 www/pystatgrab/index.xhtml  |  1 -
 www/styles/handheld.css     |  8 --------
 www/styles/print.css        |  8 --------
 10 files changed, 15 insertions(+), 131 deletions(-)

diff --git a/www/bannerad.inc b/www/bannerad.inc
index ce8fbbb..e69de29 100644
--- a/www/bannerad.inc
+++ b/www/bannerad.inc
@@ -1,20 +0,0 @@
-          <div id="advert1">
-            <script type="text/javascript">
-              <!--
-                google_ad_client = "pub-4199687771151670";
-                google_ad_width = 468;
-                google_ad_height = 60;
-                google_ad_format = "468x60_as";
-                google_ad_type = "text_image";
-                google_ad_channel ="";
-                google_color_border = "000066";
-                google_color_bg = "EEEEFF";
-                google_color_link = "0000FF";
-                google_color_url = "008000";
-                google_color_text = "000000";
-              //-->
-            </script>
-            <script type="text/javascript"
-              src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-            </script>
-          </div>
\ No newline at end of file
diff --git a/www/cms/index.xhtml b/www/cms/index.xhtml
index 75e9bd8..b939a43 100644
--- a/www/cms/index.xhtml
+++ b/www/cms/index.xhtml
@@ -35,7 +35,6 @@
               </li>
             </ul>
           </div>
-<!--#include virtual="/bannerad.inc" -->
           <h2>
             <a id="overview">Overview</a>
           </h2>
diff --git a/www/footer.inc b/www/footer.inc
index d4cde70..2d3f9bd 100644
--- a/www/footer.inc
+++ b/www/footer.inc
@@ -1,24 +1,4 @@
         <div id="footer">
-          <div id="advert2">
-            <script type="text/javascript">
-              <!--
-                google_ad_client = "pub-4199687771151670";
-                google_ad_width = 468;
-                google_ad_height = 60;
-                google_ad_format = "468x60_as";
-                google_ad_type = "text_image";
-                google_ad_channel ="";
-                google_color_border = "000066";
-                google_color_bg = "EEEEFF";
-                google_color_link = "0000FF";
-                google_color_url = "008000";
-                google_color_text = "000000";
-              //-->
-            </script>
-            <script type="text/javascript"
-              src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-            </script>
-          </div>
           <p>
             &copy; 2000-2011 i-scream &#187;
             <a href="http://www.i-scream.org/">http://www.i-scream.org/</a> &#171;
diff --git a/www/index.xhtml b/www/index.xhtml
index 5a2e21f..d0975a3 100644
--- a/www/index.xhtml
+++ b/www/index.xhtml
@@ -29,7 +29,6 @@
               </li>
             </ul>
           </div>
-<!--#include virtual="/bannerad.inc" -->
           <h2>
             <a id="news">News</a>
           </h2>
@@ -164,19 +163,21 @@
             Use this form to search the whole i-scream website,
             courtesy of Google.
           </p>
-          <form method="get" action="http://www.google.com/custom">
-            <p>
-              <a href="http://www.google.com/"><img src="http://www.google.com/logos/Logo_25wht.gif" alt="Google" /></a>
-              <input type="hidden" name="domains" value="i-scream.org" />
-              <input type="text" name="q" size="31" maxlength="255" value="" />
-              <input type="submit" name="sa" value="Search" />
-              <input type="radio" name="sitesearch" value="i-scream.org" checked="checked" />i-scream.org
-              <input type="radio" name="sitesearch" value="" />Web
-              <input type="hidden" name="client" value="pub-4199687771151670" />
-              <input type="hidden" name="forid" value="1" />
-              <input type="hidden" name="cof" value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:EEEEFF;ALC:0000FF;LC:0000FF;T:000000;GFNT:0000FF;GIMP:0000FF;FORID:1;" />
-            </p>
-          </form>
+          <div>
+            <script>
+              (function() {
+                var cx = '015923082814183233257:dz2h65arce8';
+                var gcse = document.createElement('script');
+                gcse.type = 'text/javascript';
+                gcse.async = true;
+                gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+                    '//www.google.com/cse/cse.js?cx=' + cx;
+                var s = document.getElementsByTagName('script')[0];
+                s.parentNode.insertBefore(gcse, s);
+              })();
+            </script>
+            <gcse:search></gcse:search>
+          </div>
         </div>
 <!--#include virtual="/footer.inc" -->
       </div>
diff --git a/www/libstatgrab/index.xhtml b/www/libstatgrab/index.xhtml
index 01d1882..f2c2cdf 100644
--- a/www/libstatgrab/index.xhtml
+++ b/www/libstatgrab/index.xhtml
@@ -41,7 +41,6 @@
               </li>
             </ul>
           </div>
-<!--#include virtual="/bannerad.inc" -->
           <h2>
             <a id="what">What is libstatgrab?</a>
           </h2>
diff --git a/www/menu-static.inc b/www/menu-static.inc
index 6b8a939..2c46ee6 100644
--- a/www/menu-static.inc
+++ b/www/menu-static.inc
@@ -54,48 +54,7 @@
         <ul>
           <li><a href="mailto:support@i-scream.org">support@i-scream.org</a></li>
         </ul>
-        <script type="text/javascript">
-          <!--
-            google_ad_client = "pub-4199687771151670";
-            google_ad_width = 150;
-            google_ad_height = 95;
-            google_ad_format = "120x90_0ads_al_s";
-            google_ad_channel ="";
-            google_color_border = "000066";
-            google_color_bg = "EEEEFF";
-            google_color_link = "0000FF";
-            google_color_url = "008000";
-            google_color_text = "000000";
-          //-->
-        </script>
-        <script type="text/javascript"
-          src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-        </script>
         <p class="logo">
-          <script type="text/javascript">
-            <!--
-              google_ad_client = "pub-4199687771151670";
-              google_ad_width = 110;
-              google_ad_height = 32;
-              google_ad_format = "110x32_as_rimg";
-              google_cpa_choice = "CAAQga7zzwEaCAqINcPi102eKLPGvnU";
-            //-->
-          </script>
-          <script type="text/javascript"
-            src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-          </script>
-          <script type="text/javascript">
-            <!--
-              google_ad_client = "pub-4199687771151670";
-              google_ad_width = 110;
-              google_ad_height = 32;
-              google_ad_format = "110x32_as_rimg";
-              google_cpa_choice = "CAAQ0eObzgEaCAkNd_PMAefzKJPw43Q";
-            //-->
-          </script>
-          <script type="text/javascript"
-            src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-          </script>
           <a href="http://www.freebsd.org/">
             <img src="http://www.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
           </a>
diff --git a/www/menu.inc b/www/menu.inc
index 4692d84..bb4f5e6 100644
--- a/www/menu.inc
+++ b/www/menu.inc
@@ -54,23 +54,6 @@
         <ul>
           <li><a href="mailto:support@i-scream.org">support@i-scream.org</a></li>
         </ul>
-        <script type="text/javascript">
-          <!--
-            google_ad_client = "pub-4199687771151670";
-            google_ad_width = 150;
-            google_ad_height = 95;
-            google_ad_format = "120x90_0ads_al_s";
-            google_ad_channel ="";
-            google_color_border = "000066";
-            google_color_bg = "EEEEFF";
-            google_color_link = "0000FF";
-            google_color_url = "008000";
-            google_color_text = "000000";
-          //-->
-        </script>
-        <script type="text/javascript"
-          src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-        </script>
         <p class="logo">
           <a href="http://www.freebsd.org/">
             <img src="http://www.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
diff --git a/www/pystatgrab/index.xhtml b/www/pystatgrab/index.xhtml
index 00483a4..d4c49bd 100644
--- a/www/pystatgrab/index.xhtml
+++ b/www/pystatgrab/index.xhtml
@@ -29,7 +29,6 @@
               </li>
             </ul>
           </div>
-<!--#include virtual="/bannerad.inc" -->
           <h2>
             <a id="news">News</a>
           </h2>
diff --git a/www/styles/handheld.css b/www/styles/handheld.css
index 63aa67a..1926993 100644
--- a/www/styles/handheld.css
+++ b/www/styles/handheld.css
@@ -67,14 +67,6 @@ html,body {
 	font-size: x-small;
 }
 
-/* Contains adverts */
-#advert1 {
-	display: none;
-}
-#advert2 {
-	display: none;
-}
-
 /* Contains the body text of the page */
 #contents {
 	padding: 0px 15px 0px 15px;
diff --git a/www/styles/print.css b/www/styles/print.css
index 241759c..7f85f3c 100644
--- a/www/styles/print.css
+++ b/www/styles/print.css
@@ -26,14 +26,6 @@ body {
 	font-size: x-small;
 }
 
-/* Contains adverts */
-#advert1 {
-	display: none;
-}
-#advert2 {
-	display: none;
-}
-
 /* Contains the body text of the page */
 #contents h1 {
 	border-top: 3px solid #000066;
-- 
2.44.0