more bootstrap nav convresion

rapids/templates/rapids/base.html

@@ -18,17 +18,39 @@
     {% endif %}
 {% endblock %}
 {% block navigation %}
-    Rapids:
-    {% if request.user.is_authenticated %}
-        <a href="{% url 'rapids:index' %}">Packets</a> /
-        <a href="{% url 'rapids:exam_list' %}">Exams</a> /
-        <a href="{% url 'rapids:exam_create' %}" title="Create a new exam">Create Exam</a> /
-        <a href="{% url 'rapids:rapid_view' %}">Questions</a> /
-        <a href="{% url 'rapids:rapid_create' %}" title="Create a new question">Create Question</a>
-    {% endif %}
-    {% if request.user.is_superuser %}
-        / <a href="{% url 'rapids:user_answer_table_view' %}" title="User answers">Answers</a>
-    {% endif %}
+<nav class="navbar navbar-expand-lg navbar-dark submenu">
+    <div class="container-fluid">
+        <a class="navbar-brand" href="{% url 'rapids:index' %}">Rapids</a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse">
+            <ul class="navbar-nav">
+                {% if request.user.is_authenticated %}
+                    <li class="nav-item">
+                        <a class="nav-link" href="{% url 'rapids:exam_list' %}"><i class="bi bi-mortarboard"></i> Exams</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="{% url 'rapids:question_view' %}"><i class="bi bi-question-circle"></i> Questions</a>
+                    </li>
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><i class="bi bi-file-earmark-plus"></i> Create</a>
+                        <ul class="dropdown-menu">
+                          <li><a class="dropdown-item" href="{% url 'rapids:exam_create' %}" title="Create a new exam"><i class="bi bi-mortarboard"></i> Exam</a></li>
+                          <li><a class="dropdown-item" href="{% url 'rapids:question_create' %}" title="Create a new question"><i class="bi bi-question-circle"></i> Question</a></li>
+                        </ul>
+                      </li>
+                        
+                    {% if request.user.is_superuser %}
+                        <li class="nav-item">
+                            <a class="nav-link" href="{% url 'rapids:user_answer_table_view' %}" title="User answers">Answers</a>
+                        </li>
+                    {% endif %}
+                {% endif %}
+            </ul>
+        </div>
+    </div>
+</nav>
     {% comment %} </br>
 Questions by:
 <span id="authors-link"><a href="{% url 'rapids:author_list' %}">author</a></span> {% endcomment %}

rapids/templates/rapids/exams.html

@@ -11,5 +11,5 @@
         <a href="{% url 'rapids:exam_cids' exam_id=exam.pk %}">Candidates</a> /
         <a href="{% url 'rapids:exam_stats' exam_id=exam.pk %}">Stats</a> /
     {% endif %}
-    <a href="{% url 'rapids:rapid_create_exam' pk=exam.pk %}">Add New Question</a>
+    <a href="{% url 'rapids:question_create_exam' pk=exam.pk %}">Add New Question</a>
 {% endblock %}

rapids/templates/rapids/rapid_form.html

@@ -319,7 +319,6 @@
 {% endif %}
     
 <h2>Submit Rapid</h2>
-{% comment %} <a href="{% url 'rapids:rapid_create_defaults' %}">Edit defaults</a> {% endcomment %}
 <p>
 <h3>Instructions</h3>
 Abnormality, Region and Laterality are used to categorise within the system (they are not used for marking). String