From 4262614d2769fc5a980cfb5f1b6c586986ff26de Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Fri, 25 May 2018 11:05:10 -0500
Subject: [PATCH] making new search page the main one and deprecating the old
events-only search page
---
gracedb/templates/admin/base_site.html | 2 +-
gracedb/templates/gracedb/event_list.html | 2 ++
gracedb/templates/gracedb/query.html | 2 ++
gracedb/templates/navbar_frag.html | 2 +-
gracedb/templates/search/query_help_frag.html | 2 ++
5 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gracedb/templates/admin/base_site.html b/gracedb/templates/admin/base_site.html
index 68d074258..3858cd581 100644
--- a/gracedb/templates/admin/base_site.html
+++ b/gracedb/templates/admin/base_site.html
@@ -16,7 +16,7 @@
{% block nav-global %}
<ul id="nav">
<li id="nav-home"><a href="{% url "home" %}">Home</a></li>
- <li id="nav-search"><a href="{% url "search" %}">Search</a></li>
+ <li id="nav-search"><a href="{% url "mainsearch" %}">Search</a></li>
<li id="nav-create"><a href="{% url "create" %}">Create</a></li>
<li id="nav-reports"><a href="{% url "reports" %}">Reports</a></li>
<li id="nav-feeds"><a href="{% url "feeds" %}">RSS</a></li>
diff --git a/gracedb/templates/gracedb/event_list.html b/gracedb/templates/gracedb/event_list.html
index 9f7fcf1de..20d52a468 100644
--- a/gracedb/templates/gracedb/event_list.html
+++ b/gracedb/templates/gracedb/event_list.html
@@ -108,6 +108,8 @@
{% endblock %}
{% block content %}
+
+<p style="color:red; font-weight: bold;">24 May 2018: This search page is deprecated and will be removed at some point in the future.</p>
<p>{{ message }}</p>
{% if form %}
diff --git a/gracedb/templates/gracedb/query.html b/gracedb/templates/gracedb/query.html
index f63a1482e..6eeebc559 100644
--- a/gracedb/templates/gracedb/query.html
+++ b/gracedb/templates/gracedb/query.html
@@ -24,6 +24,8 @@ onload="document.search_form.query.focus();"
{% block content %}
+<p style="color: red; font-weight: bold;">24 May 2018: This search page is deprecated and will be removed at some point in the future.</p>
+
<form method="POST" name="search_form">
<table>
{{ form.as_table }}
diff --git a/gracedb/templates/navbar_frag.html b/gracedb/templates/navbar_frag.html
index e9edf5480..3b3715865 100644
--- a/gracedb/templates/navbar_frag.html
+++ b/gracedb/templates/navbar_frag.html
@@ -1,6 +1,6 @@
<ul id="nav">
<li id="nav-home"><a href="{% url "home" %}">Home</a></li>
- <li id="nav-search"><a href="{% url "search" %}">Search</a></li>
+ <li id="nav-search"><a href="{% url "mainsearch" %}">Search</a></li>
{% if user_is_internal %}
<li id="nav-create"><a href="{% url "create" %}">Create</a></li>
<li id="nav-reports"><a href="{% url "reports" %}">Reports</a></li>
diff --git a/gracedb/templates/search/query_help_frag.html b/gracedb/templates/search/query_help_frag.html
index 004bc44a1..c12d94446 100644
--- a/gracedb/templates/search/query_help_frag.html
+++ b/gracedb/templates/search/query_help_frag.html
@@ -141,4 +141,6 @@
<h4>By submitter</h4>
Same as for events.
+ <h4>By label</h4>
+ Same as for events.
</div>
--
GitLab