[vlfeat] 31/44: [bugfix] webpage: fix Google custom search

[Dima Kogan]

This is an automated email from the git hooks/post-receive script.

dkogan-guest pushed a commit to branch master
in repository vlfeat.

commit 5add41181c12d0010124846df4b40e705bb4def6
Author: Andrea Vedaldi <vedaldi at gmail.com>
Date:   Wed Jan 14 23:17:55 2015 +0000

    [bugfix] webpage: fix Google custom search
---
 docsrc/vlfeat-website-main-content.xml | 2 +-
 docsrc/vlfeat-website-template.xml     | 8 ++++++--
 docsrc/vlfeat.css                      | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docsrc/vlfeat-website-main-content.xml b/docsrc/vlfeat-website-main-content.xml
index a366949..4930d8f 100644
--- a/docsrc/vlfeat-website-main-content.xml
+++ b/docsrc/vlfeat-website-main-content.xml
@@ -51,7 +51,7 @@
 
 <!-- Generate an additional page to hold search results -->
 <page name="search" id="search" title="Search" hide="yes">
-  <gcse:searchresults-only></gcse:searchresults-only>
+  <gcse:searchresults-only/>
 </page>
 
 </group>
diff --git a/docsrc/vlfeat-website-template.xml b/docsrc/vlfeat-website-template.xml
index 3d5ffd2..57b378f 100644
--- a/docsrc/vlfeat-website-template.xml
+++ b/docsrc/vlfeat-website-template.xml
@@ -60,7 +60,7 @@
     (function() {
     var cx = '003215582122030917471:oq23albfeam';
     var gcse = document.createElement('script'); gcse.type = 'text/javascript'; gcse.async = true;
-    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+    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);
     })();
@@ -84,7 +84,11 @@
   <div id="header-section">
     <div id="header">
       <!-- Google CSE Search Box -->
-      <div class="gcse-searchbox-only" id="google" data-resultsUrl="http://www.vlfeat.org/search.html"></div>
+      <div class="searchbox">
+        <gcse:searchbox-only resultsUrl="http://www.vlfeat.org/search.html"
+                             autoCompleteMaxCompletions="5"
+                             autoCompleteMatchType="any"/>
+      </div>
       <h1><a class="plain" href="%pathto:home;"><span id="vlfeat">VLFeat</span><span id="dotorg">.org</span></a></h1>
     </div>
     <div id="sidebar"> <!-- Navigation Start -->
diff --git a/docsrc/vlfeat.css b/docsrc/vlfeat.css
index 88a6efc..ffbbe22 100644
--- a/docsrc/vlfeat.css
+++ b/docsrc/vlfeat.css
@@ -137,7 +137,7 @@ code a {
     margin-right: auto ;
     padding: 20px 30px ;
 }
-#header #cse-search-box {
+#header .search-box {
     float: right ;
     margin-right: 1em ;
     margin-top: auto ;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vlfeat.git