From eec04e3197ddd5222446a9ccbba97ca7ee122d21 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 3 Nov 2025 12:27:20 +0000
Subject: [PATCH] Refactor user scores and index templates for improved layout
 and help information presentation

---
 templates/index.html       |   8 +-
 templates/user_scores.html | 177 +++++++++++++++++++++++--------------
 2 files changed, 115 insertions(+), 70 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 789be244..18ed08e7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -35,7 +35,7 @@
                                     <p class="mb-1"><strong>Grade:</strong> {{ request.user.userprofile.grade }}</p>
                                     <p class="mb-0"><strong>Supervisor:</strong> {{ request.user.userprofile.supervisor }}</p>
                                     <div role="alert" class="alert alert-warning mt-3">
-                                    If any of this information is incorrect, please update it via your <a href="{% url 'profile' %}">profile page</a>
+                                        If any of this information is incorrect, please update it via your <a href="{% url 'profile' %}">profile page</a>
                                     </div>
                                 </div>
                             </div>
@@ -60,9 +60,9 @@
                         <div class="alert alert-info" role="alert">
                             <h5 class="alert-heading mb-1">Not a Peninsula trainee?</h5>
                             <p class="mb-0">If you are an external user, please <a href="{% url 'cid_selector' %}">log in via CID</a>.</p>
-    {% help "Help" %}
-    You should have received your candidate ID and login details by email or directly from your course organiser. If you have not, please contact them for assistance.
-    {% endhelp %}
+                            {% help "Help" %}
+                                You should have received your candidate ID and login details by email or directly from your course organiser. If you have not, please contact them for assistance.
+                            {% endhelp %}
                         </div>
                     {% endif %}
 
diff --git a/templates/user_scores.html b/templates/user_scores.html
index 58b4e570..858ae208 100644
--- a/templates/user_scores.html
+++ b/templates/user_scores.html
@@ -1,78 +1,123 @@
 {% extends 'base.html' %}
+{% load help_tags %}
 
 {% block content %}
-    <div class="">
-        <h2>User: {{ cid_user.username }}</h2>
-        <div class="alert alert-dark" role="alert">
-            <details>
-                <summary>Help</summary>
-                <p>This page shows the exam(s) to which you have access.</p>
-                <p>When an exam is available to take it will have a "Start" button next to it.</p>
-                <p>Once you have submitted answers you will be able to view them from the Exam results section. (Please note: although your answers will be visible as soon as they are submitted, correct answers will only be available when the exam results have been published.)</p>
-                <p>If you have not submitted any answer for an exam it will not appear in the Exam Results section below. In this case you can still review the pubilshed results by following the "Results Published" link in the assigend exams section.</p>
-            </details>
+    <div class="container py-4">
+        <div class="row mb-3">
+            <div class="col-md-8">
+                <h2 class="mb-1">User: {{ cid_user.username }}</h2>
+                {% help "Help" %}
+                    <div class="card mt-2">
+                        <div class="card-body small">
+                            <p class="mb-1">This page shows the exam(s) to which you have access.</p>
+                            <p class="mb-1">When an exam is available to take it will have a "Start" button next to it.</p>
+                            <p class="mb-1">Once you have submitted answers you will be able to view them from the Exam results section. (Please note: although your answers will be visible as soon as they are submitted, correct answers will only be available when the exam results have been published.)</p>
+                            <p class="mb-0">If you have not submitted any answer for an exam it will not appear in the Exam Results section below. In this case you can still review the published results by following the "Results Published" link in the assigned exams section.</p>
+                        </div>
+                    </div>
+                {% endhelp %}
+            </div>
         </div>
-        <h3>Assigned Exams</h3>
-        <div id="exam-assigned">
-            The following exams will be available to take when active.
-            {% for exam_type, exams in available_exams %}
-                {% if exams %}
-                    <h4>{{exam_type|title}}</h4>
-                    <ul class='{{exam_type|lower}}'>
-                        {% for exam in exams  %}
-                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam}}
-                                {% if exam.active %}
-                                    <a href="{{exam.get_take_url}}" target="_blank" title="Click to take exam">
-                                        <button class="small-url-button start-button">Start</button>
-                                    </a>
-                                {% endif %}
-                                {% if exam.publish_results %}
-                                    <a href= "{% url exam_type|lower|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results">
-                                        <button class="small-url-button results-button">Results Published</button>
-                                    </a>
-                                {% endif %}
-                            </li>
+
+        <div class="row">
+            <div class="col-lg-8">
+                <div class="card mb-3">
+                    <div class="card-header">
+                        <h5 class="mb-0">Assigned Exams</h5>
+                    </div>
+                    <div class="card-body">
+                        <p class="text-muted">The following exams will be available to take when active.</p>
+                        {% for exam_type, exams in available_exams %}
+                            {% if exams %}
+                                <h6 class="mt-3">{{ exam_type|title }}</h6>
+                                <ul class="list-group">
+                                    {% for exam in exams %}
+                                        <li class="list-group-item d-flex justify-content-between align-items-center">
+                                            <div>
+                                                {{ exam }}
+                                                {% if exam.active %}<span class="badge bg-success ms-2">Active</span>{% endif %}
+                                                {% if exam.publish_results %}<span class="badge bg-info text-dark ms-2">Results Published</span>{% endif %}
+                                            </div>
+                                            <div class="btn-group btn-group-sm" role="group">
+                                                {% if exam.active %}
+                                                    <a class="btn btn-primary" href="{{ exam.get_take_url }}" target="_blank" title="Click to take exam">Start</a>
+                                                {% endif %}
+                                                {% if exam.publish_results %}
+                                                    <a class="btn btn-outline-secondary" href="{% url exam_type|lower|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results">Results</a>
+                                                {% endif %}
+                                            </div>
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            {% endif %}
                         {% endfor %}
-                    </ul>
-                {% endif %}
-            {% endfor %}
-        </div>
+                    </div>
+                </div>
 
-        {% if all_exams %}
-            <h3>Exam Results</h3>
-            <div id="exam-results">
-                The following exam results been found. Click to view answers (and scores when the results are published):
-                {% for exam_type, exams in all_exams %}
-                    {% if exams %}
-                        <h4>{{exam_type|title}}</h4>
-                        <ul class='{{exam_type|lower}}'>
-                            {% for exam in exams %}
-                                <li class="exam" data-exam-id="{{exam.pk}}">
-
-                                    {% if admin %}
-                                        <a href= "{% url exam_type|add:':exam_scores_user_admin' pk=exam.pk user_id=user.pk %}"  title="Click to view results">
-                                    {% else %}
-                                        <a href= "{% url exam_type|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results">
-                                    {% endif %}
-
-                                    {{exam}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
+                {% if all_exams %}
+                    <div class="card mb-3">
+                        <div class="card-header">
+                            <h5 class="mb-0">Exam Results</h5>
+                        </div>
+                        <div class="card-body">
+                            <p class="text-muted">Click an exam to view answers (and scores when results are published).</p>
+                            {% for exam_type, exams in all_exams %}
+                                {% if exams %}
+                                    <h6 class="mt-3">{{ exam_type|title }}</h6>
+                                    <ul class="list-group">
+                                        {% for exam in exams %}
+                                            <li class="list-group-item d-flex justify-content-between align-items-center">
+                                                <div>
+                                                    {% if admin %}
+                                                        <a href="{% url exam_type|add:':exam_scores_user_admin' pk=exam.pk user_id=user.pk %}">{{ exam }}</a>
+                                                    {% else %}
+                                                        <a href="{% url exam_type|add:':exam_scores_user' pk=exam.pk %}">{{ exam }}</a>
+                                                    {% endif %}
+                                                    {% if exam.active %}<span class="badge bg-success ms-2">Active</span>{% endif %}
+                                                    {% if exam.publish_results %}<span class="badge bg-info text-dark ms-2">Results Published</span>{% endif %}
+                                                </div>
+                                                <div class="small text-muted">&nbsp;</div>
+                                            </li>
+                                        {% endfor %}
+                                    </ul>
+                                {% endif %}
                             {% endfor %}
-                        </ul>
-                    {% endif %}
-                {% endfor %}
+                        </div>
+                    </div>
+                {% endif %}
+
+                {% if case_collections %}
+                    <div class="card mb-3">
+                        <div class="card-header">
+                            <h5 class="mb-0">Case Collections</h5>
+                        </div>
+                        <div class="card-body">
+                            <p class="text-muted">The following Case Collections have been found.</p>
+                            <ul class="list-group">
+                                {% for collection in case_collections %}
+                                    <li class="list-group-item d-flex justify-content-between align-items-center">
+                                        <a href="{{ collection.get_take_url }}?cid={{ cid }}&passcode={{ passcode }}">{{ collection.name }}</a>
+                                        <div>
+                                            {% if collection.active %}<span class="badge bg-success">Active</span>{% endif %}
+                                            {% if collection.publish_results %}<span class="badge bg-info text-dark ms-2">Results Published</span>{% endif %}
+                                        </div>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        </div>
+                    </div>
+                {% endif %}
             </div>
-        {% endif %}
 
-        {% if case_collections %}
-            <div>
-                <h3>Case Collection</h3>
-                The following Case Collections have been found.
-                {% for collection in case_collections %}
-                    <li><a href="{{collection.get_take_url}}?cid={{cid}}&passcode={{passcode}}">{{collection.name}}</a> {% if collection.active %}[Active]{% endif %} {% if collection.publish_results %}[Results Published]{% endif %}</li>
-
-                {% endfor %}
+            <div class="col-lg-4">
+                <div class="card mb-3">
+                    <div class="card-body">
+                        <h6 class="card-title">Actions</h6>
+                        <p class="small text-muted">Quick links and information.</p>
+                        <!-- Placeholder for any future quick actions -->
+                    </div>
+                </div>
             </div>
-        {% endif %}
-
+        </div>
     </div>
 {% endblock %}