mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of http://git.general-servers.com/expomap/expomap into develop

Browse Source
remotes/origin/1203
Nazar Kotiuk 11 years ago
parent 236c22eab1 69e186e819
commit 1675e6ef9d
9 changed files with 220 additions and 160 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 203
      templates/client/accounts/feed.html
  2. 3
      templates/client/includes/catalog_search.html
  3. 4
      templates/client/popups/period.html
  4. 5
      templates/client/popups/place.html
  5. 5
      templates/client/popups/theme.html
  6. 42
      templates/client/static_client/css/main.css
  7. 108
      templates/client/static_client/js/_modules/block.search.js
  8. 8
      templates/client/static_client/js/_modules/page.events.feed.js
  9. 2
      templates/client/static_client/js_min/_modules/block.search.min.js

203
templates/client/accounts/feed.html
Unescape View File

@ -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 %}

3
templates/client/includes/catalog_search.html
Unescape View File

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

4
templates/client/popups/period.html
Unescape View File

@ -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>

5
templates/client/popups/place.html
Unescape View File

@ -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>

5
templates/client/popups/theme.html
Unescape View File

@ -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>

42
templates/client/static_client/css/main.css
Unescape View File

@ -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
\******************************/

108
templates/client/static_client/js/_modules/block.search.js
Unescape View File

@ -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){

8
templates/client/static_client/js/_modules/page.events.feed.js
Unescape View File

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

2
templates/client/static_client/js_min/_modules/block.search.min.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save