From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-360844-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Qf0UV-00008g-KN
	for garchives@archives.gentoo.org; Fri, 08 Jul 2011 02:08:32 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 73F8321C09B;
	Fri,  8 Jul 2011 02:08:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 3F89421C09B
	for <gentoo-commits@lists.gentoo.org>; Fri,  8 Jul 2011 02:08:19 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A806F2AC0B9
	for <gentoo-commits@lists.gentoo.org>; Fri,  8 Jul 2011 02:08:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by flycatcher.gentoo.org (Postfix) with ESMTP id C718B20051
	for <gentoo-commits@lists.gentoo.org>; Fri,  8 Jul 2011 02:08:16 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <7bbe6da213ec338d73b9c919b9be5749ef715277.robbat2@gentoo>
Subject: [gentoo-commits] packages:master commit in: web/templates/
X-VCS-Repository: packages
X-VCS-Files: web/templates/layout.html
X-VCS-Directories: web/templates/
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: 7bbe6da213ec338d73b9c919b9be5749ef715277
Date: Fri,  8 Jul 2011 02:08:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 08556f727ae000611d6eef47d773eaf5

commit:     7bbe6da213ec338d73b9c919b9be5749ef715277
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 02:08:10 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 02:08:10 2011 +0000
URL:        http://sources.gentoo.org/gitweb/?p=3Dpackages.git;a=3Dcommit=
;h=3D7bbe6da2

Change Google CSE to redirect to a google page like it used to.

---
 web/templates/layout.html |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/web/templates/layout.html b/web/templates/layout.html
index ae1b646..4355f5d 100644
--- a/web/templates/layout.html
+++ b/web/templates/layout.html
@@ -72,12 +72,22 @@ def alpha_url(baseurl):
             <a href=3D"/"><img src=3D"/media/packages_gentoo_logo.jpg" a=
lt=3D"Gentoo Logo" /></a>
         </div>
         <div id=3D"search">
-            <div id=3D"cse" style=3D"width: 100%;">Loading</div>
             <script type=3D"text/javascript">=20
+                var customSearchControl =3D null;
+                var cse_api_key =3D '018159084367138638961:rusorewqzfu';
+                function executeGoogleSearch() {
+                    var textNode =3D document.getElementById('search_inp=
ut');
+                    if(textNode.value !=3D '') {
+                        customSearchControl.execute(textNode.value)
+                    }
+                }
                 google.load('search', '1', {language : 'en', style : goo=
gle.loader.themes.MINIMALIST});
                 google.setOnLoadCallback(function() {
-                    var customSearchControl =3D new google.search.Custom=
SearchControl('018159084367138638961:rusorewqzfu');
+                    customSearchControl =3D new google.search.CustomSear=
chControl(cse_api_key);
                     customSearchControl.setResultSetSize(google.search.S=
earch.FILTERED_CSE_RESULTSET);
+                    var options =3D new google.search.DrawOptions();
+                    //options.enableSearchResultsOnly();    =20
+                    options.enableSearchboxOnly("http://google.com/cse?c=
x=3D"+cse_api_key, null, true);   =20
                     customSearchControl.draw('cse');
                 }, true);
             </script>