merged with filter functionlity

templates/client/accounts/feed.html

@@ -28,7 +28,7 @@
                         <div class="csb-selected-items " >
                             <div class="csb-selected  csb-subj-selected dna-template" id="filter-subject-tags">
                                 <div class="csbs-text ">~~text~~</div>
-                            <a class="csbs-del" href="#"  data-checkbox-id="~~id~~" id="subject-tag-remove">x</a>
+                                <a class="csbs-del" href="javascript:void(0);"  data-checkbox-id="~~id~~" id="subject-tag-remove">x</a>
                             </div>
 
                         </div>
@@ -41,7 +41,7 @@
                         <div class="csb-selected-items" >
                             <div class="csb-selected csb-subj-selected dna-template" id="filter-places-tags">
                                 <div class="csbs-text ">~~text~~</div>
-                            <a class="csbs-del " href="#" data-checkbox-id="~~id~~" id="place-tag-remove">x</a>
+                                <a class="csbs-del " href="javascript:void(0);" data-checkbox-id="~~id~~" id="place-tag-remove">x</a>
                             </div>
 
                         </div>
@@ -57,11 +57,11 @@
                         <div class="search-modal-body">
 
                             {% 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-" %}
+                            {% 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-" %}
+                            {% 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 %}
 
                         </div>
@@ -73,14 +73,17 @@
 
             </form>
         </div>
-
+        <div class="filter-hint-block" id="filter-hint-block">
+            <p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p>
         </div>
 
         {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
 
         {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
+        <!--todo: вернуть минификацию-->
+        <!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.events.feed{% if debug %}{% else %}.min{% endif %}.js"></script>-->
 
-<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.events.feed{% if debug %}{% else %}.min{% endif %}.js"></script>
+        <script src="{% static 'client/js/_modules/page.events.feed.js' %}"></script>
         <!--<script src="{% static 'client/js/_modules/block.search.js' %}"></script>-->
 
         <script>
@@ -112,9 +115,6 @@
                     prefix: 'f-p-',
                     deleteId: 'place-tag-remove',
                     labelId: 'filter-place-label'
-
-
-
                 },
                 subject: {
                     id: 'filter-pwSubj',
@@ -138,34 +138,15 @@
                     deleteId: 'subject-tag-remove',
 
                     labelId: 'filter-subject-label'
-
-
                 },
-
                 filter: {
                     wrapperId:'"events-filter-wrap"',
                     bodyId:'events-filter',
-            buttonId:'filter-show-button'
+                    buttonId:'filter-show-button',
-
+                    hintId:'filter-hint-block'
-        },
-        modal:{
-            id:'filter-modal',
-            wrapClass:'search-modal-wrap',
-            size:{
-                'filter-pwSubj':{
-                    width:640,
-                    height:514
-                },
-                'filter-pwPlace':{
-                    width:640,
-                    height:460
-                }
-            }
 
                 }
             });
         </script>
-
+    </div>
 {% endblock %}
-
-

templates/client/popups/place.html

@@ -108,7 +108,7 @@
 				</div>
 			</div>
 			<div class="pwf-buttons-line">
-				<button class="icon-check modal-approve" type="submit">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
+				<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
 				{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
 			</div>
 		</div>

templates/client/popups/theme.html

@@ -76,7 +76,7 @@
 						</div>
 					</div>
 					<div class="pwf-buttons-line">
-						<button class="icon-check modal-approve" type="submit">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
+						<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
 						{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
 					</div>
 				</div>

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;
+		}
 
 
 

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