LIL-135 Подсветка активного пункта в фильтрации

apps/course/templates/course/courses.html

@@ -19,9 +19,13 @@
         <div class="head__right">
           <div class="head__field field">
             <div class="field__wrap">
-              <div class="field__select select js-select">
+              <div class="field__select select js-select{% if category %} selected{% endif %}">
-                <div class="select__head js-select-head">Категории</div>
+                <div class="select__head js-select-head">{% if category %}{{ category.0 }}{% else %}Категории{% endif %}</div>
                 <div class="select__drop js-select-drop">
+                  <div class="select__option js-select-option{% if not category %} active{% endif %}"
+                      data-category-option data-category-url="{% url 'courses' %}">
+                    <div class="select__title">Все курсы</div>
+                  </div>
                   {% category_items category %}
                 </div>
                 <input class="select__input" type="hidden"></div>

apps/course/templates/course/inclusion/category_items.html

@@ -1,5 +1,5 @@
 {% for cat in category_items %}
-  <div class="select__option js-select-option" data-category-option data-category-url="{% url 'courses' %}?category={{ cat.title }}">
+  <div class="select__option js-select-option{% if category and category.0 == cat.title %} active{% endif %}" data-category-option data-category-url="{% url 'courses' %}?category={{ cat.title }}">
     <div class="select__title">{{ cat.title }}</div>
   </div>
 {% endfor %}

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 {

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();
             }

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',
         }
     });
 

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()
                 }

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