expo 33

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({

templates/client/popups/place.html

@@ -93,6 +93,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="co" data-id="187">{% trans 'США' %}</a></li>
@@ -100,7 +101,7 @@
                                     <li><a href="#" data-name="ci" data-id="-2960561">{% trans 'Москва' %}</a></li>
 								</ul>
 
-								<a class="clear" href="#">{% trans 'Сбросить выбранные регионы' %}</a>
+
 							</div>
 						</div>
 					</div>

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>

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 {

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;
+									}
+
 								}
 
 							}
@@ -2050,15 +2059,15 @@ if (EXPO.searchBlock){
 			this.modalWindow = new common.Modal(self.settings.modal);
 
 			this.periodModal.applyHandler = function () {
-				self.modalWindow.close();
+				$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();
 			};