Refactor collection headers: convert to responsive navbar layout with dropdown actions

atlas/forms.py

@@ -142,6 +142,25 @@ class CaseCollectionForm(ModelForm):
         ModelForm.__init__(self, *args, **kwargs)
         super(CaseCollectionForm, self).__init__(*args, **kwargs)
 
+        # Render collection_type as radio buttons and ensure it appears near the top
+        if "collection_type" in self.fields:
+            # Replace the model field with an explicit ChoiceField that uses RadioSelect
+            original = self.fields["collection_type"]
+            choices = getattr(original, "choices", ())
+            initial = original.initial if hasattr(original, "initial") else None
+            required = original.required
+            label = original.label
+            widget = RadioSelect(attrs={"class": "btn-check"})
+            # assign custom template for rendering as button group
+            #widget.template_name = "widgets/radioselect_buttons.html"
+            self.fields["collection_type"] = forms.ChoiceField(
+                choices=choices,
+                widget=widget,
+                initial=initial,
+                required=required,
+                label=label,
+            )
+
         # Identify show_ fields
         show_fields = [f for f in self.fields if f.startswith("show_")]
         show_pre_fields = [f for f in show_fields if f.endswith("_pre")]
@@ -187,6 +206,7 @@ class CaseCollectionForm(ModelForm):
             Fieldset(
                 "Collection Details",
                 "name",
+                Field("collection_type", css_class="mb-2"),
                 Fieldset(
                     "Dates",
                     "restrict_to_dates",
@@ -214,7 +234,6 @@ class CaseCollectionForm(ModelForm):
                 "exam_mode",
                 "self_review",
                 "feedback_once_collection_complete",
-                "collection_type",
                 "viewer_mode",
                 "question_time_limit",
                 "prerequisites",

atlas/migrations/0084_resource_open_access.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-11-15 22:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('atlas', '0083_resource_created_date_resource_modified_date'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='resource',
+            name='open_access',
+            field=models.BooleanField(default=True, help_text='If true the resource is available to all users, otherwise only in the context of cases.'),
+        ),
+    ]

atlas/templates/atlas/casecollection_form.html

@@ -3,6 +3,40 @@
 {% load crispy_forms_tags %}
 
 {% block css %}
+<style>
+    /* Turn the existing form-check radio markup into horizontal button-like radios */
+    #div_id_collection_type .form-check { display: inline-block; margin-right: .5rem; }
+    #div_id_collection_type .form-check-input {
+        /* visually hide the native radio but keep it focusable */
+        position: absolute;
+        width: 1px;
+        height: 1px;
+        padding: 0;
+        margin: -1px;
+        overflow: hidden;
+        clip: rect(0,0,0,0);
+        white-space: nowrap;
+        border: 0;
+    }
+    #div_id_collection_type .form-check-label {
+        display: inline-block;
+        padding: .375rem .75rem;
+        border: 1px solid #0d6efd;
+        border-radius: .375rem;
+        color: #0d6efd;
+        cursor: pointer;
+        user-select: none;
+    }
+    #div_id_collection_type .form-check-input:focus + .form-check-label {
+        box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
+    }
+    #div_id_collection_type .form-check-input:checked + .form-check-label {
+        background-color: #0d6efd;
+        color: #fff;
+    }
+    /* small spacing tweak when legend present */
+    #div_id_collection_type fieldset { border: 0; padding: 0; margin: 0 0 1rem 0; }
+</style>
 {% endblock %}
 {% block js %}
     <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->

atlas/templates/atlas/collection_headers.html

@@ -1,20 +1,43 @@
-{% if request.user.is_authenticated %}
-    Collection: {{collection.name}}-> <a href="{% url 'atlas:collection_detail' pk=collection.pk %}">Overview</a> /
-    <a href="{% url 'atlas:collection_case_update' collection.pk %}">Cases</a> /
-    <a href="{% url 'atlas:collection_history' collection.pk %}">History</a> /
-    <a href="{% url 'atlas:collection_mark_overview' collection.pk %}">Mark</a> /
-    <a href="{% url 'atlas:collection_scores_cid' collection.pk %}">Scores</a> /
-    <a href="{% url 'atlas:exam_cids' collection.pk %}">Candidates</a> /
-    <a href="{% url 'atlas:atlas_create_exam' pk=collection.pk %}">Add New Case</a> /
-    <div class="floating-header">
-        <a href="{% url 'atlas:exam_update' collection.id %}" title="Edit the Collection">Edit</a>
-        \ <a href="{% url 'atlas:exam_deleted' collection.id %}" title="Delete the Collection">Delete</a>
-        \ <a href="{% url 'atlas:exam_clone' collection.id %}" title="Clone the Collection">Clone</a>
-        \ <a href="{% url 'atlas:collection_authors' collection.pk %}" title="Edit Authors">Authors</a>
+{% if request.user.is_authenticated and collection %}
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark mt-2 rounded">
+    <div class="container-fluid px-3">
+        <span class="navbar-text me-3 text-white">
+            <strong>Collection:</strong> {{ collection.name }}
+        </span>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#collectionNav" aria-controls="collectionNav" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
 
+        <div class="collapse navbar-collapse" id="collectionNav">
+            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                <li class="nav-item"><a class="nav-link" href="{% url 'atlas:collection_detail' pk=collection.pk %}">Overview</a></li>
+                <li class="nav-item"><a class="nav-link" href="{% url 'atlas:collection_case_update' collection.pk %}">Cases</a></li>
+                <li class="nav-item"><a class="nav-link" href="{% url 'atlas:collection_history' collection.pk %}">History</a></li>
+                <li class="nav-item"><a class="nav-link" href="{% url 'atlas:collection_mark_overview' collection.pk %}">Mark</a></li>
+                <li class="nav-item"><a class="nav-link" href="{% url 'atlas:collection_scores_cid' collection.pk %}">Scores</a></li>
+                <li class="nav-item"><a class="nav-link" href="{% url 'atlas:exam_cids' collection.pk %}">Candidates</a></li>
+                <li class="nav-item"><a class="nav-link" href="{% url 'atlas:atlas_create_exam' pk=collection.pk %}">Add New Case</a></li>
+            </ul>
+
+            <ul class="navbar-nav ms-auto">
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="collectionActions" role="button" data-bs-toggle="dropdown" aria-expanded="false">Actions</a>
+                                <ul class="dropdown-menu dropdown-menu-end dropdown-menu-dark" aria-labelledby="collectionActions">
+                        <li><a class="dropdown-item" href="{% url 'atlas:collection_case_update' collection.pk %}">Edit Cases</a></li>
+                        <li><a class="dropdown-item" href="{% url 'atlas:exam_update' collection.id %}">Edit</a></li>
+                        <li><a class="dropdown-item" href="{% url 'atlas:exam_clone' collection.id %}">Clone</a></li>
+                        <li><a class="dropdown-item" href="{% url 'atlas:collection_authors' collection.pk %}">Authors</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                                    <li><a class="dropdown-item text-danger" href="{% url 'atlas:exam_deleted' collection.id %}">Delete</a></li>
                         {% if request.user.is_superuser %}
-            \ <a href="{% url 'admin:atlas_casecollection_change' collection.id %}" title="Edit the Collection using the admin interface">Admin Edit</a>
+                            <li><hr class="dropdown-divider"></li>
+                            <li><a class="dropdown-item" href="{% url 'admin:atlas_casecollection_change' collection.id %}">Admin Edit</a></li>
                         {% endif %}
+                    </ul>
+                </li>
+            </ul>
         </div>
+    </div>
+</nav>
 {% endif %}
 

atlas/templates/atlas/exams.html

@@ -7,9 +7,6 @@
     {% if collection %}
         {% include "atlas/collection_headers.html" %}
     {% endif %}
-    {% if exam %}
-        <a href="{% url 'atlas:exam_review_start' pk=exam.pk %}">Review</a> /
-    {% endif %}
 {% comment %}     Collection: {{collection.name}}-> <a href="{% url 'atlas:collection_detail' pk=exam.pk %}">Overview</a> /
     <a href="{% url 'atlas:collection_mark_overview' exam.pk %}">Mark</a> /
     <a href="{% url 'atlas:collection_scores_cid' exam.pk %}">Scores</a> /

atlas/templates/widgets/radioselect_buttons.html

@@ -0,0 +1,24 @@
+{% load i18n %}
+<div class="btn-group" role="group" aria-label="{{ widget.name }}">
+  {% for val, label in widget.choices %}
+    {% with forloop.counter0 as idx %}
+      {% with id=widget.name|add:"_"|add:idx %}
+      <input
+        type="radio"
+        class="btn-check"
+        name="{{ widget.name }}"
+        id="{{ widget.name }}_{{ idx }}"
+        value="{{ val }}"
+        {% if val|stringformat:"s" == widget.value|stringformat:"s" %}checked{% endif %}
+        autocomplete="off"
+      >
+      <label
+        class="btn btn-outline-primary {% if val|stringformat:"s" == widget.value|stringformat:"s" %}active{% endif %}"
+        for="{{ widget.name }}_{{ idx }}"
+      >
+        {{ label }}
+      </label>
+      {% endwith %}
+    {% endwith %}
+  {% endfor %}
+</div>

atlas/views.py

@@ -1385,6 +1385,10 @@ class CaseCollectionCreate(RevisionMixin, LoginRequiredMixin, CreateView):
         else:
             return super().form_invalid(form)
 
+    def get_success_url(self):
+        """Redirect to the collection detail page after successful creation."""
+        return reverse("atlas:collection_detail", kwargs={"pk": self.object.pk})
+
 
 class SeriesCreate(RevisionMixin, LoginRequiredMixin, CreateView):
     model = Series