diff --git a/amadeus/static/js/category.js b/amadeus/static/js/category.js
index e76efbc..106fc03 100755
--- a/amadeus/static/js/category.js
+++ b/amadeus/static/js/category.js
@@ -110,7 +110,7 @@ function bindCollapse() {
var btn = $(this).parent().find('.fa-angle-right');
btn = btn[0];
-
+
$(btn).switchClass("fa-angle-right", "fa-angle-down", 250, "easeInOutQuad");
var url = $(this).parent().find('.log_url').val();
@@ -136,9 +136,9 @@ function bindCollapse() {
$('.collapse').on('hide.bs.collapse', function (e) {
if($(this).is(e.target)){
var btn = $(this).parent().find('.fa-angle-down');
-
+
btn = btn[0];
-
+
$(btn).switchClass("fa-angle-down", "fa-angle-right", 250, "easeInOutQuad");
var url = $(this).parent().find('.log_url').val();
@@ -165,7 +165,7 @@ $('.category-panel-content').on('shown.bs.collapse', function(e) {
if($(this).is(e.target)){
var panel_id = $(this).attr('id');
var holder = $(this).find('.holder');
-
+
if ($('#' + panel_id + '-accordion').children().length == 0) {
var load_sub_url = $(this).find('.load_sub_url').val();
@@ -209,7 +209,7 @@ $('.category-panel-content').on('hidden.bs.collapse', function(e) {
if($(this).is(e.target)){
var panel_id = $(this).attr('id');
var holder = $(this).find('.holder');
-
+
var items = $('#' + panel_id + '-accordion').children(":visible").length;
if (items > 10) {
@@ -229,4 +229,4 @@ function delete_group(url) {
$('.modal').modal('show');
});
-}
\ No newline at end of file
+}
diff --git a/categories/templates/categories/list.html b/categories/templates/categories/list.html
index df90f5e..674ac34 100755
--- a/categories/templates/categories/list.html
+++ b/categories/templates/categories/list.html
@@ -40,7 +40,7 @@
{% trans "all subjects" %}
- {% endif %}
+ {% endif %}
@@ -52,14 +52,14 @@
-
+
-
+
{% if category.coordinators.all|length > 0 %}
{% trans "Coordinator(s) " %}:
{{ category.coordinators.all|join:', ' }}
@@ -89,7 +89,7 @@
{% else %}
{% trans "It doesn't possess coordinators" %}
{% endif %}
-
+
{{category.description|safe}}
@@ -99,14 +99,14 @@
-
+
-
+
{% if category.coordinators.all|length > 0 %}
{% trans "Coordinator(s) " %}:
{{ category.coordinators.all|join:', ' }}
@@ -132,7 +132,7 @@
{% else %}
{% trans "It doesn't possess coordinators" %}
{% endif %}
-
+
{{category.description|safe}}
diff --git a/subjects/templates/subjects/initial.html b/subjects/templates/subjects/initial.html
index 162a02a..e943067 100644
--- a/subjects/templates/subjects/initial.html
+++ b/subjects/templates/subjects/initial.html
@@ -13,7 +13,7 @@
{% endfor %}
{% endif %}
-
+
@@ -43,7 +43,7 @@
{{tag.0}}
{% endif %}
-
+
{% endfor %}
@@ -77,7 +77,7 @@
{{tag.0}}
{% endif %}
-
+
{% endfor %}
@@ -85,10 +85,10 @@
{% endif %}
-
-
-
-
+
+
+
+
{% trans "My Subjects" %} ({{ total_subs }})
@@ -97,7 +97,7 @@
{% for subject in subjects %}
{% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}
{% endfor %}
-
+
{% pagination request paginator page_obj %}
{% else %}
@@ -110,9 +110,9 @@
{% if user.is_staff %}
-
+
{% endif %}
-
-
+
+
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index 1d72c6d..7cec7de 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -5,7 +5,7 @@
{% block javascript%}
{{ block.super }}
-
+
{% endblock%}
{% block breadcrumbs %}
@@ -39,7 +39,7 @@
{% trans "My subjects" %} ({{ totals.my_subjects }})
{% trans "All subjects" %} ({{ totals.all_subjects }})
{% endif %}
-
+
@@ -54,9 +54,9 @@
-
+
-
+
{% if category.coordinators.all|length > 0 %}
{% trans "Coordinator(s) " %}:
{{ category.coordinators.all|join:', ' }}
@@ -97,16 +97,16 @@
{% else %}
{% trans "It doesn't possess coordinators" %}
{% endif %}
-
+
{{category.description|safe}}
-
+
{% if request.user in category.coordinators.all or request.user.is_staff %}
{% trans "Create new subject" %}
{% endif %}
-
-
-
-
+
+
+
+
@@ -116,8 +116,8 @@
-
+
@@ -158,15 +158,15 @@
{% else %}
{% trans "It doesn't possess coordinators" %}
{% endif %}
-
+
{{category.description|safe}}
-
+
{% if request.user in category.coordinators.all or request.user.is_staff %}
{% trans "Create new subject" %}
{% endif %}
-
@@ -185,12 +185,12 @@
-
+
-
+
+
{% endblock%}
@@ -18,11 +18,11 @@
{% with bread|add:tags as term %}
{% breadcrumb term 'subjects:index' %}
{% endwith %}
-
+
{% endblock breadcrumbs %}
-
+
{% block content %}
{% if messages %}
@@ -51,21 +51,21 @@
{% trans "Subjects" %} ({{ totals.my_subjects }})
{% trans "Resources" %} ({{ totals.resources }})
{% endif %}
-
+
-
+
-
+
{% if not all %}
{% for subject in subjects %}
{% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}
{% endfor %}
-
+
{% pagination request paginator page_obj %}
{% elif resources|length > 0 and all %}
@@ -73,10 +73,10 @@
{% for resource in resources %}
{% include "subjects/resource_card.html" with resource=resource accordion_id="subject-accordion" %}
{% endfor %}
-
+
{% pagination request paginator page_obj %}
- {% else %}
+ {% else %}
{% endif %}
@@ -85,7 +85,7 @@
-
+
-
-{% endblock content %}
\ No newline at end of file
+
+{% endblock content %}
diff --git a/subjects/templates/subjects/resource_card.html b/subjects/templates/subjects/resource_card.html
index 8c563bf..5863b01 100644
--- a/subjects/templates/subjects/resource_card.html
+++ b/subjects/templates/subjects/resource_card.html
@@ -6,11 +6,11 @@
{% if has_resource_permissions %}
@@ -67,7 +67,7 @@
{% include "resources/delete.html" with resource=resource %}
+
{% endblock %}
{% block breadcrumbs %}
@@ -18,9 +18,9 @@
{% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
{% breadcrumb subject 'subjects:view' subject.slug %}
-
+
{% trans 'Update: ' as bread %}
- {% with bread|add:object.name as bread_slug %}
+ {% with bread|add:object.name as bread_slug %}
{% breadcrumb bread_slug 'subjects:update' %}
{% endwith %}
{% endblock %}
@@ -33,4 +33,4 @@
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html
index b8af93e..a1b014e 100644
--- a/subjects/templates/subjects/view.html
+++ b/subjects/templates/subjects/view.html
@@ -43,7 +43,7 @@
-
-
+
+
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
--
libgit2 0.21.2