diff --git a/apps/course/templates/course/courses.html b/apps/course/templates/course/courses.html index 3eadea4e..cd476226 100644 --- a/apps/course/templates/course/courses.html +++ b/apps/course/templates/course/courses.html @@ -19,9 +19,13 @@
-
-
Категории
+
+
{% if category %}{{ category.0 }}{% else %}Категории{% endif %}
+
+
Все курсы
+
{% category_items category %}
diff --git a/apps/course/templates/course/inclusion/category_items.html b/apps/course/templates/course/inclusion/category_items.html index 359b57ad..3de03a41 100644 --- a/apps/course/templates/course/inclusion/category_items.html +++ b/apps/course/templates/course/inclusion/category_items.html @@ -1,5 +1,5 @@ {% for cat in category_items %} -
+
{{ cat.title }}
{% endfor %} \ No newline at end of file diff --git a/web/build/css/app.css b/web/build/css/app.css index ec807fa7..7b2660d9 100755 --- a/web/build/css/app.css +++ b/web/build/css/app.css @@ -714,7 +714,7 @@ a.btn { position: fixed; left: 0; right: 0; - z-index: 20; + z-index: 100; } .header--shadow { diff --git a/web/build/js/app.js b/web/build/js/app.js index 550c8f6d..5b863826 100644 --- a/web/build/js/app.js +++ b/web/build/js/app.js @@ -26878,7 +26878,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery. _jquery2.default.ajaxSetup({ headers: { - 'X-CSRFToken': (0, _jquery2.default)('meta[name="csrf-token"]').attr('content') + 'X-CSRFToken': (0, _jquery2.default)('meta[name="csrf-token"]').attr('content'), + 'Cache-Control': 'no-cache' } }); @@ -28478,6 +28479,7 @@ function load_courses(coursesUrl, fromStart) { } if (data.next_url) { buttonElement.attr('data-next-page-url', data.next_url); + buttonElement.show(); } else { buttonElement.hide(); } diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js index b4bdbe6e..5eea0db6 100644 --- a/web/src/js/modules/common.js +++ b/web/src/js/modules/common.js @@ -5,7 +5,8 @@ $(document).ready(function () { // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery. $.ajaxSetup({ headers: { - 'X-CSRFToken': $('meta[name="csrf-token"]').attr('content') + 'X-CSRFToken': $('meta[name="csrf-token"]').attr('content'), + 'Cache-Control': 'no-cache', } }); diff --git a/web/src/js/modules/courses.js b/web/src/js/modules/courses.js index 90c5aa48..ad587210 100644 --- a/web/src/js/modules/courses.js +++ b/web/src/js/modules/courses.js @@ -101,7 +101,8 @@ function load_courses(coursesUrl, fromStart) { $('.courses__list').html(data.content); } if (data.next_url) { - buttonElement.attr('data-next-page-url', data.next_url) + buttonElement.attr('data-next-page-url', data.next_url); + buttonElement.show(); } else { buttonElement.hide() } diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 1c61dacb..7df272aa 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -282,7 +282,7 @@ a.btn position: fixed left: 0 right: 0 - z-index: 20 + z-index: 100 &--shadow box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08) &__container