diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html
index 65cd841f..d02078da 100644
--- a/templates/client/accounts/feed.html
+++ b/templates/client/accounts/feed.html
@@ -17,69 +17,73 @@
 
 {% block page_body %}
     <div class="page-body clearfix events-feed-page">
-    <div class="events-filter-wrap" id="events-filter-wrap">
-        <a rel="nofollow" id="filter-show-button" class="button icon-eye " href="javascript:void(0);">Фильтрация ленты</a>
-
-
-        <div class="events-filter" id="events-filter">
-            <section class="col">
-                <h2><span id="filter-subject-label" data-default="Тематические фильтры не выбраны" data-selected="Тематика">Тематические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwSubj" id="filter-subj-modal-trigger">Изменить</a>):</h2>
-                <div class="events-filter-box c-select-box">
-                    <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>
-                        </div>
+        <div class="events-filter-wrap" id="events-filter-wrap">
+            <a rel="nofollow" id="filter-show-button" class="button icon-eye " href="javascript:void(0);">Фильтрация ленты</a>
+
+
+            <div class="events-filter" id="events-filter">
+                <section class="col">
+                    <h2><span id="filter-subject-label" data-default="Тематические фильтры не выбраны" data-selected="Тематика">Тематические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwSubj" id="filter-subj-modal-trigger">Изменить</a>):</h2>
+                    <div class="events-filter-box c-select-box">
+                        <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="javascript:void(0);"  data-checkbox-id="~~id~~" id="subject-tag-remove">x</a>
+                            </div>
 
-                    </div>
-                </div>
-            </section>
-            <section class="col ">
-                <h2 class="mt-0"><span id="filter-place-label" data-default="Географические фильтры не выбраны" data-selected="Место проведения">Географические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwPlace" id="filter-place-modal-trigger">Изменить</a>):</h2>
-
-                <div class="events-filter-box c-select-box">
-                    <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>
                         </div>
+                    </div>
+                </section>
+                <section class="col ">
+                    <h2 class="mt-0"><span id="filter-place-label" data-default="Географические фильтры не выбраны" data-selected="Место проведения">Географические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwPlace" id="filter-place-modal-trigger">Изменить</a>):</h2>
+
+                    <div class="events-filter-box c-select-box">
+                        <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="javascript:void(0);" data-checkbox-id="~~id~~" id="place-tag-remove">x</a>
+                            </div>
 
+                        </div>
                     </div>
-                </div>
-            </section>
-            <button class="icon-check apply-filter button" type="submit" id="apply-filter-button">{% trans 'Применить' %}</button>
+                </section>
+                <button class="icon-check apply-filter button" type="submit" id="apply-filter-button">{% trans 'Применить' %}</button>
 
-        </div>
-        <form method="post" action="/profile/feed/" class="search_form" id="filter-block-form">{% csrf_token %}
-        <div class="modals">
-            <div class="search-modal-overlay" id="filter-modal">
-                <div class="search-modal-wrap fancybox-skin">
-                    <div class="search-modal-body">
+            </div>
+            <form method="post" action="/profile/feed/" class="search_form" id="filter-block-form">{% csrf_token %}
+            <div class="modals">
+                <div class="search-modal-overlay" id="filter-modal">
+                    <div class="search-modal-wrap fancybox-skin">
+                        <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-" %}
-                        {% 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 %}
 
+                        </div>
+                        <div class="a modal-close fancybox-close">&nbsp;</div>
                     </div>
-                    <div class="a modal-close fancybox-close">&nbsp;</div>
                 </div>
+
             </div>
 
+            </form>
+        </div>
+        <div class="filter-hint-block" id="filter-hint-block">
+            <p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p>
         </div>
 
-        </form>
-    </div>
+        {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
 
-    {% 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>-->
 
-    {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
-{% endblock %}
-{% block scripts %}
-        <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>
@@ -92,76 +96,57 @@
                 closerText: "{% trans ' и еще _ позиции' %}",
                 closerTextSingle:"{% trans ' и еще _ позиция' %}",
                 applyButtonId:'apply-filter-button',
-                place:{
-                    id:'filter-pwPlace',
-                   /**/ selectedItemTemplate:'filter-csb-selected',
-                    ajaxUrl:'http://{{ request.get_host }}/search-form/',
-                    autoCompleteUrl:'http://{{ request.get_host }}/search-form/autocomplete/',
-                    getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
-                    /**/autoCompleteId:'filter-place-complete-block',
-                    /**/filterInputId:'filter-place-filter-input',
-                    modalTrigger:'filter-place-modal-trigger',
-                    /**/selectedItemsContainer:'filter-csb-selected-items',
-                    clearAllButtonClass:'clear-all-button',
-                    applyBtnClass:'modal-approve',
-                    tagsBoxId:'filter-places-tags',
-                    deleteTagClass:'csbs-del',
-                    bodyId:'events-filter-wrap',
-
-                    prefix:'f-p-',
-                    deleteId:'place-tag-remove',
-                    labelId:'filter-place-label'
-
-
-
+                place: {
+                    id: 'filter-pwPlace',
+                    selectedItemTemplate: 'filter-csb-selected',
+                    ajaxUrl: 'http://{{ request.get_host }}/search-form/',
+                    autoCompleteUrl: 'http://{{ request.get_host }}/search-form/autocomplete/',
+                    getParentUrl: 'http://{{ request.get_host }}/search-form/get-parent/',
+                    autoCompleteId: 'filter-place-complete-block',
+                    filterInputId: 'filter-place-filter-input',
+                    modalTrigger: 'filter-place-modal-trigger',
+                    selectedItemsContainer: 'filter-csb-selected-items',
+                    clearAllButtonClass: 'clear-all-button',
+                    applyBtnClass: 'modal-approve',
+                    tagsBoxId: 'filter-places-tags',
+                    deleteTagClass: 'csbs-del',
+                    bodyId: 'events-filter-wrap',
+
+                    prefix: 'f-p-',
+                    deleteId: 'place-tag-remove',
+                    labelId: 'filter-place-label'
                 },
-                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',
+                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'
-
-
+                    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'
-
-                },
-                modal:{
-                    id:'filter-modal',
-                    wrapClass:'search-modal-wrap',
-                    size:{
-                        'filter-pwSubj':{
-                            width:640,
-                            height:514
-                        },
-                        'filter-pwPlace':{
-                            width:640,
-                            height:460
-                        }
-                    }
+                    buttonId:'filter-show-button',
+                    hintId:'filter-hint-block'
 
                 }
             });
         </script>
+    </div>
 {% endblock %}
diff --git a/templates/client/includes/catalog_search.html b/templates/client/includes/catalog_search.html
index 0f08c7a8..0d9be6da 100644
--- a/templates/client/includes/catalog_search.html
+++ b/templates/client/includes/catalog_search.html
@@ -102,7 +102,8 @@
     </form>
 	{% block scripts %}
 	<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
-	<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.search{% if debug %}{% else %}.min{% endif %}.js"></script>
+	<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.search{% if debug %}{% else %}.min{% endif %}.js"></script>-->
+	<script src="{% static 'client/js/_modules/block.search.js' %}"></script>
 	<script>
 
 	EXPO.searchBlock.init({
diff --git a/templates/client/popups/period.html b/templates/client/popups/period.html
index 38832e76..4d7e1ba5 100644
--- a/templates/client/popups/period.html
+++ b/templates/client/popups/period.html
@@ -7,11 +7,11 @@
     <div class="pw-body clearfix">
         <div class="pw-form search_form" >
             <div class="pwf-line period">
-                <div class="pwf-field">
+                <div class="pwf-field ">
                     <label for="dateFrom">{% trans 'с' %}</label>
                     {{ search_form.fr }}
                 </div>
-                <div class="pwf-field">
+                <div class="pwf-field ">
                     <label for="dateTo">{% trans 'по' %}</label>
                     {{ search_form.to }}
                 </div>
diff --git a/templates/client/popups/place.html b/templates/client/popups/place.html
index 00be3051..baf50fba 100644
--- a/templates/client/popups/place.html
+++ b/templates/client/popups/place.html
@@ -65,6 +65,7 @@
 
 							</div>
 							<div class="q-sel">
+								<a class="clear" href="#">{% trans 'Сбросить выбранное' %}</a>
 								<div class="q-sel-title">{% trans 'Быстрый выбор' %}:</div>
 								<ul>
                                     <li><a href="#" data-name="ci" data-id="-2960561">{% trans 'Москва' %}</a></li>
@@ -77,14 +78,14 @@
 
 								</ul>
 
-								<a class="clear" href="#">{% trans 'Сбросить выбранные регионы' %}</a>
+
 							</div>
 						</div>
 					</div>
 				</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>
diff --git a/templates/client/popups/theme.html b/templates/client/popups/theme.html
index ce4aee38..2a4a7a4d 100644
--- a/templates/client/popups/theme.html
+++ b/templates/client/popups/theme.html
@@ -17,12 +17,15 @@
 						<div class="pwf-field">
 							<label class="check"><input type="checkbox" class="topicChecks"  name="sType" value="conf" id="{{ prefix }}conference-check"/>конференции</label>
 						</div>
+						{% comment %}
+						{# заморожено #}
 						<div class="pwf-field">
 							<label class="check"><input type="checkbox" class="topicChecks" name="sType" value="smnr" id="{{ prefix }}seminar-check"/>семинары</label>
 						</div>
 						<div class="pwf-field">
 							<label class="check"><input type="checkbox" class="topicChecks" name="sType" value="webn" id="{{ prefix }}webinar-check"/>вебинары</label>
 						</div>
+						{% endcomment %}
 					</div>
 					<div class="c-select-box-wrap">
 							<div class="wait-ajax absolute" style="display: none;"><img src="/static/client/img/ajax-loader.gif" alt=""></div>
@@ -73,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>
diff --git a/templates/client/static_client/css/main.css b/templates/client/static_client/css/main.css
index a0d27838..88ef06c7 100644
--- a/templates/client/static_client/css/main.css
+++ b/templates/client/static_client/css/main.css
@@ -3208,8 +3208,10 @@ a.icon-big-ical {
 
 .pw-form .pwf-line > div,
 .pw-form .pwf-buttons-line > div {
-	display: table-cell;
+	/*display: table-cell;*/
+	display: inline-block;
 	vertical-align: middle;
+	width: auto;
 }
 
 
@@ -4029,6 +4031,8 @@ form.s-message {
 .c-select-box .csb-menu .q-sel {
 	width: 190px;
 	float: right;
+	margin-top: 1em;
+
 }
 
 .c-select-box .csb-menu .q-sel .q-sel-title {
@@ -4048,6 +4052,7 @@ form.s-message {
 	text-decoration: none;
 	border-bottom: 1px dashed;
 	color: #a2a2a2;
+	margin-left: 0;
 }
 
 .c-select-box .csb-menu .q-sel  a.clear:hover {
@@ -11107,18 +11112,9 @@ hr + .rq-note {
 
 @media only screen and (min-width: 1260px) {
 
-	/*.page-wrap > header .logo,
-	.page-wrap .layout .layout-wrap aside {
-		width: 21%;
-	}
-
-	.page-wrap .layout.mp-announces .layout-wrap .mcl {
-		width: 73.1%;
-	}*/
 
 	.header-body .header-top {
-		padding-right: 510
-		px;
+		padding-right: 510px;
 	}
 
 	.header-body .header-top .ht-main {
@@ -11603,7 +11599,7 @@ hr + .rq-note {
 
 
 .map_info_block { width: 100%;font-family: 'dindisplay_pro', sans-serif;}
-.map_info_block tr th { text-align: left; vertical-align: top; width: 15%; font-weight: 500px; color: #a2a2a2; font-size: 14px; padding: 9px 0 0 0;}
+.map_info_block tr th { text-align: left; vertical-align: top; width: 15%; font-weight: 500; color: #a2a2a2; font-size: 14px; padding: 9px 0 0 0;}
 .map_info_block tr td { text-align: left; vertical-align: top; border-bottom: 1px dotted #ccc; padding: 8px 0; font-size: 16px; color: #424242; font-weight: 500;}
 .map_info_block tr td.width_1 { width: 35%;}
 .map_info_block tr td p { padding: 1px 0; margin: 0 0 0 0;}
@@ -12068,6 +12064,7 @@ hr + .rq-note {
 
 	.events-feed-page{
 		margin-top: -14px;
+		margin-bottom: 2em;
 	}
 	.events-feed-page h2{
 		font-size: 16px;
@@ -12123,8 +12120,6 @@ hr + .rq-note {
 		color: #ff6600;
 	}
 		.events-filter .col{
-			/*width: 48%;*/
-			/*float: left;*/
 			margin-left: 2%;
 			-moz-box-sizing: border-box;
 			box-sizing: border-box;
@@ -12163,6 +12158,7 @@ hr + .rq-note {
 	.events-filter-wrap{
 		position: relative;
 		overflow: visible;
+		margin-bottom: 1em;
 	}
 	.events-filter-wrap .button{
 		margin-top: -40px;
@@ -12229,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;
+		}
 
 
 
@@ -12253,6 +12262,11 @@ hr + .rq-note {
 	.in-search-form .clear-all-button:active, .search-form-wrap .clear-all-button:active{
 		background-position: -385px  -89px;
 	}
+	.in-search-form .pw-period .pwf-field.err input{
+		border-width: 2px;
+		border-color: #D80000;
+	}
+
 /******************************\
 # form validation
 \******************************/
diff --git a/templates/client/static_client/js/_modules/block.search.js b/templates/client/static_client/js/_modules/block.search.js
index 249c164e..93ac7402 100644
--- a/templates/client/static_client/js/_modules/block.search.js
+++ b/templates/client/static_client/js/_modules/block.search.js
@@ -491,7 +491,9 @@ if (EXPO.searchBlock){
 						for (var prop in self.sublist) {
 							for (var prop2 in self.sublist[prop]) {
 								if (prop2 == ui.item.value){
-									firstTime = false;
+									if($('#tid_'+ui.item.value+'[name="'+ui.item.name+'"]:checked').length){
+										firstTime = false;
+									}
 								}
 
 							}
@@ -702,7 +704,7 @@ if (EXPO.searchBlock){
 			},
 			// кнопка применить
 			applyHandler: function (it) {
-
+				$waiter.show();
 			}
 
 
@@ -998,7 +1000,7 @@ if (EXPO.searchBlock){
 							tagsPanelToggle();
 						},
 						tagsPanelToggle = function () {
-							if($selectedItemsWrap.children('.'+tagClass).length && $selectedItemsWrap.children('.'+tagClass)[0].getAttribute(tagIdAttribute) != "~~id~~"){
+							if($selectedItemsWrap.find('.'+tagButtonClass).length && $selectedItemsWrap.find('.'+tagButtonClass)[0].getAttribute(tagIdAttribute) != "~~id~~"){
 								$selectedItemsWrap.addClass('visible');
 							}else{
 								$selectedItemsWrap.removeClass('visible');
@@ -1045,6 +1047,9 @@ if (EXPO.searchBlock){
 						if(DOMSublistInner){
 							selectSublist(this);
 						}
+						if(DOMSublistInner && $(DOMSublistInner).find('.'+checkboxClass)[0].value != '~~id~~'){
+							refreshTags(this);
+						}
 					}else{
 
 						//Если выбран родитель
@@ -1067,6 +1072,7 @@ if (EXPO.searchBlock){
 						//убрать все дочерние
 						if(DOMSublistInner){
 							unSelectSublist(this);
+							refreshTags(this);
 						}
 
 					}
@@ -1379,7 +1385,10 @@ if (EXPO.searchBlock){
 						for (var prop in self.curDNA) {
 							for (var prop2 in self.curDNA[prop]) {
 								if (prop2 == ui.item.value){
-									firstTime = false;
+									if($('#id_'+ui.item.value+':checked').length){
+										firstTime = false;
+									}
+
 								}
 
 							}
@@ -1617,24 +1626,33 @@ if (EXPO.searchBlock){
 						thatVal,
 						thatValInt,
 						bfr;
-					if(itId == self.opt.dateFrom){
-						thatId = $dateTo[0].getAttribute('id');
-						thatVal = $dateTo[0].value;
-					}else {
-						thatId = $dateFrom[0].getAttribute('id');
-						thatVal = $dateFrom[0].value;
-					}
-					thatValInt = Date.parse(thatVal);
-					if(thatValInt > itValInt &&  thatValInt != 0 && thatValInt){
-						bfr = document.getElementById(itId).value;
-						document.getElementById(itId).value = document.getElementById(thatId).value;
-						document.getElementById(thatId).value = bfr;
-					}else if(thatValInt < itValInt &&  thatValInt != 0 && thatValInt){
-						bfr = document.getElementById(thatId).value;
-						document.getElementById(thatId).value = document.getElementById(itId).value;
-						document.getElementById(itId).value = bfr;
-					}
 
+					/**
+					 * check if it is a valid date
+					 */
+					if (self.validate()){
+						$(it).parent('.pwf-field').removeClass('err');
+						if(itId == self.opt.dateFrom){
+							thatId = $dateTo[0].getAttribute('id');
+							thatVal = $dateTo[0].value;
+						}else {
+							thatId = $dateFrom[0].getAttribute('id');
+							thatVal = $dateFrom[0].value;
+						}
+						thatValInt = Date.parse(thatVal);
+						/**
+						 * swap values between date fields
+						 */
+						if(thatValInt > itValInt &&  thatValInt != 0 && thatValInt){
+							bfr = document.getElementById(itId).value;
+							document.getElementById(itId).value = document.getElementById(thatId).value;
+							document.getElementById(thatId).value = bfr;
+						}else if(thatValInt < itValInt &&  thatValInt != 0 && thatValInt){
+							bfr = document.getElementById(thatId).value;
+							document.getElementById(thatId).value = document.getElementById(itId).value;
+							document.getElementById(itId).value = bfr;
+						}
+					}
 
 				};
 			this.$dateFrom = $dateFrom;
@@ -1702,6 +1720,37 @@ if (EXPO.searchBlock){
 				this.$dateTo.val('');
 				this.$modalTrigger.text(this.$modalTrigger.attr('data-default'));
 
+			},
+			/**
+			 * checks input fields to have valid date values, if not - adds err class to its container
+			 * @returns {boolean}
+			 */
+			validate: function () {
+				var	toVal = this.$dateTo.val(),
+					fromVal = this.$dateFrom.val(),
+					toValArr = toVal.split('.'),
+					fromValArr = fromVal.split('.'),
+					timestamps =[],
+					validationResult = true;
+				timestamps[0] = Date.parse(toValArr[1]+'.'+toValArr[0]+'.'+toValArr[2]);
+				timestamps[1] = Date.parse(fromValArr[1]+'.'+fromValArr[0]+'.'+fromValArr[2]);
+
+				if (!timestamps[0] && $.trim(toVal) != ''){
+					this.$dateTo.parent('.pwf-field').addClass('err');
+					validationResult = false;
+				}else{
+					this.$dateTo.parent('.pwf-field').removeClass('err');
+				}
+
+				if (!timestamps[1] && $.trim(fromVal) != ''){
+					this.$dateFrom.parent('.pwf-field').addClass('err');
+					validationResult = false;
+				}else{
+					this.$dateFrom.parent('.pwf-field').removeClass('err');
+
+				}
+				return validationResult;
+
 			},
 			applyHandler: function (it) {
 			}
@@ -1961,10 +2010,7 @@ if (EXPO.searchBlock){
 						if ( item.cat != currentCategory && item.cat) {
 							ul.append( "<li class='ui-autocomplete-category'>" + item.cat + "</li>" );
 							currentCategory = item.cat;
-						}/*else if(item.url){
-						 ul.append( "<li class='ui-menu-item'><a class='complete-link' href="+item.url+" >" + item.label + "</a></li>" );
-
-						 }*/
+						}
 						that._renderItemData( ul, item );
 					});
 				}
@@ -2050,15 +2096,18 @@ if (EXPO.searchBlock){
 			this.modalWindow = new common.Modal(self.settings.modal);
 
 			this.periodModal.applyHandler = function () {
-				self.modalWindow.close();
-				$(self.DOMform).submit();
+				if(this.validate()){
+					$waiter.show();
+					$(self.DOMform).submit();
+				}
+
 			};
 			this.placesModal.applyHandler = function () {
-				self.modalWindow.close();
+				$waiter.show();
 				$(self.DOMform).submit();
 			};
 			this.subjModal.applyHandler = function () {
-				self.modalWindow.close();
+				$waiter.show();
 				$(self.DOMform).submit();
 			};
 
@@ -2070,6 +2119,7 @@ if (EXPO.searchBlock){
 				self.modalWindow.open();
 				return false;
 			});
+
 			// заполнение полей предыдущими значениями
 			$(function () {
 				if(self.previousSearch){
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();
+
 				 }
 			});
 
diff --git a/templates/client/static_client/js_min/_modules/block.search.min.js b/templates/client/static_client/js_min/_modules/block.search.min.js
index 8acef25c..cf064854 100644
--- a/templates/client/static_client/js_min/_modules/block.search.min.js
+++ b/templates/client/static_client/js_min/_modules/block.search.min.js
@@ -1 +1 @@
-var EXPO=EXPO||{};EXPO.searchBlock?console.warn("WARNING: EXPO.searchBlock is already defined!"):EXPO.searchBlock=function(){var e={};e.settings={place:{id:"pw-place",selectedItemTemplate:"csb-selected",ajaxUrl:"http://hit.expomap.ru/search-form/"},subject:{id:"pw-subj",ajaxUrl:"http://hit.expomap.ru/search-form/"}},e.lang={};var t=EXPO.common,i=function(e){var t=Object.keys(e).map(function(t){return encodeURIComponent(t)+"="+encodeURIComponent(e[t])}).join("&");return"?"+t},n=function(e,t,i){e||(e=""),$.ajax({type:"GET",url:t,data:e,success:function(e){return"function"!=typeof i?e:void i(e)}})},a=function(e,t,i){return e.hasOwnProperty(t)&&(e[i]=e[t]),this},s=function(e){var t,i=0;for(t in e)e.hasOwnProperty(t)&&i++;return i},l=function(e,t){var i=$("#"+e),n="",a=EXPO.searchBlock.settings.closerText,s=EXPO.searchBlock.settings.closerTextSingle,l="";return $element=i.find(".csbs-text"),$element.length>2?$element.eq(0).text().length<t?(l=",",n+=$element.eq(0).text()+l+$element.eq(1).text()+a.replace("_",$element.length-2)):n+=$element.eq(0).text()+a.replace("_",$element.length-1):2==$element.length?$element.eq(0).text().length+$element.eq(1).text().length<t?(l=",",n+=$element.eq(0).text()+l+$element.eq(1).text()):$element.eq(0).text().length<t?(l=",",n+=$element.eq(0).text()+l+$element.eq(1).text()+s.replace("_",$element.length-2)):n+=$element.eq(0).text()+s.replace("_",$element.length-1):$element.length?n+=$element.eq(0).text():n=!1,n},r=$(".wait-ajax.absolute"),o=function(e){this.opt=e;var i,n=this,a=0,s=$("#"+n.opt.subjectTriggerWrapId),o=n.opt.id,c=$("#"+o),d=$(".csb-menu-input",c),u=$(".csb-selected-items",c),h=n.opt.defaultOn,p=n.opt.applyBtnClass,m=$("#"+n.opt.modalTrigger),f=function(){r.hide()},g=function(){var e,t=16;e=l(n.opt.selectedItemsContainer,t),e&&"~~text~~"!=e&&"~~text~~..."!=e?(m.text(e),m.siblings("."+n.opt.clearAllButtonClass).addClass("active")):(m.text(m.data("default")),m.siblings("."+n.opt.clearAllButtonClass).removeClass("active"))};this.$modalInst=$("#"+o),this.itemsSelected={},this.sublist={},this.$inputFilter=$("#"+n.opt.filterInputId),this.$selectedItemsWrap=u,$(function(){for($(".topicChecks",s).on("change",function(){$(this).prop("checked")?n._setVisible($(this).val()):n._setUnvisible($(this).val())}),a=0;a<h.length;a++)i=$("#"+h[a]),i.prop("checked",!0),i.trigger("change");c.on("click","a.trigger",function(){var e=$(this).attr("data-name"),t=$(this).attr("data-id"),i=$(this).attr("data-template-id"),a=$(this).siblings(".dna-container");return"true"==$(this).attr("data-sub")&&$(this).parent().hasClass("level1")&&(a.children().length?n._slideToggle(a,$(this).parent()):(r.show(),n._renderSublist({name:e,id:t},i,f),$(this).parent().addClass("active"))),!1}),d.on("change",function(e,i){var a=$(this).attr("id"),s=$(this).closest(".custom-radio-check"),l=$(this).closest(".level"),r=l.parent().closest(".level").children(".custom-radio-check").find(".csb-menu-input"),o=l.children(".sublist");if(!i){if(s.hasClass("active")?s.removeClass("active"):s.addClass("active"),this.checked){var c=$(this).closest(".level").find(".trigger").first().text(),d={text:c,id:a};if(u.hasClass("visible")||u.addClass("visible"),n._addTag(a,d),o.length)$(".csb-menu-input",o).each(function(){var e=this.getAttribute("id"),i=($(this).closest(".level").find(".trigger").first().text(),t.closest(this,"custom-radio-check"));this.checked=!0,n._destroyTag(e),t.addClass(i,"active")});else if(l=l.parent().closest(".level"),$(".csb-menu-input",l.find(".sublist")).length==$(".csb-menu-input:checked",l.find(".sublist")).length){var h=r[0].getAttribute("id"),p=r.closest(".level").find(".trigger").first().text(),m=t.closest(this,"custom-radio-check"),f=t.closest(m.parentNode.parentNode,"level"),v={text:p,id:h};$(".csb-menu-input:checked",l.find(".sublist")).each(function(){n._destroyTag(this.getAttribute("id"))}),r.prop("checked",!0),t.addClass($(f).find(".custom-radio-check")[0],"active"),n._addTag(h,v)}}else if(n._destroyTag(a),u.children(".dna-clone").length||u.removeClass("visible"),o.length)$(".csb-menu-input",o).each(function(){var e=$(this).attr("id"),i=t.closest(this,"custom-radio-check");this.checked=!1,t.removeClass(i,"active"),n._destroyTag(e)});else if(r.length&&r[0].checked){var m=t.closest(r[0],"custom-radio-check"),b=t.closest(m,"level"),k=b.querySelector(".sublist");r.prop("checked",!1),t.removeClass(m,"active"),n._destroyTag(r.attr("id")),$(".csb-menu-input:checked",k).each(function(){var e=this.getAttribute("id"),i=t.closest(this,"level").querySelector(".trigger").textContent,a={text:i,id:e};n._addTag(e,a)})}g()}}),$(".csbs-del",u).on("click",function(){var e=$(this).attr("data-checkbox-id"),t=$("#"+e);return t.prop("checked",!1),t.trigger("change"),dna.destroy(n.itemsSelected[e]),u.children(".dna-clone").length||u.removeClass("visible"),!1}),$(".clear",c).on("click",function(){return n.resetList(),!1}),n._autocompleteInit(),$("."+p,c).on("click",function(){return n.applyHandler(this),!1}),m.siblings("."+n.opt.clearAllButtonClass).on("click",function(){n.resetList()})})};o.prototype={_getAjax:function(e,t){var i=this;e||(e=""),r.css({display:"block"}),$.ajax({type:"GET",url:i.opt.ajaxUrl,data:e,success:function(e){return"function"!=typeof t?e:(r.hide(),void t(e))}})},_setVisible:function(e){var t=this;$("."+e,t.$modalInst).addClass("visible")},_setUnvisible:function(e){var t=this,i=$("."+e,t.$modalInst);i.find('input[type="checkbox"]').each(function(){var e=$(this);e.prop("checked")&&(e.prop("checked",!1),e.trigger("change"))}),i.find(".dna-container").each(function(){$(this).children().length&&$(this).addClass("hidden")}),i.removeClass("visible")},_checkCheckBox:function(e,t){var i,n=this;"th"==t?i=$("#tid_"+e,n.$modalInst):"tg"==t&&(i=$("#tgid_"+e,n.$modalInst)),i.length&&!i.prop("checked")&&(i.prop("checked",!0),i.trigger("change"))},check:function(e,t){var i,n=this;"th"==t?i=$("#tid_"+e,n.$modalInst):"tg"==t&&(i=$("#tgid_"+e,n.$modalInst)),i.length&&(i.prop("checked",!0),i.trigger("change"),i.parent().addClass("active"))},_autocompleteInit:function(){var e,t,i,l=this,o=l.$inputFilter.attr("data-form"),c=$("#"+l.opt.autoCompleteId),d=!0,u=function(e,t){r.show();var i=!0;for(var a in l.sublist)for(var o in l.sublist[a])o==t.item.value&&(i=!1);if($("#tid_"+t.item.value+'[name="'+t.item.name+'"]:checked').length&&(i=!1),i){var c,d=$("#tid_"+t.item.value+'[name="'+t.item.name+'"]'),u=function(e){s(e)?l._loadParentTree(e,function(){l._checkCheckBox(t.item.value,"tg"),r.hide()}):(r.hide(),console.warn())};d.length?(r.hide(),d.prop("checked",!0),d.trigger("change")):(c={id:t.item.value,name:t.item.name},n(c,l.opt.getParentUrl,u))}},h=function(t){for(e=t,i=0;i<e.length;++i)a(e[i],"text","label");for(i=0;i<e.length;++i)a(e[i],"id","value");l.$inputFilter.hasClass("ui-autocomplete-input")?l.$inputFilter.autocomplete("search",""):(l.$inputFilter.autocomplete({source:e,minLength:0,appendTo:c,select:function(e,t){l.$inputFilter.val(""),l.$inputFilter.trigger("keyup"),u(e,t),e.preventDefault()}}),l.$inputFilter.autocomplete("search",""),d=!1)};l.$inputFilter.attr("autocomplete","on"),l.$inputFilter.on("keyup",function(e){return t=$(this).val(),e.stopImmediatePropagation(),t.length>2&&d?(n({term:t,form:o},l.opt.autoCompleteUrl,h),d=!1):0!=t.length||d||l.$inputFilter.hasClass("ui-autocomplete-input")&&(l.$inputFilter.autocomplete("destroy"),d=!0),!1}).click(function(){return!1})},_renderSublist:function(e,t,i){var n=this,a=0,s=t+"-sub",l=function(e){if(e.length){for(n.sublist[s]={},a;a<e.length;a++)n.sublist[s][e[a].id]=dna.clone(t,e[a]);i(e.length)}else r.hide()};n._getAjax(e,l)},_loadParentTree:function(e,t,i){var n,a,s=this,l=e,o=function(){r.hide(),i||0===i?t(i):t()};r.show(),n={name:l.name,id:l.id},a=$("#tid_"+l.id).closest(".level").children(".trigger").attr("data-template-id"),s._renderSublist(n,a,o)},_destroyTag:function(e){var t=this;t.itemsSelected[e]&&dna.destroy(t.itemsSelected[e])},_addTag:function(e,t){var i=this;i.itemsSelected[e]=dna.clone(i.opt.selectedItemTemplate,t)},_slideToggle:function(e,t){e.hasClass("hidden")?(e.removeClass("hidden"),t.addClass("active")):(e.addClass("hidden").find("ul").addClass("hidden"),t.removeClass("active"))},resetList:function(){var e=this;for(var t in e.itemsSelected)e.itemsSelected.hasOwnProperty(t)&&($("#"+t,e.$selfContainer).prop("checked",!1).trigger("change"),dna.destroy(e.itemsSelected[t]));e.$selectedItemsWrap.removeClass("visible")},applyHandler:function(){}};var c=function(e){this.opt=e;var i=this,a=$("#"+i.opt.id),s=$('input[type="checkbox"]',a),o=$(".csb-selected-items",a),c=$(".csb-selected-items",a)[0],d=$("#"+i.opt.modalTrigger),u=i.opt.applyBtnClass,h="id_",p=function(){var e,t=16;e=l(i.opt.selectedItemsContainer,t),e&&"~~text~~"!=e&&"~~text~~..."!=e?(d.text(e),d.siblings("."+i.opt.clearAllButtonClass).addClass("active")):(d.text(d.data("default")),d.siblings("."+i.opt.clearAllButtonClass).removeClass("active"))};this.curDNA={},this.itemsSelected={},this.selectedWrap=o,this.$selfContainer=a,this.$modal=a,this.idPrefix=h,this.isReceived=!0,this.$inputFilter=$("#"+i.opt.filterInputId),$(function(){i._autocompleteInit(),a.on("click","a.trigger",function(){var e=$(this).attr("data-name"),n=$(this).attr("data-id"),a=this,s=$(this).attr("data-template-id"),l=$(this).siblings(".dna-container"),o=function(){var e=t.closest(a,"level"),i=e.querySelector(".csb-menu-input");$(".csb-menu-input",l).each(function(){var e=t.closest(this,"custom-radio-check");this.selected||i.checked&&(this.checked=!0,t.addClass(e,"active"))}),r.hide()};return"true"==$(this).attr("data-sub")&&($(this).parent().hasClass("level1")?l.children().length?i._slideToggle(l,$(this).parent()):(r.show(),i._renderSublist({name:e,id:n},s,o)):$(this).parent().hasClass("level2")&&(l.children().length?i._slideToggle(l,$(this).parent()):(i._renderNested({name:e,id:n},o,s,n),$(this).parent().addClass("active")))),!1}),s.on("change",function(){var e=(this.getAttribute("id"),"custom-radio-check"),n=(t.closest(this,e),"level"),a="active",s="sublist",l="csb-menu-input",r="level1",d="csb-selected",u="csbs-del",h="trigger",m="data-checkbox-id",f=t.closest(this,n),g=0==t.hasClass(f,r)?t.closest(f.parentNode,n):f,v=g.querySelector("."+l),b=g.querySelector("."+s),k=f.querySelector("."+s),C=t.closest(this,r),y=C.querySelector("."+l),_=function(e){var i=t.closest(e,n)||this,a=i.querySelector("."+s);$("."+l,a).each(function(){w(this)})},x=function(e){var i=t.closest(e,n)||this,a=i.querySelector("."+s);$("."+l,a).each(function(){I(this)})},S=function(i){var s,r=t.closest(i,n);s=t.hasClass(r,"level1")?r:t.closest(r.parentNode,n),t.addClass(s.querySelector("."+e),a),s.querySelector("."+l).checked=!0},T=function(i){var s=t.closest(i,n),r=t.closest(s.parentNode,n)||s;t.removeClass(r.querySelector("."+e),a),r.querySelector("."+l).checked=!1},w=function(i){var n=t.closest(i,e);t.addClass(n,a),i.checked=!0},I=function(i){var n=t.closest(i,e);t.removeClass(n,a),i.checked=!1},B=function(){var i=(t.closest(b,s),$(b).children("li").children("."+e).find("."+l+":checked")),n=i.length,a=$(b).children("li").children("."+e).find("."+l).length;return a==n&&0!=n?!0:!1},F=function(){var e=g.querySelector("."+l);return e.checked?!0:!1},A=function(i){{var a,r,o,p=t.closest(i,s),g=t.closest(i,n),v=g.querySelector("."+s),b=c.querySelectorAll("."+d),k=p.querySelector("."+s)?$("."+l+":checked",p.querySelector("."+s)):null,C=(k?k.length:null,[]),y=[],_=0,x=0,S=i.getAttribute("id"),T=0,w=0,I=0,B=0;f.querySelector("."+h).innerHTML}if(v){for(a=$(v).children("li").children("."+e).find("."+l+":checked"),B;B<a.length;B++)r=a[B].getAttribute("id"),C.push(r);for(I;I<b.length;I++)r=b[I].querySelector("."+u).getAttribute(m),"~~id~~"!=r&&y.push(r);for(_=y.length,x=C.length,T=0;_>T;T++)for(o=y[T],w=0;x>w;w++)o==C[w]&&D(a[w]);for(T=0;_>T;T++)o=y[T],o==S&&D(i)}else for(T=0;_>T;T++)o=y[T],o==S&&D(S)},D=function(e){var t=e.getAttribute("id");i._destroyTag(t),O()},M=function(e){var a=t.closest(e,n),s=a.querySelector("."+h),l=s.innerHTML,r=e.getAttribute("id"),o={id:r,text:l};i._addTag(r,o),O()},O=function(){o.children("."+d).length&&"~~id~~"!=o.children("."+d)[0].getAttribute(m)?o.addClass("visible"):o.removeClass("visible")},P=function(){var t=$(b).children("li").children("."+e).find("."+l+":checked");t.each(function(){M(this)})},q=function(){var t=$(b).children("li").children("."+e).find("."+l+":checked");t.each(function(){D(this)})};this.checked?(B()?(S(this),w(this),A(v),M(v),q(b),v.getAttribute("id")!=y.getAttribute("id")||y.checked||(w(y),A(y),M(y))):(w(this),A(this),M(this)),k&&_(this)):(F()?(T(this),I(this),A(v),D(v),P(b),y.checked&&(I(y),A(y),D(y))):(I(this),A(this),D(this)),k&&x(this)),p()}),$(".csbs-del",o).on("click",function(){var e=$(this).attr("data-checkbox-id"),t=$("#"+e);return t.prop("checked",!1),t.trigger("change"),dna.destroy(i.itemsSelected[e]),o.children(".dna-clone").length||o.removeClass("visible"),!1}),$(".clear",a).on("click",function(){return i.resetList(),!1}),$(".q-sel a",a).on("click",function(){var e=$(this),t=e.attr("data-name"),a=e.attr("data-id"),s={name:t,id:a},l=function(e){i._loadParentTree(e,function(){i._checkCheckBox(a)})};return n(s,i.opt.getParentUrl,l),!1}),$("."+u,a).on("click",function(){return i.applyHandler(this),!1}),d.siblings("."+i.opt.clearAllButtonClass).on("click",function(){i.resetList()})})};c.prototype={_getAjax:function(e,t){var i=this;e||(e=""),$.ajax({type:"GET",url:i.opt.ajaxUrl,data:e,success:function(e){return"function"!=typeof t?(i.rawData=e,e):(i.rawData=e,void t(e))}})},_renderSublist:function(e,t,i){var n=this,a=0,s=t+"-sub",l=function(e){if(e.length){for(n.curDNA[s]={},a;a<e.length;a++)n.curDNA[s][e[a].id]=dna.clone(t,e[a]);$("."+t).parents(".level1").addClass("active"),i(e.length)}else r.hide()};n._getAjax(e,l)},_renderNested:function(e,t,n,a){var s=this,l=i(e);dna.load(n,s.opt.ajaxUrl+l,{callback:t,container:s.curDNA[n][a]})},_checkCheckBox:function(e){var t=this,i=$("#id_"+e,t.$selfContainer);i.length&&!i.prop("checked")&&(i.prop("checked",!0),i.trigger("change"))},selectTag:function(e){var t=!0,i=this,a=function(){for(var a in i.curDNA)for(var s in i.curDNA[a])s==e.id&&(t=!1);if($("#id_"+e.id+":checked").length&&(t=!1,$("#id_"+e.id+":checked").trigger("change")),t){i.isReceived=!1;var l,r=$("#id_"+e.id),o=function(t){i._loadParentTree(t,function(){i._checkCheckBox(e.id),i.isReceived=!0}),r=$("#id_"+e.id)};r.length?(r.prop("checked",!0),r.trigger("change"),i.isReceived=!0):(l={id:e.id,name:e.name},n(l,i.opt.getParentUrl,o))}else $("#id_"+e.id).prop("checked",!0),$("#id_"+e.id).trigger("change")};this.wait(a)},wait:function(e,t){var i,n=this,a=function(e,t,n){e.isReceived&&(n?t(n):t(),clearInterval(i))};i=setInterval(function(){a(n,e,t)},100)},check:function(e){var t=this,i=$("#id_"+e,t.$selfContainer);i.length&&!i.prop("checked")&&(i.prop("checked",!0),i.trigger("change"))},_slideToggle:function(e,t){e.hasClass("hidden")?(t.addClass("active"),e.removeClass("hidden")):(t.removeClass("active"),e.addClass("hidden").find("ul"))},_destroyTag:function(e){var t=this;t.itemsSelected[e]&&dna.destroy(t.itemsSelected[e])},_addTag:function(e,t){var i=this;i.itemsSelected[e]=dna.clone(i.opt.selectedItemTemplate,t)},resetList:function(){var e=this;for(var t in e.itemsSelected)e.itemsSelected.hasOwnProperty(t)&&($("#"+t,e.$selfContainer).prop("checked",!1).trigger("change"),dna.destroy(e.itemsSelected[t]));e.selectedWrap.removeClass("visible")},_autocompleteInit:function(){var e,t,i,s=this,l=s.$inputFilter.attr("data-form"),r=$("#"+s.opt.autoCompleteId),o=!0,c=function(e,t){var i=!0;for(var a in s.curDNA)for(var l in s.curDNA[a])l==t.item.value&&(i=!1);if($("#id_"+t.item.value+":checked").length&&(i=!1),i){var r,o=$("#id_"+t.item.value),c=function(e){s._loadParentTree(e,function(){s._checkCheckBox(t.item.value)}),o=$("#id_"+t.item.value)};o.length?(o.prop("checked",!0),o.trigger("change")):(r={id:t.item.value,name:t.item.name},n(r,s.opt.getParentUrl,c)),s.$inputFilter.val(t.item.label)}},d=function(t){for(e=t,i=0;i<e.length;++i)a(e[i],"text","label");for(i=0;i<e.length;++i)a(e[i],"id","value");s.$inputFilter.hasClass("ui-autocomplete-input")?s.$inputFilter.autocomplete("search",""):(s.$inputFilter.autocomplete({source:e,minLength:0,appendTo:r,select:function(e,t){c(e,t),s.$inputFilter.val(""),s.$inputFilter.trigger("keyup"),e.preventDefault()}}),s.$inputFilter.autocomplete("search",""),o=!1)};s.$inputFilter.attr("autocomplete","on"),s.$inputFilter.on("keyup",function(e){return t=$(this).val(),e.stopImmediatePropagation(),t.length>2&&o?(n({term:t,form:l},s.opt.autoCompleteUrl,d),o=!1):0!=t.length||o||s.$inputFilter.hasClass("ui-autocomplete-input")&&(s.$inputFilter.autocomplete("destroy"),o=!0),!1}).click(function(){return!1})},_loadParentTree:function(e,t,i){var n,a,l,o,c=this,d=e,u=$("#id_"+d.id),h=function(e){var n=$("#id_"+d.id),u=function(){r.hide(),i||0===i?t(i):t()};r.hide(),n.length&&s(c.curDNA[a+"-sub"])==e&&(l={name:d.name,id:d.id},r.show(),o=$("#id_"+d.id).closest(".level").children(".trigger").attr("data-template-id"),c._renderNested(l,u,o,d.id))},p=function(){r.hide(),i||0===i?t(i):t()};r.show(),d.hasOwnProperty("parent")?u.length?(l={name:d.name,id:d.id},o=u.closest(".level").children(".trigger").attr("data-template-id"),c._renderNested(l,function(){r.hide(),t()},o,d.id)):(n={name:d.parent.name,id:d.parent.id},a=$("#id_"+d.parent.id).closest(".level").children(".trigger").attr("data-template-id"),c._renderSublist(n,a,h)):(n={name:d.name,id:d.id},a=$("#id_"+d.id).closest(".level").children(".trigger").attr("data-template-id"),c._renderSublist(n,a,p))},applyHandler:function(){}};var d=function(e){this.opt=e;var t=this,i=$("#"+t.opt.dateFrom),n=$("#"+t.opt.dateTo),a=$("#"+t.opt.id),s=$("#"+t.opt.modalTrigger),l=t.opt.applyBtnClass,r=function(){var e="",t=s.data("lng-to"),a=s.data("lng-from"),l=$.trim(n.val()),r=$.trim(i.val());return""!=l&&""!=r?e=a+": "+r+" "+t+": "+l+".":""!=l&&""==r?e=t+": "+l+".":""==l&&""!=r&&(e=a+": "+r+"."),e},o=function(e){""!=e?(s.text(e).siblings(".trigger-label").addClass("hidden"),s.siblings("."+t.opt.clearAllButtonClass).addClass("active")):(s.text(s.data("default")).siblings(".trigger-label").removeClass("hidden"),s.siblings("."+t.opt.clearAllButtonClass).removeClass("active"))},c=function(e){var a,s,l,r,o=e.getAttribute("id"),c=e.value,d=Date.parse(c);o==t.opt.dateFrom?(a=n[0].getAttribute("id"),s=n[0].value):(a=i[0].getAttribute("id"),s=i[0].value),l=Date.parse(s),l>d&&0!=l&&l?(r=document.getElementById(o).value,document.getElementById(o).value=document.getElementById(a).value,document.getElementById(a).value=r):d>l&&0!=l&&l&&(r=document.getElementById(a).value,document.getElementById(a).value=document.getElementById(o).value,document.getElementById(o).value=r)};this.$dateFrom=i,this.$dateTo=n,this.$modalTrigger=s,$(function(){$.datepicker.setDefaults($.datepicker.regional.ru),i.datepicker({dateFormat:"dd.mm.yy",showOn:"button",showOtherMonths:!0,constrainInput:!0,onClose:function(e){n.datepicker("option","minDate",e)}}).inputmask("99.99.9999",{showMaskOnHover:!1,oncomplete:function(){c(this)}}),n.datepicker({dateFormat:"dd.mm.yy",showOn:"button",showOtherMonths:!0,constrainInput:!0,onClose:function(e){i.datepicker("option","maxDate",e)}}).inputmask("99.99.9999",{showMaskOnHover:!1,oncomplete:function(){c(this)}}),$('input[type="text"]',a).on("change",function(){var e=r();o(e)}),$("."+l,a).on("click",function(){return t.applyHandler(this),!1}),s.siblings("."+t.opt.clearAllButtonClass).on("click",function(){$(this).removeClass("active"),t.resetList()})})};d.prototype={resetList:function(){this.$dateFrom.val(""),this.$dateTo.val(""),this.$modalTrigger.text(this.$modalTrigger.attr("data-default"))},applyHandler:function(){}};var u=function(e){this.opt=e,this.opt.anyChar=!1;var i=this,s=!0;this.$field=$("#"+i.opt.id),this.DOMcompleteWrap=document.getElementById(i.opt.autoCompleteWrapId),this.afterClear,this.rawData={items:[],set:function(e){this.items=e,this._rawDataChange()},get:function(){return this.items},_rawDataChange:function(){var e,t=this;for(e=0;e<t.items.length;e++)a(t.items[e],"text","label"),a(t.items[e],"id","value")}},this.completeName="autocomplete",this.firstComplete=!0,this.$field.attr("autocomplete","off"),i.$field.on("keyup",function(e){var a;return text=$(this).val(),e.stopImmediatePropagation(),a=i.dataForm?{term:text,form:i.dataForm}:{term:text},i.opt.anyChar?text.length>2?n(a,i.opt.autoCompleteUrl,function(e){i.$field.hasClass("ui-autocomplete-input")&&i.$field[i.completeName]("destroy"),i.rawData.set(e),i._initAutoComplete(),i.showList("")}):0===text.length&&i.$field.hasClass("ui-autocomplete-input")&&(i.$field[i.completeName]("destroy"),t.removeClass(i.DOMcompleteWrap,"full-visible"),i._resetmodals(i.afterClear)):text.length>2&&s?(n(a,i.opt.autoCompleteUrl,function(e){i.rawData.set(e),i._initAutoComplete(),i.showList("")}),s=!1):0!=text.length||s?i.$field.hasClass("ui-autocomplete-input")&&i.showList(text):i.$field.hasClass("ui-autocomplete-input")&&(i.$field[i.completeName]("destroy"),t.removeClass(i.DOMcompleteWrap,"full-visible"),i._resetmodals(i.afterClear),s=!0),!1}).click(function(){return!1})};return u.prototype={_initAutoComplete:function(){var e=this;e.$field[e.completeName]({source:e.rawData.get(),minLength:0,appendTo:e.DOMcompleteWrap,select:function(t,i){e._afterSelect(t,i)},close:function(){t.removeClass(e.DOMcompleteWrap,"full-visible")},open:function(){t.addClass(e.DOMcompleteWrap,"full-visible")}})},_afterSelect:function(e,t){var i=this;e.preventDefault(),t.item.url?window.location=t.item.url:t.item.label.length&&(i.$field[0].value=t.item.label,i.selectCheckBoxes(t.item.id,t.item.name))},_resetmodals:function(e){return e?void e():0},selectHandler:function(){},selectCheckBoxes:function(){},showList:function(e){self=this,this.$field[self.completeName]("search",e)},pullData:function(){}},e.init=function(e){$.extend(this.lang,e.lang),e.lang=null,$.extend(this.settings,e);var i=this,a=function(){$(i.DOMform).find('input[name="~~name~~"]').remove()};"None"!=this.settings.searchData&&this.settings.searchData&&(this.previousSearch=JSON.parse(this.settings.searchData)),this.DOMform=document.getElementById(this.settings.formId),$(this.DOMform).on("submit",function(){a()}),$.widget("custom.exibitionComplete",$.ui.autocomplete,{_renderMenu:function(e,t){var i=this,n="";$.each(t,function(t,a){a.cat!=n&&a.cat&&(e.append("<li class='ui-autocomplete-category'>"+a.cat+"</li>"),n=a.cat),i._renderItemData(e,a)})}}),this.exhibitionField=new u(i.settings.firstField),this.exhibitionField.completeName="exibitionComplete",this.exhibitionField.opt.anyChar=!0,this.placesModal=new c(i.settings.place),this.subjModal=new o(i.settings.subject),this.periodModal=new d(i.settings.period),this.exhibitionField.selectCheckBoxes=function(e,t){var i,a,s=this,l=t;"th"==t?i=document.getElementById(s.opt.prefix+e):"tg"==t&&(i=document.getElementById(s.opt.prefixInner+e),l="th"),r.show(),i?(r.hide(),$(i).prop("checked",!0),$(i).trigger("change")):(a={name:t,id:e},n(a,EXPO.searchBlock.subjModal.opt.getParentUrl,function(i){EXPO.searchBlock.subjModal._loadParentTree(i,function(){EXPO.searchBlock.subjModal._checkCheckBox(e,t)})}))},this.placesField=new u(i.settings.placeField),this.placesField.dataForm=EXPO.searchBlock.placesModal.$inputFilter.attr("data-form"),this.placesField.selectCheckBoxes=function(e,t){var i,a,s=this;i=document.getElementById(s.opt.prefix+e),i?(r.hide(),$(i).prop("checked",!0),$(i).trigger("change")):(a={name:t,id:e},n(a,EXPO.searchBlock.placesModal.opt.getParentUrl,function(i){EXPO.searchBlock.placesModal._loadParentTree(i,function(){EXPO.searchBlock.placesModal._checkCheckBox(e,t)})}))},this.exhibitionField.afterClear=function(){i.subjModal.resetList()},this.placesField.afterClear=function(){i.placesModal.resetList()},this.modalWindow=new t.Modal(i.settings.modal),this.periodModal.applyHandler=function(){i.modalWindow.close(),$(i.DOMform).submit()},this.placesModal.applyHandler=function(){i.modalWindow.close(),$(i.DOMform).submit()},this.subjModal.applyHandler=function(){i.modalWindow.close(),$(i.DOMform).submit()},$("."+i.settings.modalTriggerClass).on("click",function(e){return e.preventDefault(),i.modalWindow.pullData(this.getAttribute("href")),i.modalWindow.open(),!1}),$(function(){if(i.previousSearch)for(var e=0;e<i.previousSearch.inputs.length;e++)"th"==i.previousSearch.inputs[e].name?i.subjModal._loadParentTree(i.previousSearch.inputs[e],function(e){i.previousSearch.inputs[e].children?i.subjModal.check(i.previousSearch.inputs[e].children.id,i.previousSearch.inputs[e].children.name):i.subjModal.check(i.previousSearch.inputs[e].id,i.previousSearch.inputs[e].name)},e):"area"==i.previousSearch.inputs[e].name&&(i.previousSearch.inputs[e].children&&i.previousSearch.inputs[e].children.children?i.placesModal.selectTag(i.previousSearch.inputs[e].children.children):i.previousSearch.inputs[e].children?i.placesModal.selectTag(i.previousSearch.inputs[e].children):i.previousSearch.inputs[e]&&i.placesModal.selectTag(i.previousSearch.inputs[e]))})},e}();
\ No newline at end of file
+var EXPO=EXPO||{};EXPO.searchBlock?console.warn("WARNING: EXPO.searchBlock is already defined!"):EXPO.searchBlock=function(){var e={};e.settings={place:{id:"pw-place",selectedItemTemplate:"csb-selected",ajaxUrl:"http://hit.expomap.ru/search-form/"},subject:{id:"pw-subj",ajaxUrl:"http://hit.expomap.ru/search-form/"}},e.lang={};var t=EXPO.common,i=function(e){var t=Object.keys(e).map(function(t){return encodeURIComponent(t)+"="+encodeURIComponent(e[t])}).join("&");return"?"+t},n=function(e,t,i){e||(e=""),$.ajax({type:"GET",url:t,data:e,success:function(e){return"function"!=typeof i?e:void i(e)}})},a=function(e,t,i){return e.hasOwnProperty(t)&&(e[i]=e[t]),this},s=function(e){var t,i=0;for(t in e)e.hasOwnProperty(t)&&i++;return i},l=function(e,t){var i=$("#"+e),n="",a=EXPO.searchBlock.settings.closerText,s=EXPO.searchBlock.settings.closerTextSingle,l="";return $element=i.find(".csbs-text"),$element.length>2?$element.eq(0).text().length<t?(l=",",n+=$element.eq(0).text()+l+$element.eq(1).text()+a.replace("_",$element.length-2)):n+=$element.eq(0).text()+a.replace("_",$element.length-1):2==$element.length?$element.eq(0).text().length+$element.eq(1).text().length<t?(l=",",n+=$element.eq(0).text()+l+$element.eq(1).text()):$element.eq(0).text().length<t?(l=",",n+=$element.eq(0).text()+l+$element.eq(1).text()+s.replace("_",$element.length-2)):n+=$element.eq(0).text()+s.replace("_",$element.length-1):$element.length?n+=$element.eq(0).text():n=!1,n},r=$(".wait-ajax.absolute"),o=function(e){this.opt=e;var i,n=this,a=0,s=$("#"+n.opt.subjectTriggerWrapId),o=n.opt.id,c=$("#"+o),d=$(".csb-menu-input",c),h=$(".csb-selected-items",c),u=n.opt.defaultOn,p=n.opt.applyBtnClass,m=$("#"+n.opt.modalTrigger),f=function(){r.hide()},g=function(){var e,t=16;e=l(n.opt.selectedItemsContainer,t),e&&"~~text~~"!=e&&"~~text~~..."!=e?(m.text(e),m.siblings("."+n.opt.clearAllButtonClass).addClass("active")):(m.text(m.data("default")),m.siblings("."+n.opt.clearAllButtonClass).removeClass("active"))};this.$modalInst=$("#"+o),this.itemsSelected={},this.sublist={},this.$inputFilter=$("#"+n.opt.filterInputId),this.$selectedItemsWrap=h,$(function(){for($(".topicChecks",s).on("change",function(){$(this).prop("checked")?n._setVisible($(this).val()):n._setUnvisible($(this).val())}),a=0;a<u.length;a++)i=$("#"+u[a]),i.prop("checked",!0),i.trigger("change");c.on("click","a.trigger",function(){var e=$(this).attr("data-name"),t=$(this).attr("data-id"),i=$(this).attr("data-template-id"),a=$(this).siblings(".dna-container");return"true"==$(this).attr("data-sub")&&$(this).parent().hasClass("level1")&&(a.children().length?n._slideToggle(a,$(this).parent()):(r.show(),n._renderSublist({name:e,id:t},i,f),$(this).parent().addClass("active"))),!1}),d.on("change",function(e,i){var a=$(this).attr("id"),s=$(this).closest(".custom-radio-check"),l=$(this).closest(".level"),r=l.parent().closest(".level").children(".custom-radio-check").find(".csb-menu-input"),o=l.children(".sublist");if(!i){if(s.hasClass("active")?s.removeClass("active"):s.addClass("active"),this.checked){var c=$(this).closest(".level").find(".trigger").first().text(),d={text:c,id:a};if(h.hasClass("visible")||h.addClass("visible"),n._addTag(a,d),o.length)$(".csb-menu-input",o).each(function(){var e=this.getAttribute("id"),i=($(this).closest(".level").find(".trigger").first().text(),t.closest(this,"custom-radio-check"));this.checked=!0,n._destroyTag(e),t.addClass(i,"active")});else if(l=l.parent().closest(".level"),$(".csb-menu-input",l.find(".sublist")).length==$(".csb-menu-input:checked",l.find(".sublist")).length){var u=r[0].getAttribute("id"),p=r.closest(".level").find(".trigger").first().text(),m=t.closest(this,"custom-radio-check"),f=t.closest(m.parentNode.parentNode,"level"),v={text:p,id:u};$(".csb-menu-input:checked",l.find(".sublist")).each(function(){n._destroyTag(this.getAttribute("id"))}),r.prop("checked",!0),t.addClass($(f).find(".custom-radio-check")[0],"active"),n._addTag(u,v)}}else if(n._destroyTag(a),h.children(".dna-clone").length||h.removeClass("visible"),o.length)$(".csb-menu-input",o).each(function(){var e=$(this).attr("id"),i=t.closest(this,"custom-radio-check");this.checked=!1,t.removeClass(i,"active"),n._destroyTag(e)});else if(r.length&&r[0].checked){var m=t.closest(r[0],"custom-radio-check"),k=t.closest(m,"level"),b=k.querySelector(".sublist");r.prop("checked",!1),t.removeClass(m,"active"),n._destroyTag(r.attr("id")),$(".csb-menu-input:checked",b).each(function(){var e=this.getAttribute("id"),i=t.closest(this,"level").querySelector(".trigger").textContent,a={text:i,id:e};n._addTag(e,a)})}g()}}),$(".csbs-del",h).on("click",function(){var e=$(this).attr("data-checkbox-id"),t=$("#"+e);return t.prop("checked",!1),t.trigger("change"),dna.destroy(n.itemsSelected[e]),h.children(".dna-clone").length||h.removeClass("visible"),!1}),$(".clear",c).on("click",function(){return n.resetList(),!1}),n._autocompleteInit(),$("."+p,c).on("click",function(){return n.applyHandler(this),!1}),m.siblings("."+n.opt.clearAllButtonClass).on("click",function(){n.resetList()})})};o.prototype={_getAjax:function(e,t){var i=this;e||(e=""),r.css({display:"block"}),$.ajax({type:"GET",url:i.opt.ajaxUrl,data:e,success:function(e){return"function"!=typeof t?e:(r.hide(),void t(e))}})},_setVisible:function(e){var t=this;$("."+e,t.$modalInst).addClass("visible")},_setUnvisible:function(e){var t=this,i=$("."+e,t.$modalInst);i.find('input[type="checkbox"]').each(function(){var e=$(this);e.prop("checked")&&(e.prop("checked",!1),e.trigger("change"))}),i.find(".dna-container").each(function(){$(this).children().length&&$(this).addClass("hidden")}),i.removeClass("visible")},_checkCheckBox:function(e,t){var i,n=this;"th"==t?i=$("#tid_"+e,n.$modalInst):"tg"==t&&(i=$("#tgid_"+e,n.$modalInst)),i.length&&!i.prop("checked")&&(i.prop("checked",!0),i.trigger("change"))},check:function(e,t){var i,n=this;"th"==t?i=$("#tid_"+e,n.$modalInst):"tg"==t&&(i=$("#tgid_"+e,n.$modalInst)),i.length&&(i.prop("checked",!0),i.trigger("change"),i.parent().addClass("active"))},_autocompleteInit:function(){var e,t,i,l=this,o=l.$inputFilter.attr("data-form"),c=$("#"+l.opt.autoCompleteId),d=!0,h=function(e,t){r.show();var i=!0;for(var a in l.sublist)for(var o in l.sublist[a])o==t.item.value&&$("#tid_"+t.item.value+'[name="'+t.item.name+'"]:checked').length&&(i=!1);if($("#tid_"+t.item.value+'[name="'+t.item.name+'"]:checked').length&&(i=!1),i){var c,d=$("#tid_"+t.item.value+'[name="'+t.item.name+'"]'),h=function(e){s(e)?l._loadParentTree(e,function(){l._checkCheckBox(t.item.value,"tg"),r.hide()}):(r.hide(),console.warn())};d.length?(r.hide(),d.prop("checked",!0),d.trigger("change")):(c={id:t.item.value,name:t.item.name},n(c,l.opt.getParentUrl,h))}},u=function(t){for(e=t,i=0;i<e.length;++i)a(e[i],"text","label");for(i=0;i<e.length;++i)a(e[i],"id","value");l.$inputFilter.hasClass("ui-autocomplete-input")?l.$inputFilter.autocomplete("search",""):(l.$inputFilter.autocomplete({source:e,minLength:0,appendTo:c,select:function(e,t){l.$inputFilter.val(""),l.$inputFilter.trigger("keyup"),h(e,t),e.preventDefault()}}),l.$inputFilter.autocomplete("search",""),d=!1)};l.$inputFilter.attr("autocomplete","on"),l.$inputFilter.on("keyup",function(e){return t=$(this).val(),e.stopImmediatePropagation(),t.length>2&&d?(n({term:t,form:o},l.opt.autoCompleteUrl,u),d=!1):0!=t.length||d||l.$inputFilter.hasClass("ui-autocomplete-input")&&(l.$inputFilter.autocomplete("destroy"),d=!0),!1}).click(function(){return!1})},_renderSublist:function(e,t,i){var n=this,a=0,s=t+"-sub",l=function(e){if(e.length){for(n.sublist[s]={},a;a<e.length;a++)n.sublist[s][e[a].id]=dna.clone(t,e[a]);i(e.length)}else r.hide()};n._getAjax(e,l)},_loadParentTree:function(e,t,i){var n,a,s=this,l=e,o=function(){r.hide(),i||0===i?t(i):t()};r.show(),n={name:l.name,id:l.id},a=$("#tid_"+l.id).closest(".level").children(".trigger").attr("data-template-id"),s._renderSublist(n,a,o)},_destroyTag:function(e){var t=this;t.itemsSelected[e]&&dna.destroy(t.itemsSelected[e])},_addTag:function(e,t){var i=this;i.itemsSelected[e]=dna.clone(i.opt.selectedItemTemplate,t)},_slideToggle:function(e,t){e.hasClass("hidden")?(e.removeClass("hidden"),t.addClass("active")):(e.addClass("hidden").find("ul").addClass("hidden"),t.removeClass("active"))},resetList:function(){var e=this;for(var t in e.itemsSelected)e.itemsSelected.hasOwnProperty(t)&&($("#"+t,e.$selfContainer).prop("checked",!1).trigger("change"),dna.destroy(e.itemsSelected[t]));e.$selectedItemsWrap.removeClass("visible")},applyHandler:function(){r.show()}};var c=function(e){this.opt=e;var i=this,a=$("#"+i.opt.id),s=$('input[type="checkbox"]',a),o=$(".csb-selected-items",a),c=$(".csb-selected-items",a)[0],d=$("#"+i.opt.modalTrigger),h=i.opt.applyBtnClass,u="id_",p=function(){var e,t=16;e=l(i.opt.selectedItemsContainer,t),e&&"~~text~~"!=e&&"~~text~~..."!=e?(d.text(e),d.siblings("."+i.opt.clearAllButtonClass).addClass("active")):(d.text(d.data("default")),d.siblings("."+i.opt.clearAllButtonClass).removeClass("active"))};this.curDNA={},this.itemsSelected={},this.selectedWrap=o,this.$selfContainer=a,this.$modal=a,this.idPrefix=u,this.isReceived=!0,this.$inputFilter=$("#"+i.opt.filterInputId),$(function(){i._autocompleteInit(),a.on("click","a.trigger",function(){var e=$(this).attr("data-name"),n=$(this).attr("data-id"),a=this,s=$(this).attr("data-template-id"),l=$(this).siblings(".dna-container"),o=function(){var e=t.closest(a,"level"),i=e.querySelector(".csb-menu-input");$(".csb-menu-input",l).each(function(){var e=t.closest(this,"custom-radio-check");this.selected||i.checked&&(this.checked=!0,t.addClass(e,"active"))}),r.hide()};return"true"==$(this).attr("data-sub")&&($(this).parent().hasClass("level1")?l.children().length?i._slideToggle(l,$(this).parent()):(r.show(),i._renderSublist({name:e,id:n},s,o)):$(this).parent().hasClass("level2")&&(l.children().length?i._slideToggle(l,$(this).parent()):(i._renderNested({name:e,id:n},o,s,n),$(this).parent().addClass("active")))),!1}),s.on("change",function(){var e=(this.getAttribute("id"),"custom-radio-check"),n=(t.closest(this,e),"level"),a="active",s="sublist",l="csb-menu-input",r="level1",d="csb-selected",h="csbs-del",u="trigger",m="data-checkbox-id",f=t.closest(this,n),g=0==t.hasClass(f,r)?t.closest(f.parentNode,n):f,v=g.querySelector("."+l),k=g.querySelector("."+s),b=f.querySelector("."+s),C=t.closest(this,r),_=C.querySelector("."+l),y=function(e){var i=t.closest(e,n)||this,a=i.querySelector("."+s);$("."+l,a).each(function(){w(this)})},x=function(e){var i=t.closest(e,n)||this,a=i.querySelector("."+s);$("."+l,a).each(function(){I(this)})},S=function(i){var s,r=t.closest(i,n);s=t.hasClass(r,"level1")?r:t.closest(r.parentNode,n),t.addClass(s.querySelector("."+e),a),s.querySelector("."+l).checked=!0},T=function(i){var s=t.closest(i,n),r=t.closest(s.parentNode,n)||s;t.removeClass(r.querySelector("."+e),a),r.querySelector("."+l).checked=!1},w=function(i){var n=t.closest(i,e);t.addClass(n,a),i.checked=!0},I=function(i){var n=t.closest(i,e);t.removeClass(n,a),i.checked=!1},B=function(){var i=(t.closest(k,s),$(k).children("li").children("."+e).find("."+l+":checked")),n=i.length,a=$(k).children("li").children("."+e).find("."+l).length;return a==n&&0!=n?!0:!1},F=function(){var e=g.querySelector("."+l);return e.checked?!0:!1},D=function(i){{var a,r,o,p=t.closest(i,s),g=t.closest(i,n),v=g.querySelector("."+s),k=c.querySelectorAll("."+d),b=p.querySelector("."+s)?$("."+l+":checked",p.querySelector("."+s)):null,C=(b?b.length:null,[]),_=[],y=0,x=0,S=i.getAttribute("id"),T=0,w=0,I=0,B=0;f.querySelector("."+u).innerHTML}if(v){for(a=$(v).children("li").children("."+e).find("."+l+":checked"),B;B<a.length;B++)r=a[B].getAttribute("id"),C.push(r);for(I;I<k.length;I++)r=k[I].querySelector("."+h).getAttribute(m),"~~id~~"!=r&&_.push(r);for(y=_.length,x=C.length,T=0;y>T;T++)for(o=_[T],w=0;x>w;w++)o==C[w]&&A(a[w]);for(T=0;y>T;T++)o=_[T],o==S&&A(i)}else for(T=0;y>T;T++)o=_[T],o==S&&A(S)},A=function(e){var t=e.getAttribute("id");i._destroyTag(t),O()},M=function(e){var a=t.closest(e,n),s=a.querySelector("."+u),l=s.innerHTML,r=e.getAttribute("id"),o={id:r,text:l};i._addTag(r,o),O()},O=function(){o.find("."+h).length&&"~~id~~"!=o.find("."+h)[0].getAttribute(m)?o.addClass("visible"):o.removeClass("visible")},P=function(){var t=$(k).children("li").children("."+e).find("."+l+":checked");t.each(function(){M(this)})},q=function(){var t=$(k).children("li").children("."+e).find("."+l+":checked");t.each(function(){A(this)})};this.checked?(B()?(S(this),w(this),D(v),M(v),q(k),v.getAttribute("id")!=_.getAttribute("id")||_.checked||(w(_),D(_),M(_))):(w(this),D(this),M(this)),b&&y(this),b&&"~~id~~"!=$(b).find("."+l)[0].value&&D(this)):(F()?(T(this),I(this),D(v),A(v),P(k),_.checked&&(I(_),D(_),A(_))):(I(this),D(this),A(this)),b&&(x(this),D(this))),p()}),$(".csbs-del",o).on("click",function(){var e=$(this).attr("data-checkbox-id"),t=$("#"+e);return t.prop("checked",!1),t.trigger("change"),dna.destroy(i.itemsSelected[e]),o.children(".dna-clone").length||o.removeClass("visible"),!1}),$(".clear",a).on("click",function(){return i.resetList(),!1}),$(".q-sel a",a).on("click",function(){var e=$(this),t=e.attr("data-name"),a=e.attr("data-id"),s={name:t,id:a},l=function(e){i._loadParentTree(e,function(){i._checkCheckBox(a)})};return n(s,i.opt.getParentUrl,l),!1}),$("."+h,a).on("click",function(){return i.applyHandler(this),!1}),d.siblings("."+i.opt.clearAllButtonClass).on("click",function(){i.resetList()})})};c.prototype={_getAjax:function(e,t){var i=this;e||(e=""),$.ajax({type:"GET",url:i.opt.ajaxUrl,data:e,success:function(e){return"function"!=typeof t?(i.rawData=e,e):(i.rawData=e,void t(e))}})},_renderSublist:function(e,t,i){var n=this,a=0,s=t+"-sub",l=function(e){if(e.length){for(n.curDNA[s]={},a;a<e.length;a++)n.curDNA[s][e[a].id]=dna.clone(t,e[a]);$("."+t).parents(".level1").addClass("active"),i(e.length)}else r.hide()};n._getAjax(e,l)},_renderNested:function(e,t,n,a){var s=this,l=i(e);dna.load(n,s.opt.ajaxUrl+l,{callback:t,container:s.curDNA[n][a]})},_checkCheckBox:function(e){var t=this,i=$("#id_"+e,t.$selfContainer);i.length&&!i.prop("checked")&&(i.prop("checked",!0),i.trigger("change"))},selectTag:function(e){var t=!0,i=this,a=function(){for(var a in i.curDNA)for(var s in i.curDNA[a])s==e.id&&(t=!1);if($("#id_"+e.id+":checked").length&&(t=!1,$("#id_"+e.id+":checked").trigger("change")),t){i.isReceived=!1;var l,r=$("#id_"+e.id),o=function(t){i._loadParentTree(t,function(){i._checkCheckBox(e.id),i.isReceived=!0}),r=$("#id_"+e.id)};r.length?(r.prop("checked",!0),r.trigger("change"),i.isReceived=!0):(l={id:e.id,name:e.name},n(l,i.opt.getParentUrl,o))}else $("#id_"+e.id).prop("checked",!0),$("#id_"+e.id).trigger("change")};this.wait(a)},wait:function(e,t){var i,n=this,a=function(e,t,n){e.isReceived&&(n?t(n):t(),clearInterval(i))};i=setInterval(function(){a(n,e,t)},100)},check:function(e){var t=this,i=$("#id_"+e,t.$selfContainer);i.length&&!i.prop("checked")&&(i.prop("checked",!0),i.trigger("change"))},_slideToggle:function(e,t){e.hasClass("hidden")?(t.addClass("active"),e.removeClass("hidden")):(t.removeClass("active"),e.addClass("hidden").find("ul"))},_destroyTag:function(e){var t=this;t.itemsSelected[e]&&dna.destroy(t.itemsSelected[e])},_addTag:function(e,t){var i=this;i.itemsSelected[e]=dna.clone(i.opt.selectedItemTemplate,t)},resetList:function(){var e=this;for(var t in e.itemsSelected)e.itemsSelected.hasOwnProperty(t)&&($("#"+t,e.$selfContainer).prop("checked",!1).trigger("change"),dna.destroy(e.itemsSelected[t]));e.selectedWrap.removeClass("visible")},_autocompleteInit:function(){var e,t,i,s=this,l=s.$inputFilter.attr("data-form"),r=$("#"+s.opt.autoCompleteId),o=!0,c=function(e,t){var i=!0;for(var a in s.curDNA)for(var l in s.curDNA[a])l==t.item.value&&$("#id_"+t.item.value+":checked").length&&(i=!1);if($("#id_"+t.item.value+":checked").length&&(i=!1),i){var r,o=$("#id_"+t.item.value),c=function(e){s._loadParentTree(e,function(){s._checkCheckBox(t.item.value)}),o=$("#id_"+t.item.value)};o.length?(o.prop("checked",!0),o.trigger("change")):(r={id:t.item.value,name:t.item.name},n(r,s.opt.getParentUrl,c)),s.$inputFilter.val(t.item.label)}},d=function(t){for(e=t,i=0;i<e.length;++i)a(e[i],"text","label");for(i=0;i<e.length;++i)a(e[i],"id","value");s.$inputFilter.hasClass("ui-autocomplete-input")?s.$inputFilter.autocomplete("search",""):(s.$inputFilter.autocomplete({source:e,minLength:0,appendTo:r,select:function(e,t){c(e,t),s.$inputFilter.val(""),s.$inputFilter.trigger("keyup"),e.preventDefault()}}),s.$inputFilter.autocomplete("search",""),o=!1)};s.$inputFilter.attr("autocomplete","on"),s.$inputFilter.on("keyup",function(e){return t=$(this).val(),e.stopImmediatePropagation(),t.length>2&&o?(n({term:t,form:l},s.opt.autoCompleteUrl,d),o=!1):0!=t.length||o||s.$inputFilter.hasClass("ui-autocomplete-input")&&(s.$inputFilter.autocomplete("destroy"),o=!0),!1}).click(function(){return!1})},_loadParentTree:function(e,t,i){var n,a,l,o,c=this,d=e,h=$("#id_"+d.id),u=function(e){var n=$("#id_"+d.id),h=function(){r.hide(),i||0===i?t(i):t()};r.hide(),n.length&&s(c.curDNA[a+"-sub"])==e&&(l={name:d.name,id:d.id},r.show(),o=$("#id_"+d.id).closest(".level").children(".trigger").attr("data-template-id"),c._renderNested(l,h,o,d.id))},p=function(){r.hide(),i||0===i?t(i):t()};r.show(),d.hasOwnProperty("parent")?h.length?(l={name:d.name,id:d.id},o=h.closest(".level").children(".trigger").attr("data-template-id"),c._renderNested(l,function(){r.hide(),t()},o,d.id)):(n={name:d.parent.name,id:d.parent.id},a=$("#id_"+d.parent.id).closest(".level").children(".trigger").attr("data-template-id"),c._renderSublist(n,a,u)):(n={name:d.name,id:d.id},a=$("#id_"+d.id).closest(".level").children(".trigger").attr("data-template-id"),c._renderSublist(n,a,p))},applyHandler:function(){}};var d=function(e){this.opt=e;var t=this,i=$("#"+t.opt.dateFrom),n=$("#"+t.opt.dateTo),a=$("#"+t.opt.id),s=$("#"+t.opt.modalTrigger),l=t.opt.applyBtnClass,r=function(){var e="",t=s.data("lng-to"),a=s.data("lng-from"),l=$.trim(n.val()),r=$.trim(i.val());return""!=l&&""!=r?e=a+": "+r+" "+t+": "+l+".":""!=l&&""==r?e=t+": "+l+".":""==l&&""!=r&&(e=a+": "+r+"."),e},o=function(e){""!=e?(s.text(e).siblings(".trigger-label").addClass("hidden"),s.siblings("."+t.opt.clearAllButtonClass).addClass("active")):(s.text(s.data("default")).siblings(".trigger-label").removeClass("hidden"),s.siblings("."+t.opt.clearAllButtonClass).removeClass("active"))},c=function(e){var a,s,l,r,o=e.getAttribute("id"),c=e.value,d=Date.parse(c);t.validate()&&($(e).parent(".pwf-field").removeClass("err"),o==t.opt.dateFrom?(a=n[0].getAttribute("id"),s=n[0].value):(a=i[0].getAttribute("id"),s=i[0].value),l=Date.parse(s),l>d&&0!=l&&l?(r=document.getElementById(o).value,document.getElementById(o).value=document.getElementById(a).value,document.getElementById(a).value=r):d>l&&0!=l&&l&&(r=document.getElementById(a).value,document.getElementById(a).value=document.getElementById(o).value,document.getElementById(o).value=r))};this.$dateFrom=i,this.$dateTo=n,this.$modalTrigger=s,$(function(){$.datepicker.setDefaults($.datepicker.regional.ru),i.datepicker({dateFormat:"dd.mm.yy",showOn:"button",showOtherMonths:!0,constrainInput:!0,onClose:function(e){n.datepicker("option","minDate",e)}}).inputmask("99.99.9999",{showMaskOnHover:!1,oncomplete:function(){c(this)}}),n.datepicker({dateFormat:"dd.mm.yy",showOn:"button",showOtherMonths:!0,constrainInput:!0,onClose:function(e){i.datepicker("option","maxDate",e)}}).inputmask("99.99.9999",{showMaskOnHover:!1,oncomplete:function(){c(this)}}),$('input[type="text"]',a).on("change",function(){var e=r();o(e)}),$("."+l,a).on("click",function(){return t.applyHandler(this),!1}),s.siblings("."+t.opt.clearAllButtonClass).on("click",function(){$(this).removeClass("active"),t.resetList()})})};d.prototype={resetList:function(){this.$dateFrom.val(""),this.$dateTo.val(""),this.$modalTrigger.text(this.$modalTrigger.attr("data-default"))},validate:function(){var e=this.$dateTo.val(),t=this.$dateFrom.val(),i=e.split("."),n=t.split("."),a=[],s=!0;return a[0]=Date.parse(i[1]+"."+i[0]+"."+i[2]),a[1]=Date.parse(n[1]+"."+n[0]+"."+n[2]),a[0]||""==$.trim(e)?this.$dateTo.parent(".pwf-field").removeClass("err"):(this.$dateTo.parent(".pwf-field").addClass("err"),s=!1),a[1]||""==$.trim(t)?this.$dateFrom.parent(".pwf-field").removeClass("err"):(this.$dateFrom.parent(".pwf-field").addClass("err"),s=!1),s},applyHandler:function(){}};var h=function(e){this.opt=e,this.opt.anyChar=!1;var i=this,s=!0;this.$field=$("#"+i.opt.id),this.DOMcompleteWrap=document.getElementById(i.opt.autoCompleteWrapId),this.afterClear,this.rawData={items:[],set:function(e){this.items=e,this._rawDataChange()},get:function(){return this.items},_rawDataChange:function(){var e,t=this;for(e=0;e<t.items.length;e++)a(t.items[e],"text","label"),a(t.items[e],"id","value")}},this.completeName="autocomplete",this.firstComplete=!0,this.$field.attr("autocomplete","off"),i.$field.on("keyup",function(e){var a;return text=$(this).val(),e.stopImmediatePropagation(),a=i.dataForm?{term:text,form:i.dataForm}:{term:text},i.opt.anyChar?text.length>2?n(a,i.opt.autoCompleteUrl,function(e){i.$field.hasClass("ui-autocomplete-input")&&i.$field[i.completeName]("destroy"),i.rawData.set(e),i._initAutoComplete(),i.showList("")}):0===text.length&&i.$field.hasClass("ui-autocomplete-input")&&(i.$field[i.completeName]("destroy"),t.removeClass(i.DOMcompleteWrap,"full-visible"),i._resetmodals(i.afterClear)):text.length>2&&s?(n(a,i.opt.autoCompleteUrl,function(e){i.rawData.set(e),i._initAutoComplete(),i.showList("")}),s=!1):0!=text.length||s?i.$field.hasClass("ui-autocomplete-input")&&i.showList(text):i.$field.hasClass("ui-autocomplete-input")&&(i.$field[i.completeName]("destroy"),t.removeClass(i.DOMcompleteWrap,"full-visible"),i._resetmodals(i.afterClear),s=!0),!1}).click(function(){return!1})};return h.prototype={_initAutoComplete:function(){var e=this;e.$field[e.completeName]({source:e.rawData.get(),minLength:0,appendTo:e.DOMcompleteWrap,select:function(t,i){e._afterSelect(t,i)},close:function(){t.removeClass(e.DOMcompleteWrap,"full-visible")},open:function(){t.addClass(e.DOMcompleteWrap,"full-visible")}})},_afterSelect:function(e,t){var i=this;e.preventDefault(),t.item.url?window.location=t.item.url:t.item.label.length&&(i.$field[0].value=t.item.label,i.selectCheckBoxes(t.item.id,t.item.name))},_resetmodals:function(e){return e?void e():0},selectHandler:function(){},selectCheckBoxes:function(){},showList:function(e){self=this,this.$field[self.completeName]("search",e)},pullData:function(){}},e.init=function(e){$.extend(this.lang,e.lang),e.lang=null,$.extend(this.settings,e);var i=this,a=function(){$(i.DOMform).find('input[name="~~name~~"]').remove()};"None"!=this.settings.searchData&&this.settings.searchData&&(this.previousSearch=JSON.parse(this.settings.searchData)),this.DOMform=document.getElementById(this.settings.formId),$(this.DOMform).on("submit",function(){a()}),$.widget("custom.exibitionComplete",$.ui.autocomplete,{_renderMenu:function(e,t){var i=this,n="";$.each(t,function(t,a){a.cat!=n&&a.cat&&(e.append("<li class='ui-autocomplete-category'>"+a.cat+"</li>"),n=a.cat),i._renderItemData(e,a)})}}),this.exhibitionField=new h(i.settings.firstField),this.exhibitionField.completeName="exibitionComplete",this.exhibitionField.opt.anyChar=!0,this.placesModal=new c(i.settings.place),this.subjModal=new o(i.settings.subject),this.periodModal=new d(i.settings.period),this.exhibitionField.selectCheckBoxes=function(e,t){var i,a,s=this,l=t;"th"==t?i=document.getElementById(s.opt.prefix+e):"tg"==t&&(i=document.getElementById(s.opt.prefixInner+e),l="th"),r.show(),i?(r.hide(),$(i).prop("checked",!0),$(i).trigger("change")):(a={name:t,id:e},n(a,EXPO.searchBlock.subjModal.opt.getParentUrl,function(i){EXPO.searchBlock.subjModal._loadParentTree(i,function(){EXPO.searchBlock.subjModal._checkCheckBox(e,t)})}))},this.placesField=new h(i.settings.placeField),this.placesField.dataForm=EXPO.searchBlock.placesModal.$inputFilter.attr("data-form"),this.placesField.selectCheckBoxes=function(e,t){var i,a,s=this;i=document.getElementById(s.opt.prefix+e),i?(r.hide(),$(i).prop("checked",!0),$(i).trigger("change")):(a={name:t,id:e},n(a,EXPO.searchBlock.placesModal.opt.getParentUrl,function(i){EXPO.searchBlock.placesModal._loadParentTree(i,function(){EXPO.searchBlock.placesModal._checkCheckBox(e,t)})}))},this.exhibitionField.afterClear=function(){i.subjModal.resetList()},this.placesField.afterClear=function(){i.placesModal.resetList()},this.modalWindow=new t.Modal(i.settings.modal),this.periodModal.applyHandler=function(){this.validate()&&(r.show(),$(i.DOMform).submit())},this.placesModal.applyHandler=function(){r.show(),$(i.DOMform).submit()},this.subjModal.applyHandler=function(){r.show(),$(i.DOMform).submit()},$("."+i.settings.modalTriggerClass).on("click",function(e){return e.preventDefault(),i.modalWindow.pullData(this.getAttribute("href")),i.modalWindow.open(),!1}),$(function(){if(i.previousSearch)for(var e=0;e<i.previousSearch.inputs.length;e++)"th"==i.previousSearch.inputs[e].name?i.subjModal._loadParentTree(i.previousSearch.inputs[e],function(e){i.previousSearch.inputs[e].children?i.subjModal.check(i.previousSearch.inputs[e].children.id,i.previousSearch.inputs[e].children.name):i.subjModal.check(i.previousSearch.inputs[e].id,i.previousSearch.inputs[e].name)},e):"area"==i.previousSearch.inputs[e].name&&(i.previousSearch.inputs[e].children&&i.previousSearch.inputs[e].children.children?i.placesModal.selectTag(i.previousSearch.inputs[e].children.children):i.previousSearch.inputs[e].children?i.placesModal.selectTag(i.previousSearch.inputs[e].children):i.previousSearch.inputs[e]&&i.placesModal.selectTag(i.previousSearch.inputs[e]))})},e}();
\ No newline at end of file