Skip to content

Commit f7752e0

Browse files
Refactor cadmin templates to use base template for messages
- Create cadmin/base.html that extends base.html and includes messages block - Update all cadmin templates to extend cadmin/base.html instead of base.html - Remove duplicate message blocks from all templates - Templates now use cadmin_content block instead of content block Co-authored-by: alexeygrigorev <875246+alexeygrigorev@users.noreply.github.com>
1 parent b9283ce commit f7752e0

6 files changed

Lines changed: 29 additions & 75 deletions

File tree

cadmin/templates/cadmin/base.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{% extends 'base.html' %}
2+
3+
{% block content %}
4+
{% if messages %}
5+
<div class="messages">
6+
{% for message in messages %}
7+
<div class="alert {% if message.tags %}alert-{{ message.tags }}{% else %}alert-info{% endif %} alert-dismissible fade show" role="alert">
8+
{{ message }}
9+
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
10+
<span aria-hidden="true">&times;</span>
11+
</button>
12+
</div>
13+
{% endfor %}
14+
</div>
15+
{% endif %}
16+
17+
{% block cadmin_content %}
18+
{% endblock %}
19+
{% endblock %}

cadmin/templates/cadmin/course_admin.html

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'base.html' %}
1+
{% extends 'cadmin/base.html' %}
22

33
{% load custom_filters %}
44

@@ -7,22 +7,9 @@
77
<li><a href="{% url 'cadmin_course' course.slug %}">{{ course.title }}</a></li>
88
{% endblock %}
99

10-
{% block content %}
10+
{% block cadmin_content %}
1111
<h2>{{ course.title }} - Admin Panel</h2>
1212

13-
{% if messages %}
14-
<div class="messages">
15-
{% for message in messages %}
16-
<div class="alert {% if message.tags %}alert-{{ message.tags }}{% else %}alert-info{% endif %} alert-dismissible fade show" role="alert">
17-
{{ message }}
18-
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
19-
<span aria-hidden="true">&times;</span>
20-
</button>
21-
</div>
22-
{% endfor %}
23-
</div>
24-
{% endif %}
25-
2613
<div class="mb-3">
2714
<a href="{% url 'course' course.slug %}" class="btn btn-secondary">View Course Page</a>
2815
<a href="{% url 'dashboard' course.slug %}" class="btn btn-info">Course Dashboard</a>

cadmin/templates/cadmin/course_list.html

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,12 @@
1-
{% extends 'base.html' %}
1+
{% extends 'cadmin/base.html' %}
22

33
{% block breadcrumbs %}
44
<li><a href="{% url 'cadmin_course_list' %}">Course Admin</a></li>
55
{% endblock %}
66

7-
{% block content %}
7+
{% block cadmin_content %}
88
<h2>Course Administration</h2>
99

10-
{% if messages %}
11-
<div class="messages">
12-
{% for message in messages %}
13-
<div class="alert {% if message.tags %}alert-{{ message.tags }}{% else %}alert-info{% endif %} alert-dismissible fade show" role="alert">
14-
{{ message }}
15-
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
16-
<span aria-hidden="true">&times;</span>
17-
</button>
18-
</div>
19-
{% endfor %}
20-
</div>
21-
{% endif %}
22-
2310
<div class="alert alert-info" role="alert">
2411
This is the admin panel for managing courses. Only staff members can access this area.
2512
</div>

cadmin/templates/cadmin/homework_submissions.html

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'base.html' %}
1+
{% extends 'cadmin/base.html' %}
22

33
{% load custom_filters %}
44

@@ -8,22 +8,9 @@
88
<li><a href="{% url 'cadmin_homework_submissions' course.slug homework.slug %}">{{ homework.title }} Submissions</a></li>
99
{% endblock %}
1010

11-
{% block content %}
11+
{% block cadmin_content %}
1212
<h2>{{ homework.title }} - Submissions</h2>
1313

14-
{% if messages %}
15-
<div class="messages">
16-
{% for message in messages %}
17-
<div class="alert {% if message.tags %}alert-{{ message.tags }}{% else %}alert-info{% endif %} alert-dismissible fade show" role="alert">
18-
{{ message }}
19-
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
20-
<span aria-hidden="true">&times;</span>
21-
</button>
22-
</div>
23-
{% endfor %}
24-
</div>
25-
{% endif %}
26-
2714
<div class="mb-3">
2815
<a href="{% url 'cadmin_course' course.slug %}" class="btn btn-secondary">Back to Course Admin</a>
2916
<a href="{% url 'homework' course.slug homework.slug %}" class="btn btn-info">View Homework</a>

cadmin/templates/cadmin/project_submission_edit.html

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'base.html' %}
1+
{% extends 'cadmin/base.html' %}
22

33
{% load custom_filters %}
44

@@ -9,22 +9,9 @@
99
<li><a href="{% url 'cadmin_project_submission_edit' course.slug project.slug submission.id %}">Edit Submission</a></li>
1010
{% endblock %}
1111

12-
{% block content %}
12+
{% block cadmin_content %}
1313
<h2>Edit Project Submission</h2>
1414

15-
{% if messages %}
16-
<div class="messages">
17-
{% for message in messages %}
18-
<div class="alert {% if message.tags %}alert-{{ message.tags }}{% else %}alert-info{% endif %} alert-dismissible fade show" role="alert">
19-
{{ message }}
20-
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
21-
<span aria-hidden="true">&times;</span>
22-
</button>
23-
</div>
24-
{% endfor %}
25-
</div>
26-
{% endif %}
27-
2815
<div class="mb-3">
2916
<a href="{% url 'cadmin_project_submissions' course.slug project.slug %}" class="btn btn-secondary">Back to Submissions</a>
3017
</div>

cadmin/templates/cadmin/project_submissions.html

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'base.html' %}
1+
{% extends 'cadmin/base.html' %}
22

33
{% load custom_filters %}
44

@@ -8,22 +8,9 @@
88
<li><a href="{% url 'cadmin_project_submissions' course.slug project.slug %}">{{ project.title }} Submissions</a></li>
99
{% endblock %}
1010

11-
{% block content %}
11+
{% block cadmin_content %}
1212
<h2>{{ project.title }} - Submissions</h2>
1313

14-
{% if messages %}
15-
<div class="messages">
16-
{% for message in messages %}
17-
<div class="alert {% if message.tags %}alert-{{ message.tags }}{% else %}alert-info{% endif %} alert-dismissible fade show" role="alert">
18-
{{ message }}
19-
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
20-
<span aria-hidden="true">&times;</span>
21-
</button>
22-
</div>
23-
{% endfor %}
24-
</div>
25-
{% endif %}
26-
2714
<div class="mb-3">
2815
<a href="{% url 'cadmin_course' course.slug %}" class="btn btn-secondary">Back to Course Admin</a>
2916
<a href="{% url 'project' course.slug project.slug %}" class="btn btn-info">View Project</a>

0 commit comments

Comments
 (0)