Commit b53826241f4ab1ad3e159945eda73d6b41332b93
Exists in
master
and in
5 other branches
Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev
Showing
4 changed files
with
17 additions
and
16 deletions
Show diff stats
courses/templates/topic/create.html
| 1 | {% extends 'subject/index.html' %} | 1 | {% extends 'subject/index.html' %} |
| 2 | 2 | ||
| 3 | -{% load static i18n permission_tags widget_tweaks %} | 3 | +{% load static i18n permission_tags widget_tweaks django_bootstrap_breadcrumbs %} |
| 4 | + | ||
| 5 | +{% block breadcrumbs %} | ||
| 6 | + {{ block.super }} | ||
| 7 | + {% breadcrumb 'Create Topic' 'course:create_topic' %} | ||
| 8 | +{% endblock breadcrumbs %} | ||
| 4 | 9 | ||
| 5 | {% block content %} | 10 | {% block content %} |
| 6 | 11 |
courses/templates/topic/index.html
| 1 | -{% extends 'home.html' %} | 1 | +{% extends 'subject/index.html' %} |
| 2 | 2 | ||
| 3 | -{% load static i18n permission_tags professor_access %} | 3 | +{% load static i18n permission_tags professor_access django_bootstrap_breadcrumbs %} |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | {% block javascript %} | 6 | {% block javascript %} |
| @@ -12,18 +12,8 @@ | @@ -12,18 +12,8 @@ | ||
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | {% block breadcrumbs %} | 14 | {% block breadcrumbs %} |
| 15 | - | ||
| 16 | - <ol class="breadcrumb"> | ||
| 17 | - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li> | ||
| 18 | - <li><a href="{% url 'course:view_subject' subject.slug %}">{{ subject }}</a></li> | ||
| 19 | - {% professor_subject subject user as maneger_topic%} | ||
| 20 | - {% if maneger_topic %} | ||
| 21 | - <li class="active">{% trans 'Manage Topic' %}</li> | ||
| 22 | - {% else %} | ||
| 23 | - <li class="active">{{ topic.name }}</li> | ||
| 24 | - {% endif %} | ||
| 25 | - | ||
| 26 | - </ol> | 15 | + {{ block.super }} |
| 16 | + {% breadcrumb topic.name 'course:view_topic' %} | ||
| 27 | {% endblock %} | 17 | {% endblock %} |
| 28 | 18 | ||
| 29 | {% block content %} | 19 | {% block content %} |
courses/templates/topic/replicate.html
| 1 | {% extends 'subject/index.html' %} | 1 | {% extends 'subject/index.html' %} |
| 2 | 2 | ||
| 3 | -{% load static i18n permission_tags widget_tweaks %} | 3 | +{% load static i18n permission_tags widget_tweaks django_bootstrap_breadcrumbs %} |
| 4 | + | ||
| 5 | +{% block breadcrumbs %} | ||
| 6 | + {{ block.super }} | ||
| 7 | + {% breadcrumb 'Replicate Topic' 'course:replicate_topic' %} | ||
| 8 | +{% endblock breadcrumbs %} | ||
| 4 | 9 | ||
| 5 | {% block content %} | 10 | {% block content %} |
| 6 | 11 |
courses/views.py
| @@ -639,6 +639,7 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView): | @@ -639,6 +639,7 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView): | ||
| 639 | 639 | ||
| 640 | context['topic'] = topic | 640 | context['topic'] = topic |
| 641 | context['subject'] = topic.subject | 641 | context['subject'] = topic.subject |
| 642 | + context['course'] = topic.subject.course | ||
| 642 | context['activitys'] = activitys | 643 | context['activitys'] = activitys |
| 643 | context['students_activit'] = students_activit | 644 | context['students_activit'] = students_activit |
| 644 | context['materials'] = materials | 645 | context['materials'] = materials |