Skip to content

Further UX consistency and other fixes. #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
profcturner merged 6 commits into from
Jan 12, 2026
Merged

Further UX consistency and other fixes. #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8e8610
* Minor cleanup
joho1968 Jan 12, 2026
f8598b2
* Better responsive layout for buttons
joho1968 Jan 12, 2026
89d12b1
* Added d-print-none to button row
joho1968 Jan 12, 2026
499d76a
* Better responsive layout for buttons
joho1968 Jan 12, 2026
7b1d488
* Minor cleanup
joho1968 Jan 12, 2026
fe8342f
* Minor cleanup
joho1968 Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion loads/templates/loads/activity_confirm_delete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h5 class="text-info-emphasis font-monospace">{{ object}}</h5>

<form method="post">{% csrf_token %}
{{ form }}
<p class="mt-4">
<p class="mt-3">
<input type="submit" class="btn btn-warning me-4" role="button" value="Confirm">
<a class="btn btn-primary" role="button" href="{% url 'activities_index' %}">Cancel</a>
</p>
Expand Down
32 changes: 18 additions & 14 deletions loads/templates/loads/module_confirm_delete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,26 @@ <h6 class="fw-bold">!! Please note these exceptions <i class="fw-normal small">(
title="The module has assessment history.">Assessment History</div>
{% endif %}
</div>
<div class="fw-bold">
<br />Deleting modules will also delete <strong>all</strong> related module allocations,
custom activities and module assessment histories.
<div class="fw-bold mt-4">
Deleting modules will also delete <u>all</u> related module allocations,
custom activities and module assessment histories.
</div>
</div>
{% endif %}
<p class="fw-bold">
This cannot be undone. Are you sure?
</p>
</div>

<form method="post">{% csrf_token %}
{{ form }}
<p class="mt-5">
<input type="submit" class="btn btn-warning me-4" role="button" value="Confirm">
<a class="btn btn-primary" role="button" href="{% url 'modules_index' "1,2,3" %}">Cancel</a>
</p>
</form>
<div class="mt-5">
<p class="mt-5 fw-bold">
This cannot be undone! Are you sure?
</p>
<p>
<form method="post">
{{ form }}
{% csrf_token %}
<p class="mt-3">
<input type="submit" class="btn btn-warning me-4" role="button" value="Confirm" />
<a class="btn btn-primary" role="button" href="{% url 'modules_index' "1,2,3" %}">Cancel</a>
</p>
</form>
</p>
</div>
{% endblock content %}
10 changes: 5 additions & 5 deletions loads/templates/loads/module_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ <h3 class="my-3">
{% endif %}
</div>
{% endfor %}
<div class="row mt-4 mb-3">
<div class="col-9">
<input class="btn btn-primary" type="submit" value="Submit" />
<a class="btn btn-primary" role="button" href="{% url 'modules_index' "1,2,3" %}">Cancel</a>
<div class="row mt-4 mb-3 d-print-none">
<div class="col-6 col-md-9">
<input class="btn btn-primary me-2" type="submit" value="Submit" />
<a class="btn btn-secondary" role="button" href="{% url 'modules_index' "1,2,3" %}">Cancel</a>
</div>
{% if form.instance.pk %}
<div class="col-3">
<div class="col-6 col-md-3 text-end">
<a class="btn btn-danger" role="button" href="{% url 'delete module' form.instance.pk %}">Delete module</a>
</div>
{% endif %}
Expand Down
10 changes: 5 additions & 5 deletions loads/templates/loads/programme_confirm_delete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ <h4 class="text-info-emphasis font-monospace">({{ object }})</h4>
<p>
Normally, programmes are only deleted when you are pruning discontinued modules from a new rolled over allocation.
</p>
<p class="fw-bold">
This cannot be undone. Are you sure?
<p class="mt-5 fw-bold">
This cannot be undone! Are you sure?
</p>

<form method="post">{% csrf_token %}
<form method="post">
{% csrf_token %}
{{ form }}
<p class="mt-5">
<p class="mt-3">
<input type="submit" class="btn btn-warning me-4" role="button" value="Confirm">
<a class="btn btn-primary" role="button" href="{% url 'programmes_index' %}">Cancel</a>
</p>
Expand Down
10 changes: 5 additions & 5 deletions loads/templates/loads/programme_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ <h3 class="my-3">
{% endif %}
</div>
{% endfor %}
<div class="row mt-4 mb-2 d-print-none">
<div class="col-9">
<input class="btn btn-primary" type="submit" value="Submit" />
<a class="btn btn-primary" role="button" href="{% url 'programmes_index' %}">Cancel</a>
<div class="row mt-5 mb-3 d-print-none">
<div class="col-6 col-md-9">
<input class="btn btn-primary me-2" type="submit" value="Submit" />
<a class="btn btn-secondary" role="button" href="{% url 'programmes_index' %}">Cancel</a>
</div>
{% if form.instance.pk %}
<div class="col-3">
<div class="col-6 col-md-3 text-end">
<a class="btn btn-danger" role="button" href="{% url 'delete programme' form.instance.pk %}">Delete programme</a>
</div>
{% endif %}
Expand Down