From 92720e9120eee45b6872b535bb0c85c342e7772c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 26 Jul 2016 20:37:21 +0200
Subject: [PATCH] Remove search page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Google CSE was disabled quite some time ago...

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 pmaweb/templates/base.html   |  1 -
 pmaweb/templates/search.html | 29 -----------------------------
 pmaweb/urls.py               | 15 +++++++--------
 pmaweb/views.py              |  2 +-
 4 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 pmaweb/templates/search.html

diff --git a/pmaweb/templates/base.html b/pmaweb/templates/base.html
index 0a6618dd..06c47dc5 100644
--- a/pmaweb/templates/base.html
+++ b/pmaweb/templates/base.html
@@ -72,7 +72,6 @@ <h1><a href="{% url 'home' %}" rel="home"><span id="logo">phpMyAdmin</span></a>
     <li>Copyright &copy; 2003 - {{ current_year }} <span class="vcard"><a class="url org fn" href="{% url 'team' %}">phpMyAdmin contributors</a><a href="mailto:developers@phpmyadmin.net" class="email"></a></span></li>
     <li><a href="{% url 'license' %}" rel="license">License</a></li>
     <li><a href="{% url 'donate' %}" rel="payment" title="Support phpMyAdmin by donating money!">Donate</a></li>
-    <li><a href="{% url 'search' %}" title="Search for phpMyAdmin related questions">Search</a></li>
     <li><a href="{% url 'about-website' %}" title="Information about website">About</a></li>
     <li class="logo"><a href="https://google.com/+phpmyadmin"><i class="fa fa-google-plus-square"></i></a></li>
     <li class="logo"><a href="https://twitter.com/phpmya"><i class="fa fa-twitter-square"></i></a></li>
diff --git a/pmaweb/templates/search.html b/pmaweb/templates/search.html
deleted file mode 100644
index f904fcd6..00000000
--- a/pmaweb/templates/search.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends 'base.html' %}
-{% load staticfiles %}
-
-{% block content %}
-
-<h2>Search</h2>
-
-<p>
-This page uses Google Custom Search to give you best results related to
-phpMyAdmin. You can also use it <a
-href="http://www.google.com/coop/cse?cx=008688692096734274889:2un4bs4yxjm">directly
-on Google</a>.
-</p>
-
-<script>
-  (function() {
-    var cx = 'partner-pub-9981925389745105:6118076488';
-    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>
-
-{% endblock %}
diff --git a/pmaweb/urls.py b/pmaweb/urls.py
index d69f0779..8c6334a4 100644
--- a/pmaweb/urls.py
+++ b/pmaweb/urls.py
@@ -221,14 +221,6 @@
         ),
         name='donate'
     ),
-    url(
-        r'^search/$',
-        PMAView.as_view(
-            template_name='search.html',
-            title='Search',
-        ),
-        name='search'
-    ),
     url(
         r'^about-website/$',
         PMAView.as_view(
@@ -471,6 +463,13 @@
             permanent=True,
         )
     ),
+    url(
+        r'^search/$',
+        RedirectView.as_view(
+            pattern_name='home',
+            permanent=True,
+        )
+    ),
     url(
         r'^home_page/sitemap\.xml$',
         RedirectView.as_view(
diff --git a/pmaweb/views.py b/pmaweb/views.py
index aebb0b30..c8b8f7ea 100644
--- a/pmaweb/views.py
+++ b/pmaweb/views.py
@@ -37,6 +37,7 @@
     'stats': 'team',
     'sitemap': 'home',
     'gophp5': 'home',
+    'search': 'home',
 
     # Alive pages
     '15-years': '15-years',
@@ -52,7 +53,6 @@
     'index': 'home',
     'license': 'license',
     'news': 'news',
-    'search': 'search',
     'sponsors': 'sponsors',
     'support': 'support',
     'team': 'team',