From f070e2078348491d6b7a7692f2effa56af630043 Mon Sep 17 00:00:00 2001
From: Helen Sherwood-Taylor <helen@rrdlabs.co.uk>
Date: Wed, 14 Oct 2020 13:04:27 +0000
Subject: [PATCH] Rearrange main nav bar

---
 weblab/static/sass/style.scss         |  5 +++--
 weblab/templates/includes/navbar.html | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/weblab/static/sass/style.scss b/weblab/static/sass/style.scss
index 4492dde67..7bd59a257 100644
--- a/weblab/static/sass/style.scss
+++ b/weblab/static/sass/style.scss
@@ -135,7 +135,7 @@ button,
 }
 
 
-#usernavbar {
+.navbar-submenu {
   min-width: 100px;
 
   ul {
@@ -146,9 +146,10 @@ button,
     padding: 0; /* Aligns drop-down box underneath the menu item */
     background-color: #ffffff;
 
-    li, li a {
+    li, & a, & a:hover, & a:active {
       text-align: left;
       padding: 0;
+      white-space: nowrap;
     }
   }
 
diff --git a/weblab/templates/includes/navbar.html b/weblab/templates/includes/navbar.html
index cc06b3cae..55db0e105 100644
--- a/weblab/templates/includes/navbar.html
+++ b/weblab/templates/includes/navbar.html
@@ -4,18 +4,23 @@
     <li><a href="{% url 'home' %}">Home</a></li>
     {% if user.is_authenticated %}
       <li><a href="{% url 'experiments:list' 'mine' %}">Experiments</a></li>
-      <li><a href="{% url 'entities:list' 'model' %}">My models</a></li>
-      <li><a href="{% url 'entities:list' 'protocol' %}">My protocols</a></li>
-      <li><a href="{% url 'datasets:list' 'mine' %}">My datasets</a></li>
+      <li class="navbar-submenu">
+        <a href="{% url 'entities:list' 'model' %}">My Files</a>
+        <ul>
+          <li><a href="{% url 'entities:list' 'model' %}">Models</a></li>
+          <li><a href="{% url 'datasets:list' %}">Datasets</a></li>
+          <li><a href="{% url 'entities:list' 'protocol' %}">Protocols</a></li>
+          <li><a href="{% url 'fitting:list' 'spec' %}">Fitting specifications</a></li>
+        </ul>
+      </li>
     {% else %}
       <li><a href="{% url 'experiments:list' %}">Experiments</a></li>
       <li><a href="{% url 'about' %}">About</a></li>
     {% endif %}
     {% if user.is_authenticated %}
-        <li id="usernavbar">
+        <li class="navbar-submenu">
           <a>{{ user.full_name }}</a>
           <ul>
-            <li><a href="{% url 'entities:list' 'model' %}">My Files</a></li>
             <li><a href="{% url 'experiments:tasks' %}">Tasks</a></li>
             <li><a href="{% url 'accounts:myaccount' %}">Account</a></li>