diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index efbd19a..1aa6f72 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -73,11 +73,11 @@ a:focus { /* side bar menu ends*/ /* category app starts */ -.category-panel > .panel-heading, .subject-panel > .panel-heading, .special-panel > .panel-heading { +.category-panel > .panel-heading, .subject-panel > .panel-heading, .special-panel > .panel-heading, .topic-panel > .panel-heading { padding: 2px 0px; } -.subject-panel-invisible > .panel-heading{ +.subject-panel-invisible > .panel-heading, .topic-panel-invisible > .panel-heading { padding: 2px 0px; } diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css index af8c641..9334f49 100644 --- a/amadeus/static/css/themes/green.css +++ b/amadeus/static/css/themes/green.css @@ -59,6 +59,15 @@ a, a:focus, a:hover { background-color: #039BE5 !important; } +.topic-panel > .panel-heading { + background-color: #7BA5B9 !important; +} + +.topic-panel-invisible > .panel-heading { + background-color: #BDBDBD !important; + color: #F5F5F5; +} + .category-header i { color: white; } diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html index bac61a7..61d4a34 100644 --- a/subjects/templates/subjects/view.html +++ b/subjects/templates/subjects/view.html @@ -84,6 +84,7 @@ {% trans "Create new topic" %} {% endif %} + {% include 'topics/list.html' with subject=subject %} {% endblock content %} \ No newline at end of file diff --git a/topics/models.py b/topics/models.py index e13d1f6..7ea8447 100644 --- a/topics/models.py +++ b/topics/models.py @@ -18,6 +18,7 @@ class Topic(models.Model): class Meta: verbose_name = _('Topic') verbose_name_plural = _('Topics') + ordering = ['order'] def __str__(self): return self.name \ No newline at end of file diff --git a/topics/templates/topics/list.html b/topics/templates/topics/list.html new file mode 100644 index 0000000..ff55f77 --- /dev/null +++ b/topics/templates/topics/list.html @@ -0,0 +1,81 @@ +{% load static i18n pagination permissions_tags %} +{% load django_bootstrap_breadcrumbs %} + +{% subject_permissions request.user subject as has_subject_permissions %} + +