From 16cfdb420cba6652129c6541eb46f7b78ac4c7ee Mon Sep 17 00:00:00 2001
From: Kevin Abel <kabel2@unl.edu>
Date: Tue, 16 Aug 2011 16:25:37 +0000
Subject: [PATCH] Adjusted the markup to use the new grid layout, the correct
google loader, and not to use the depricated gSearchForm.
---
www/index.php | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/www/index.php b/www/index.php
index 3a27597..536d909 100644
--- a/www/index.php
+++ b/www/index.php
@@ -14,8 +14,9 @@ if (isset($_GET['format'])
$page = UNL_Templates::factory($template);
$page->doctitle = '<title>UNL | Search</title>';
$local_results = '';
+$page->addScript('http://www.google.com/jsapi' . (empty(UNL_Search::$jsapiKey) ? '' : '?key=' . UNL_Search::$jsapiKey));
$page->head .= '
-<script src="http://www.google.com/jsapi?key=ABQIAAAAfxH7RKwDLHYhDD9dSUZe-RTELkNjcWhKXky6vQZrvQAPA5Uw6xR-eQp2X1fKnLG-UqeKQ_7mwv5CcQ" type="text/javascript"></script>
+<link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="http://directory.unl.edu/css/peoplefinder_default.css" />
<link rel="stylesheet" type="text/css" href="searchCSS.css" />
';
@@ -68,7 +69,7 @@ if (isset($_GET['u']) //u is referring site
');
$local_results = '
<h3 class="sec_header">Local Results</h3>
- <div id="local_results"></div>';
+ <div id="local_results" class="google-results"></div>';
} else {
// Default search for no referring site.
$page->titlegraphic = '<h1>UNL Search</h1>';
@@ -85,13 +86,19 @@ if (isset($_GET['u']) //u is referring site
$page->maincontentarea = '
<div id="searchform">
<form action="./" method="get">
- <label for="q">Search</label>
- <input type="text" name="q" id="q" />';
+ <fieldset>
+ <div class="grid10 first">
+ <label for="q">Search</label>
+ <input class="search-query" type="text" name="q" id="search_q" title="search" />';
if (!empty($local_results)) {
$page->maincontentarea .= '<input type="hidden" name="u" value="'.htmlentities($_GET['u'], ENT_QUOTES).'" />';
}
$page->maincontentarea .= '
- <input type="submit" value="Search" />
+ </div>
+ <div class="grid2">
+ <input class="search-button" title="search" type="submit" value="Search" />
+ </div>
+ </fieldset>
</form>
<noscript>
<form action="http://www.googlesyndicatedsearch.com/u/UNL1" method="get">
@@ -100,12 +107,12 @@ $page->maincontentarea .= '
</form>
</noscript>
</div>
-<div class="three_col left">
+<div class="grid8 first">
'.$local_results.'
<h3 class="sec_header">UNL Web</h3>
- <div id="unl_results"></div>
+ <div id="unl_results" class="google-results"></div>
</div>
-<div class="col right">
+<div class="grid4">
<h3 class="sec_header">UNL Directory</h3>
<div id="ppl_results"></div>
<a href="http://www1.unl.edu/wdn/wiki/About_Peoplefinder">About the UNL Directory</a>
--
GitLab