expo-33 34 bugs

remotes/origin/1203
pavel 11 years ago
parent 105b75de78
commit 6bf62beaf6
  1. 27
      templates/client/static_client/css/main.css
  2. 8
      templates/client/static_client/css/regions.css
  3. 8
      templates/client/static_client/css/vendor.css
  4. 2
      templates/client/static_client/css_min/main.min.css
  5. 2
      templates/client/static_client/css_min/vendor.min.css
  6. 7
      templates/client/static_client/js/_modules/block.search.js
  7. 16
      templates/client/static_client/js/_modules/page.events.feed.js
  8. 2
      templates/client/static_client/js_min/_modules/block.search.min.js
  9. 2
      templates/client/static_client/js_min/_modules/page.events.feed.min.js

@ -11951,19 +11951,12 @@ hr + .rq-note {
} }
.wait-ajax.absolute{ .wait-ajax.absolute{
position: absolute; position: absolute;
width: 140px; width: 100%;
height: 140px; height: 100%;
left: 50%; left: 0;
top: 50%; top: 0;
margin-top: -70px;
margin-left: -70px;
border-radius: 6px;
/*background-color: #ffffff;*/
background-color: rgba(191, 191, 191,0.3); background-color: rgba(191, 191, 191,0.3);
box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
display: none; display: none;
} }
@ -12313,7 +12306,7 @@ hr + .rq-note {
border-width: 2px; border-width: 2px;
border-color: #D80000; border-color: #D80000;
} }
.mp-search .ui-menu .ui-menu-item .subj-category{ .search-modal-wrap .ui-menu .ui-menu-item .subj-category{
display: inline-block; display: inline-block;
color: #a2a2a2; color: #a2a2a2;
font-size: 15px; font-size: 15px;
@ -12326,19 +12319,19 @@ hr + .rq-note {
font-weight: 400; font-weight: 400;
white-space: normal; white-space: normal;
} }
.mp-search .ui-autocomplete{ .search-modal-wrap .ui-autocomplete{
width: 533px; width: 533px;
} }
.mp-search .ui-menu .ui-menu-item{ .search-modal-wrap .ui-menu .ui-menu-item{
white-space: nowrap; white-space: nowrap;
} }
.mp-search .ui-menu .ui-menu-item a{ .search-modal-wrap .ui-menu .ui-menu-item a{
display: inline-block; display: inline-block;
} }
.mp-search .ui-menu li{ .search-modal-wrap .ui-menu li{
margin-bottom: 4px; margin-bottom: 4px;
} }
.mp-search .ui-menu{ .search-modal-wrap .ui-menu{
line-height: 15px; line-height: 15px;
} }
@media (max-width: 1086px){ @media (max-width: 1086px){

@ -18,7 +18,7 @@
top: 50%; top: 50%;
margin-top: -4px; margin-top: -4px;
width: 8px; width: 8px;
z-index: 1010; z-index: 1;
background: url('../img/sprites.png') no-repeat -83px -16px; background: url('../img/sprites.png') no-repeat -83px -16px;
} }
.places-list > ul > li.active > a:before,.level2.active > a:before, .topics-list > ul > li.active > a:before { .places-list > ul > li.active > a:before,.level2.active > a:before, .topics-list > ul > li.active > a:before {
@ -29,7 +29,7 @@
position: absolute; position: absolute;
top: 3px; top: 3px;
width: 8px; width: 8px;
z-index: 1010; z-index: 1;
background: url('../img/sprites.png') no-repeat -86px -24px; background: url('../img/sprites.png') no-repeat -86px -24px;
} }
.places-list > ul > li.active > a:before, .topics-list > ul > li.active > a:before{ .places-list > ul > li.active > a:before, .topics-list > ul > li.active > a:before{
@ -48,7 +48,7 @@
top: 50%; top: 50%;
margin-top: -5px; margin-top: -5px;
left: -16px; left: -16px;
z-index: 1010; z-index: 1;
background: url('../img/sprites.png') no-repeat -345px -135px ; background: url('../img/sprites.png') no-repeat -345px -135px ;
} }
.c-select-box-wrap .custom-radio-check.active:before { .c-select-box-wrap .custom-radio-check.active:before {
@ -60,7 +60,7 @@
top: 50%; top: 50%;
margin-top: -6px; margin-top: -6px;
left: -17px; left: -17px;
z-index: 1010; z-index: 1;
background: url('../img/sprites.png') no-repeat -46px -16px; background: url('../img/sprites.png') no-repeat -46px -16px;
} }
.ac-custom-message { .ac-custom-message {

@ -2105,7 +2105,7 @@ Pagination Styles
top: 50%; top: 50%;
margin-top: -4px; margin-top: -4px;
width: 8px; width: 8px;
z-index: 1010; z-index: 1;
background: url('../img/sprites.png') no-repeat -83px -16px; background: url('../img/sprites.png') no-repeat -83px -16px;
} }
.places-list > ul > li.active > a:before,.level2.active > a:before, .topics-list > ul > li.active > a:before { .places-list > ul > li.active > a:before,.level2.active > a:before, .topics-list > ul > li.active > a:before {
@ -2116,7 +2116,7 @@ Pagination Styles
position: absolute; position: absolute;
top: 3px; top: 3px;
width: 8px; width: 8px;
z-index: 1010; z-index: 1;
background: url('../img/sprites.png') no-repeat -86px -24px; background: url('../img/sprites.png') no-repeat -86px -24px;
} }
.places-list > ul > li.active > a:before, .topics-list > ul > li.active > a:before{ .places-list > ul > li.active > a:before, .topics-list > ul > li.active > a:before{
@ -2135,7 +2135,7 @@ Pagination Styles
top: 50%; top: 50%;
margin-top: -5px; margin-top: -5px;
left: -16px; left: -16px;
z-index: 1010; z-index: 1;
background: url('../img/sprites.png') no-repeat -345px -135px ; background: url('../img/sprites.png') no-repeat -345px -135px ;
} }
.c-select-box-wrap .custom-radio-check.active:before { .c-select-box-wrap .custom-radio-check.active:before {
@ -2147,7 +2147,7 @@ Pagination Styles
top: 50%; top: 50%;
margin-top: -6px; margin-top: -6px;
left: -17px; left: -17px;
z-index: 1010; z-index: 1;
background: url('../img/sprites.png') no-repeat -46px -16px; background: url('../img/sprites.png') no-repeat -46px -16px;
} }
.ac-custom-message { .ac-custom-message {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1273,7 +1273,12 @@ if (EXPO.searchBlock){
}); });
}; };
getRequest(ajaxObj,self.opt.getParentUrl,ajaxHandler); //.prop('checked')
if($('#id_'+id).length){
$('#id_'+id).prop('checked',true).trigger('change');
}else{
getRequest(ajaxObj,self.opt.getParentUrl,ajaxHandler);
}
return false; return false;
}); });
$('.'+applyBtnClass, $modal).on('click', function () { $('.'+applyBtnClass, $modal).on('click', function () {

@ -508,7 +508,7 @@ if (EXPO.events.feed) {
} }
if (!self.$inputFilter.hasClass('ui-autocomplete-input')) { if (!self.$inputFilter.hasClass('ui-autocomplete-input')) {
self.$inputFilter.autocomplete({ self.$inputFilter.placeComplete({
source: dataObj, source: dataObj,
minLength: 0, minLength: 0,
appendTo: $completeWrap, appendTo: $completeWrap,
@ -520,11 +520,11 @@ if (EXPO.events.feed) {
// return ui.label; // return ui.label;
} }
}); });
self.$inputFilter.autocomplete('search', ""); self.$inputFilter.placeComplete('search', "");
firstComplete = false; firstComplete = false;
} else { } else {
self.$inputFilter.autocomplete('search', ""); self.$inputFilter.placeComplete('search', "");
} }
}; };
@ -542,7 +542,7 @@ if (EXPO.events.feed) {
} else if (text.length == 0 && !firstComplete) { } else if (text.length == 0 && !firstComplete) {
if (self.$inputFilter.hasClass('ui-autocomplete-input')) { if (self.$inputFilter.hasClass('ui-autocomplete-input')) {
self.$inputFilter.autocomplete("destroy"); self.$inputFilter.placeComplete("destroy");
firstComplete = true; firstComplete = true;
} }
} }
@ -1781,6 +1781,14 @@ if (EXPO.events.feed) {
$(this.DOMform).on('submit', function () { $(this.DOMform).on('submit', function () {
submitHandler(); submitHandler();
}); });
$.widget( "custom.placeComplete", $.ui.autocomplete,{
_renderItem: function( ul, item ) {
return $( "<li>" )
.append( $( "<a>" ).text( item.label) )
.append('<span class="subj-category"> ('+item.cat+')</span>')
.appendTo( ul );
}
});
this.DOMapplyButton = document.getElementById(this.opt.applyButtonId); this.DOMapplyButton = document.getElementById(this.opt.applyButtonId);
this.filterPane = new Filter(this.opt.filter); this.filterPane = new Filter(this.opt.filter);
$('#' + this.opt.filter.buttonId).on('click', function () { $('#' + this.opt.filter.buttonId).on('click', function () {

File diff suppressed because one or more lines are too long

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