Refactor HTML structure for user marking templates to improve readability and maintainability
This commit is contained in:
Ross
@@ -3,20 +3,20 @@
|
|||||||
<ul class="list-group">
|
<ul class="list-group">
|
||||||
{% for item in exams_data %}
|
{% for item in exams_data %}
|
||||||
{% with exam=item.exam %}
|
{% with exam=item.exam %}
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||||
<div>
|
<div>
|
||||||
<a href="{{ exam.get_absolute_url }}" class="fw-semibold">{{ exam.name }}</a>
|
<a href="{{ exam.get_absolute_url }}" class="fw-semibold">{{ exam.name }}</a>
|
||||||
<div class="small text-muted">Authors: {% for a in exam.author.all %}{{ a.get_full_name|default:a.username }}{% if not forloop.last %}, {% endif %}{% endfor %}</div>
|
<div class="small text-muted">Authors: {% for a in exam.author.all %}{{ a.get_full_name|default:a.username }}{% if not forloop.last %}, {% endif %}{% endfor %}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-end">
|
<div class="text-end">
|
||||||
<div class="small text-muted">Markers: {{ exam.markers.all.count }}</div>
|
<div class="small text-muted">Markers: {{ exam.markers.all.count }}</div>
|
||||||
{% if item.has_unmarked %}
|
{% if item.has_unmarked %}
|
||||||
<span class="badge bg-danger mt-1">Needs marking ({{ item.unmarked_count }})</span>
|
<span class="badge bg-danger mt-1">Needs marking ({{ item.unmarked_count }})</span>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="badge bg-secondary mt-1">No unmarked</span>
|
<span class="badge bg-secondary mt-1">No unmarked</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -91,7 +91,7 @@
|
|||||||
<div class="card mb-3">
|
<div class="card mb-3">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h6 class="card-title">Quick links</h6>
|
<h6 class="card-title">Quick links</h6>
|
||||||
<ul class="list-unstyled mb-0">
|
<ul class="list-unstyled mb-0">
|
||||||
<li><a href="http://www.penracourses.org.uk/rts" class="link-primary">RTS platform</a></li>
|
<li><a href="http://www.penracourses.org.uk/rts" class="link-primary">RTS platform</a></li>
|
||||||
{% if request.user.is_authenticated %}
|
{% if request.user.is_authenticated %}
|
||||||
<li><a href="{% url 'user_marking' %}" class="link-primary">Marking overview</a></li>
|
<li><a href="{% url 'user_marking' %}" class="link-primary">Marking overview</a></li>
|
||||||
|
|||||||
@@ -1,65 +1,65 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1 class="mb-4">Marking: Exams you can mark</h1>
|
<h1 class="mb-4">Marking: Exams you can mark</h1>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.htmx-indicator { display: none; }
|
.htmx-indicator { display: none; }
|
||||||
.htmx-request .htmx-indicator { display: inline-block; }
|
.htmx-request .htmx-indicator { display: inline-block; }
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<p class="text-muted">Click an exam type to load exams — each section loads independently.</p>
|
<p class="text-muted">Click an exam type to load exams — each section loads independently.</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row g-4">
|
<div class="row g-4">
|
||||||
{% for app in apps %}
|
{% for app in apps %}
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body d-flex align-items-center justify-content-between">
|
<div class="card-body d-flex align-items-center justify-content-between">
|
||||||
<h5 class="card-title mb-0">{{ app|capfirst }}</h5>
|
<h5 class="card-title mb-0">{{ app|capfirst }}</h5>
|
||||||
<div>
|
<div>
|
||||||
<button class="btn btn-sm btn-primary" hx-get="{% url 'user_marking_partial' app %}" hx-target="#marking-{{ app }}" hx-swap="innerHTML" hx-indicator="#indicator-{{ app }}">Load / Refresh</button>
|
<button class="btn btn-sm btn-primary" hx-get="{% url 'user_marking_partial' app %}" hx-target="#marking-{{ app }}" hx-swap="innerHTML" hx-indicator="#indicator-{{ app }}">Load / Refresh</button>
|
||||||
<div id="indicator-{{ app }}" class="htmx-indicator ms-2 spinner-border spinner-border-sm text-primary" role="status"><span class="visually-hidden">Loading...</span></div>
|
<div id="indicator-{{ app }}" class="htmx-indicator ms-2 spinner-border spinner-border-sm text-primary" role="status"><span class="visually-hidden">Loading...</span></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="marking-{{ app }}" class="card-body border-top">
|
||||||
|
<div class="text-muted small">No data loaded — click the button to load.</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="marking-{{ app }}" class="card-body border-top">
|
|
||||||
<div class="text-muted small">No data loaded — click the button to load.</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% endfor %}
|
||||||
{% endfor %}
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// Show/hide indicators referenced by triggering element's hx-indicator attribute
|
// Show/hide indicators referenced by triggering element's hx-indicator attribute
|
||||||
document.body.addEventListener('htmx:beforeRequest', function(evt){
|
document.body.addEventListener('htmx:beforeRequest', function(evt){
|
||||||
try{
|
try{
|
||||||
var elt = evt.detail.elt || evt.target;
|
var elt = evt.detail.elt || evt.target;
|
||||||
var sel = elt && elt.getAttribute && elt.getAttribute('hx-indicator');
|
var sel = elt && elt.getAttribute && elt.getAttribute('hx-indicator');
|
||||||
if(sel){
|
if(sel){
|
||||||
var indicator = document.querySelector(sel);
|
var indicator = document.querySelector(sel);
|
||||||
if(indicator) indicator.classList.add('visible');
|
if(indicator) indicator.classList.add('visible');
|
||||||
}
|
}
|
||||||
}catch(e){console.warn(e)}
|
}catch(e){console.warn(e)}
|
||||||
});
|
});
|
||||||
|
|
||||||
document.body.addEventListener('htmx:afterRequest', function(evt){
|
document.body.addEventListener('htmx:afterRequest', function(evt){
|
||||||
try{
|
try{
|
||||||
var elt = evt.detail.elt || evt.target;
|
var elt = evt.detail.elt || evt.target;
|
||||||
var sel = elt && elt.getAttribute && elt.getAttribute('hx-indicator');
|
var sel = elt && elt.getAttribute && elt.getAttribute('hx-indicator');
|
||||||
if(sel){
|
if(sel){
|
||||||
var indicator = document.querySelector(sel);
|
var indicator = document.querySelector(sel);
|
||||||
if(indicator) indicator.classList.remove('visible');
|
if(indicator) indicator.classList.remove('visible');
|
||||||
}
|
}
|
||||||
}catch(e){console.warn(e)}
|
}catch(e){console.warn(e)}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.htmx-indicator { display: none; }
|
.htmx-indicator { display: none; }
|
||||||
.htmx-indicator.visible { display: inline-block !important; }
|
.htmx-indicator.visible { display: inline-block !important; }
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Reference in New Issue
Block a user