Improvement of date displays and other UX improvements.

loads/templates/loads/activities.html

@@ -3,7 +3,7 @@
 {% block content %}
 
 <h4 class="my-3">
-    Activity breakdown for {{staff}}<span class="small wam-hide-on-print"> (<a class="link-opacity-50-hover link-underline-opacity-50 link-offset-2" href="{% url 'staff_module_allocation' package.id staff.id %}">Edit</a>)</span>
+    Activity breakdown for {{staff}}<span class="small wam-hide-on-print"><a class="btn btn-sm btn-secondary ms-2" role="button" href="{% url 'staff_module_allocation' package.id staff.id %}">Edit</a></span>
 </h4>
 <p class="my-3">
     Selected Work Package:<br/>

loads/templates/loads/modules/delete_assessment_signoff.html

@@ -61,14 +61,16 @@ <h4 class="mt-5">Sign-off details</h4>
         <div class="col-12 col-md-3 fw-bold">
             Notes
         </div>
-        <div class="col-9 font-monospace text-nowrap">
+        <div class="col-9 small">
             {{ signoff.notes }}
         </div>
     </div>
 </div>
 
 <div class="mt-5">
-    <h5 class="fw-bold">Are you sure? This cannot be undone!</h5>
+    <p class="mt-5 fw-bold">
+        This cannot be undone! Are you sure?
+    </p>
     <p class="mt-3">
         <a class="btn btn-warning me-4" role="button" href="{% url 'delete_assessment_sign_off' signoff.id "/confirm" %}">Confirm</a>
         <a class="btn btn-primary" role="button" href="{% url 'modules_details' signoff.module.id %}">Cancel</a>

loads/templates/loads/modules/details.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 
-<h4>Details for module {{ module.name }}{% if logged_in_staff and not logged_in_staff.is_external %}<span class="small wam-hide-on-print"> (<a class="link-opacity-50-hover link-underline-opacity-50 link-offset-1" href="{% url 'update module' module.pk %}">Edit</a>)</span>{% endif %}</h4>
+<h4>Details for module {{ module.name }}{% if logged_in_staff and not logged_in_staff.is_external %}<span class="small wam-hide-on-print"><a class="btn btn-sm btn-secondary ms-1" role="button" href="{% url 'update module' module.pk %}">Edit</a></span>{% endif %}</h4>
 
 <div class="mt-4">
     <div class="row mb-2">
@@ -154,7 +154,7 @@ <h5>Module staff allocations</h5>
     <p>
         <span class="text-info-emphasis">No allocations of staff recorded for this module</span>
         {% if logged_in_staff and not logged_in_staff.is_external %}
-        <span class="wam-hide-on-print">(<a class="link-opacity-50-hover link-underline-opacity-50 link-offset-2" href="{% url 'module_staff_allocation' package.id module.id %}">Edit</a>)</span>
+        <span class="small wam-hide-on-print"><a class="btn btn-sm btn-secondary ms-1" role="button" href="{% url 'module_staff_allocation' package.id module.id %}">Edit</a></span>
         {% endif %}
     </p>
     {% endif %}
@@ -212,23 +212,28 @@ <h5>Assessment resources</h5>
     <div class="card mt-4 px-3 pt-3 border border-secondary rounded-3">
 
     {% if signoff %}
-        <div class="row text-bg-info">
-            <div class="col-5">
-                <span class="fw-bold small">
-                    {{ signoff.assessment_state }}
-                </span>
+        <div class="row">
+            <div class="col-6 small">
+                <span class="text-info-emphasis fw-bold">{{ signoff.assessment_state }}</span>
+                <br/>
+                <span class="text-secondary-emphasis" title="{{ signoff.created }}">[{{ signoff.created|date:"SHORT_DATETIME_FORMAT" }}]</span>
             </div>
-            <div class="col-4 small">
+            <div class="col-4 text-info-emphasis small">
                 {% if signoff.signed_by.first_name or signoff.signed_by.last_name %}
                     by {{ signoff.signed_by.first_name }} {{ signoff.signed_by.last_name }}
                 {% endif %}
             </div>
-            <div class="col small">
-                on {{ signoff.created }}
+            {# if forloop.first #}
+            {# This won't work since we may have a resource without signoff #}
+            <div class="col-2 wam-hide-on-print p-0 pe-2 text-end">
+                <a class="btn btn-sm btn-warning" role="button" href="{% url 'delete_assessment_sign_off' signoff.id %}">
+                    delete
+                </a>
             </div>
+            {# endif #}
         </div>
-        <div class="row pt-3">
-            <div class="col small">
+        <div class="row pt-3 pb-2">
+            <div class="col-12 small">
                 {{ signoff.notes }}
             </div>
         </div>
@@ -255,7 +260,7 @@ <h5>Assessment resources</h5>
                                 <td class="w-25">{{ resource.resource_type }}</td>
                                 <td class="w-25">{{ resource.name }}</td>
                                 <td>{{ resource.owner }}</td>
-                                <td>{{ resource.created }}</td>
+                                <td><span title="{{ resource.created }}">{{ resource.created|date:"SHORT_DATETIME_FORMAT" }}</span></td>
                                 <td class="wam-hide-on-print"><a class="link-opacity-50-hover link-underline-opacity-50 link-offset-2" href="{% url 'download_assessment_resource' resource.id %}">View</a></td>
                                 <td class="wam-hide-on-print"><a class="link-opacity-50-hover link-underline-opacity-50 link-offset-2" href="{% url 'delete_assessment_resource' resource.id %}">Delete</a></td>
                             </tr>

loads/templates/loads/modules/index.html

@@ -140,7 +140,7 @@ <h4>Modules {% if valid_semesters %}<span class="small">(restricted to those in
                         {% if action_possible %}
                         </strong>
                         {% endif %}
-                        ({{ signoff.created }})
+                        <span class="small" title="{{ signoff.created }}"><br/>({{ signoff.created|date:"SHORT_DATETIME_FORMAT" }})</small>
                     </td>
                     {% else %}
                     {# No sign off, look for a resource instead #}

loads/templates/loads/tasks/bystaff.html

@@ -20,7 +20,7 @@ <h3 class="my-3">Tasks still outstanding</h3>
             {% for task, urgent, overdue in combined_list_incomplete %}
             <tr>
                 <td class="col-4">{{ task.name }}</td>
-                <td class="col-3 font-monospace">{{ task.deadline }}&nbsp;</td>
+                <td class="col-3 font-monospace"><span title="{{ task.deadline }}">{{ task.deadline|date:"SHORT_DATETIME_FORMAT" }}&nbsp;</span></td>
                 <td class="col-3">{{ task.deadline|timeuntil }}</td>
                 <td class="col-1">
                     {% if overdue %}
@@ -57,19 +57,19 @@ <h3 class="mt-5">Tasks completed</h3>
     <table class="table table-sm table-striped table-hover">
         <thead>
             <tr>
-                <th class="col-4">Task name</th>
+                <th class="col-3">Task name</th>
                 <th class="col-3">Deadline</th>
-                <th class="col-3">Time left</th>
-                <th class="col-2">Completed</th>
+                <th class="col-2">Time left</th>
+                <th class="col-3 text-end me-1">Completed</th>
             </tr>
         </thead>
         <tbody class="table-group-divider">
             {% for task, when in combined_list_complete %}
             <tr>
                 <td class="col-4">{{ task.name }}</td>
-                <td class="col-3 font-monospace">{{ task.deadline }}&nbsp;</td>
-                <td class="col-3">{{ task.deadline|timeuntil }}</td>
-                <td class="col-2">{{ when }}</td>
+                <td class="col-3 font-monospace"><span title="{{ task.deadline }}">{{ task.deadline|date:"SHORT_DATETIME_FORMAT" }}</span>&nbsp;</td>
+                <td class="col-2">{{ task.deadline|timeuntil }}</td>
+                <td class="col-3 text-end me-1"><span title="{{ when }}">{{ when|date:"SHORT_DATETIME_FORMAT" }}</span></td>
             </tr>
             {% endfor %}
         </tbody>

loads/templates/loads/tasks/details.html

@@ -111,7 +111,7 @@ <h5 class="my-3">
                     {{ target }}
                 </td>
                 <td class="col-3 font-monospace">
-                    {{ completion.when }}
+                    <span title="{{ completion.when }}">{{ completion.when|date:"SHORT_DATETIME_FORMAT" }}</span>
                 </td>
                 <td class="col-4">
                     {{ completion.comment }}