From 79ebf90f0a3c4da7cbb4a7a86bfecd75509c0192 Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Wed, 5 Jun 2019 11:20:07 -0500
Subject: [PATCH] Rework navbar a bit

Move some unused/non-functional menu items to live under a new
"Other" item: create (event), reports, and RSS.
---
 config/urls.py                                  |  2 ++
 .../source/_static/gracedb-nav-style.css        |  8 ++------
 .../source/_static/gracedb-nav-style.css        |  8 ++------
 gracedb/static/css/admin-nav.css                |  9 ++-------
 gracedb/static/css/style.css                    |  8 ++------
 gracedb/templates/navbar_frag.html              |  8 +++-----
 gracedb/templates/other.html                    | 17 +++++++++++++++++
 7 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 gracedb/templates/other.html

diff --git a/config/urls.py b/config/urls.py
index 93b63e0ba..f27165927 100644
--- a/config/urls.py
+++ b/config/urls.py
@@ -37,6 +37,8 @@ urlpatterns = [
     url(r'^feeds/(?P<url>.*)/$', EventFeed()),
     url(r'^feeds/$', feedview, name="feeds"),
 
+    url(r'^other/$', TemplateView.as_view(template_name='other.html'),
+        name='other'),
     url(r'^performance/$', events.views.performance, name="performance"),
     url(r'^reports/$', events.reports.histo, name="reports"),
     url(r'^reports/cbc_report/(?P<format>(json|flex))?$',
diff --git a/docs/admin_docs/source/_static/gracedb-nav-style.css b/docs/admin_docs/source/_static/gracedb-nav-style.css
index d084dcb4e..47bd46c6d 100644
--- a/docs/admin_docs/source/_static/gracedb-nav-style.css
+++ b/docs/admin_docs/source/_static/gracedb-nav-style.css
@@ -102,15 +102,13 @@ h1.docnav {
 }
 
 #home #nav-home a,
-#create #nav-create a,
 #public #nav-public a,
 #search #nav-search a,
 #pipelines #nav-pipelines a,
 #alerts #nav-alerts a,
 #password #nav-password a,
 #doc #nav-doc a,
-#reports #nav-reports a,
-#feeds #nav-feeds a,
+#other #nav-other a,
 #about #nav-about a,
 #archive #nav-archive a,
 #lab #nav-lab a,
@@ -122,15 +120,13 @@ h1.docnav {
     /* text-shadow:none; */
 }
 #home #nav-home a:hover,
-#create #nav-create a,
 #public #nav-public a,
 #search #nav-search a,
 #pipelines #nav-pipelines a,
 #alerts #nav-alerts a,
 #password #nav-password a,
 #doc #nav-doc a,
-#reports #nav-reports a,
-#feeds #nav-feeds a,
+#other #nav-other a,
 #about #nav-about a:hover,
 #archive #nav-archive a:hover,
 #lab #nav-lab a:hover,
diff --git a/docs/user_docs/source/_static/gracedb-nav-style.css b/docs/user_docs/source/_static/gracedb-nav-style.css
index d084dcb4e..47bd46c6d 100644
--- a/docs/user_docs/source/_static/gracedb-nav-style.css
+++ b/docs/user_docs/source/_static/gracedb-nav-style.css
@@ -102,15 +102,13 @@ h1.docnav {
 }
 
 #home #nav-home a,
-#create #nav-create a,
 #public #nav-public a,
 #search #nav-search a,
 #pipelines #nav-pipelines a,
 #alerts #nav-alerts a,
 #password #nav-password a,
 #doc #nav-doc a,
-#reports #nav-reports a,
-#feeds #nav-feeds a,
+#other #nav-other a,
 #about #nav-about a,
 #archive #nav-archive a,
 #lab #nav-lab a,
@@ -122,15 +120,13 @@ h1.docnav {
     /* text-shadow:none; */
 }
 #home #nav-home a:hover,
-#create #nav-create a,
 #public #nav-public a,
 #search #nav-search a,
 #pipelines #nav-pipelines a,
 #alerts #nav-alerts a,
 #password #nav-password a,
 #doc #nav-doc a,
-#reports #nav-reports a,
-#feeds #nav-feeds a,
+#other #nav-other a,
 #about #nav-about a:hover,
 #archive #nav-archive a:hover,
 #lab #nav-lab a:hover,
diff --git a/gracedb/static/css/admin-nav.css b/gracedb/static/css/admin-nav.css
index b229e9a30..4d5c37758 100644
--- a/gracedb/static/css/admin-nav.css
+++ b/gracedb/static/css/admin-nav.css
@@ -63,15 +63,12 @@
 }
 
 #home #nav-home a,
-#create #nav-create a,
 #public #nav-public a,
 #search #nav-search a,
 #pipelines #nav-pipelines a,
 #alerts #nav-alerts a,
 #password #nav-password a,
-#reports #nav-reports a,
-#feeds #nav-feeds a,
-#about #nav-about a,
+#other #nav-other a,
 #archive #nav-archive a,
 #lab #nav-lab a,
 #reviews #nav-reviews a,
@@ -81,14 +78,12 @@
     /* text-shadow:none; */
 }
 #home #nav-home a:hover,
-#create #nav-create a,
 #public #nav-public a,
 #search #nav-search a,
 #pipelines #nav-pipelines a,
 #alerts #nav-alerts a,
 #password #nav-password a,
-#reports #nav-reports a,
-#feeds #nav-feeds a,
+#other #nav-other a,
 #about #nav-about a:hover,
 #archive #nav-archive a:hover,
 #lab #nav-lab a:hover,
diff --git a/gracedb/static/css/style.css b/gracedb/static/css/style.css
index a4a996fc3..2b3321d32 100644
--- a/gracedb/static/css/style.css
+++ b/gracedb/static/css/style.css
@@ -329,15 +329,13 @@ span.coinc-0,
 }
 
 #home #nav-home a,
-#create #nav-create a,
 #public #nav-public a,
 #search #nav-search a,
 #pipelines #nav-pipelines a,
 #alerts #nav-alerts a,
 #password #nav-password a,
 #doc #nav-doc a,
-#reports #nav-reports a,
-#feeds #nav-feeds a,
+#other #nav-other a,
 #about #nav-about a,
 #archive #nav-archive a,
 #lab #nav-lab a,
@@ -349,15 +347,13 @@ span.coinc-0,
     /* text-shadow:none; */
 }
 #home #nav-home a:hover,
-#create #nav-create a,
 #public #nav-public a,
 #search #nav-search a,
 #pipelines #nav-pipelines a,
 #alerts #nav-alerts a,
 #password #nav-password a,
 #doc #nav-doc a,
-#reports #nav-reports a,
-#feeds #nav-feeds a,
+#other #nav-other a,
 #about #nav-about a:hover,
 #archive #nav-archive a:hover,
 #lab #nav-lab a:hover,
diff --git a/gracedb/templates/navbar_frag.html b/gracedb/templates/navbar_frag.html
index 9b5ac1125..d587447c2 100644
--- a/gracedb/templates/navbar_frag.html
+++ b/gracedb/templates/navbar_frag.html
@@ -3,11 +3,6 @@
     <li id="nav-home"><a href="{% url "home" %}">Home</a></li>
     <li id="nav-public"><a href="{% url "superevents:public-alerts-O3" %}">Public Alerts</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>
-        <li id="nav-feeds"><a href="{% url "feeds" %}">RSS</a></li> 
-    {% endif %}
     <li id="nav-latest"><a href="{% url "latest" %}">Latest</a></li>
     {% if user_is_internal %}
     <li id="nav-alerts"><a href="{% url "alerts:index" %}">Alerts</a></li>
@@ -23,6 +18,9 @@
             <li id="nav-admin-docs"><a href="{% url "home" %}admin_docs/">Admin docs</a></li>
         {% endif %}
     {% endif %}
+    {% if user_is_internal %}
+        <li id="nav-other"><a href="{% url "other" %}">Other</a></li>
+    {% endif %}
     {% if user.is_authenticated %}
         <li id="nav-logout"><a href="{% url "logout" %}">Logout</a></li>
         <li id="nav-user">Authenticated as:
diff --git a/gracedb/templates/other.html b/gracedb/templates/other.html
new file mode 100644
index 000000000..ac3db00a3
--- /dev/null
+++ b/gracedb/templates/other.html
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+
+{% block title %}Other pages{% endblock %}
+{% block heading %}Other pages{% endblock %}
+{% block pageid %}other{% endblock %}
+
+{% block content %}
+
+<div>
+<ul>
+  <li><a href="{% url "create" %}">Create an event</a></li>
+  <li><a href="{% url "reports" %}">Reports page</a></li>
+  <li><a href="{% url "feeds" %}">RSS feeds</a></li>
+</ul>
+</div>
+
+{% endblock %}
-- 
GitLab