diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html index b68a6bb0..d02078da 100644 --- a/templates/client/accounts/feed.html +++ b/templates/client/accounts/feed.html @@ -17,155 +17,136 @@ {% block page_body %}
-
- Фильтрация ленты - - -
-
-

Тематические фильтры не выбраны: (Изменить):

-
-
-
-
~~text~~
- x -
+
+ Фильтрация ленты + + +
+
+

Тематические фильтры не выбраны: (Изменить):

+
+
+
+
~~text~~
+ x +
-
-
-
-
-

Географические фильтры не выбраны: (Изменить):

- -
-
-
-
~~text~~
- x
+
+
+
+

Географические фильтры не выбраны: (Изменить):

+ +
+
+
+
~~text~~
+ x +
+
-
-
- + + -
-
{% csrf_token %} -
-
-
-
+
+ {% csrf_token %} +
+
+
+
- {% if search_form.th %} - {% include 'client/popups/theme.html' with search_form=search_form filter="filter-" formId="filter-pwSubj" selectedItemTemplate="filter-subj-selected" autoCompleteId="filter-subj-complete-block" filterInputId="filter-subj-fliter-input" selectedItemsContainer="filter-csb-subj-selected-items" subjectTriggerWrapId="filter-subj-checks" exhibitionCheck="filter-exhibition-check" conferenceCheck="filter-conference-check" prefix="f-s-" %} - {% endif %} + {% if search_form.th %} + {% include 'client/popups/theme.html' with search_form=search_form filter="filter-" formId="filter-pwSubj" selectedItemTemplate="filter-subj-selected" autoCompleteId="filter-subj-complete-block" filterInputId="filter-subj-fliter-input" selectedItemsContainer="filter-csb-subj-selected-items" subjectTriggerWrapId="filter-subj-checks" exhibitionCheck="filter-exhibition-check" conferenceCheck="filter-conference-check" prefix="f-s-" submitText="Применить" %} + {% endif %} - {% if search_form.area %} - {% include 'client/popups/place.html' with search_form=search_form filter="filter-" formId="filter-pwPlace" selectedItemTemplate="filter-csb-selected" autoCompleteId="filter-place-complete-block" filterInputId="filter-place-filter-input" selectedItemsContainer="filter-csb-selected-items" prefix="f-p-" %} - {% endif %} + {% if search_form.area %} + {% include 'client/popups/place.html' with search_form=search_form filter="filter-" formId="filter-pwPlace" selectedItemTemplate="filter-csb-selected" autoCompleteId="filter-place-complete-block" filterInputId="filter-place-filter-input" selectedItemsContainer="filter-csb-selected-items" prefix="f-p-" submitText="Применить" %} + {% endif %} +
+
 
-
 
+
+ +
+
+

*{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}

- -
- -
- - {% include 'includes/exposition/exposition_list.html' with object_list=object_list %} - - {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} - - - - - + + + + subject: { + id: 'filter-pwSubj', + selectedItemTemplate: 'filter-subj-selected', + autoCompleteId: 'filter-subj-complete-block', + ajaxUrl: 'http://{{ request.get_host }}/search-form/', + autoCompleteUrl: 'http://{{ request.get_host }}/search-form/autocomplete/', + filterInputId: 'filter-subj-fliter-input', + modalTrigger: 'fiter-subj-modal-trigger', + getParentUrl: 'http://{{ request.get_host }}/search-form/get-parent/', + selectedItemsContainer: 'filter-csb-subj-selected-items', + subjectTriggerWrapId: 'filter-subj-checks', + //switched by default + defaultOn: ['f-s-exhibition-check', 'f-s-conference-check'], + clearAllButtonClass: 'clear-all-button', + applyBtnClass: 'modal-approve', + tagsBoxId: 'filter-subject-tags', + deleteTagClass: 'csbs-del', + bodyId: 'events-filter-wrap', + prefix: 'f-s-', + deleteId: 'subject-tag-remove', + + labelId: 'filter-subject-label' + }, + filter: { + wrapperId:'"events-filter-wrap"', + bodyId:'events-filter', + buttonId:'filter-show-button', + hintId:'filter-hint-block' + } + }); + +
{% endblock %} - - diff --git a/templates/client/popups/place.html b/templates/client/popups/place.html index 2f085630..c29147e2 100644 --- a/templates/client/popups/place.html +++ b/templates/client/popups/place.html @@ -108,7 +108,7 @@
- {% trans 'Уточнить тему' %} + {% trans 'Уточнить тему' %} {% if hasDate %}{% trans 'Уточнить дату' %}{% endif %}
diff --git a/templates/client/popups/theme.html b/templates/client/popups/theme.html index e4a1a699..2a4a7a4d 100644 --- a/templates/client/popups/theme.html +++ b/templates/client/popups/theme.html @@ -76,7 +76,7 @@
- {% trans 'Уточнить географию' %} + {% trans 'Уточнить географию' %} {% if hasDate %}{% trans 'Уточнить дату' %}{% endif %}
diff --git a/templates/client/static_client/css/main.css b/templates/client/static_client/css/main.css index b14d71e3..88ef06c7 100644 --- a/templates/client/static_client/css/main.css +++ b/templates/client/static_client/css/main.css @@ -12064,6 +12064,7 @@ hr + .rq-note { .events-feed-page{ margin-top: -14px; + margin-bottom: 2em; } .events-feed-page h2{ font-size: 16px; @@ -12157,6 +12158,7 @@ hr + .rq-note { .events-filter-wrap{ position: relative; overflow: visible; + margin-bottom: 1em; } .events-filter-wrap .button{ margin-top: -40px; @@ -12223,6 +12225,19 @@ hr + .rq-note { .button.apply-filter.icon-check:hover:before{ background-position: -106px -16px; } + .events-feed-page .filter-hint-block{ + border: 1px dashed #87C525; + border-radius: 4px + } + .events-feed-page .filter-hint-block p{ + margin: 8px; + text-align: center; + color: #464646; + } + .events-feed-page .filter-hint-block p .red{ + font-weight: bold; + color: #d80000; + } diff --git a/templates/client/static_client/js/_modules/page.events.feed.js b/templates/client/static_client/js/_modules/page.events.feed.js index 6bd67809..c62afba8 100644 --- a/templates/client/static_client/js/_modules/page.events.feed.js +++ b/templates/client/static_client/js/_modules/page.events.feed.js @@ -638,6 +638,7 @@ if (EXPO.events.feed) { self._refreshLabel(); if(getObjectLength(self.itemsSelected)){ $(EXPO.events.feed.DOMapplyButton).show(); + $(EXPO.events.feed.DOMhint).hide(); } }, /** @@ -1353,6 +1354,8 @@ if (EXPO.events.feed) { this._refreshLabel(); if(getObjectLength(self.itemsSelected)){ $(EXPO.events.feed.DOMapplyButton).show(); + $(EXPO.events.feed.DOMhint).hide(); + } }, @@ -1604,6 +1607,7 @@ if (EXPO.events.feed) { } this.DOMform = document.getElementById(this.opt.formId); + this.DOMhint = document.getElementById(this.opt.filter.hintId); $(this.DOMform).on('submit', function () { submitHandler(); }); @@ -1647,7 +1651,8 @@ if (EXPO.events.feed) { }; // заполнение полей предыдущими значениями $(function () { - if(self.previousSearch){ + if(self.previousSearch.inputs.length){ + $(self.DOMhint).hide(); for (var i = 0; i < self.previousSearch.inputs.length; i++) { // окно выбора тематики if (self.previousSearch.inputs[i].name == 'th'){ @@ -1681,6 +1686,7 @@ if (EXPO.events.feed) { //Если выбраны фильтры то появляется кнопка "применить" if(getObjectLength(self.placesModal.itemsSelected) || getObjectLength(self.subjModal.itemsSelected) ){ $(self.DOMapplyButton).show(); + } });