expo-48 ready

remotes/origin/1203
pavel 11 years ago
parent 4d3e4ab20e
commit 1f30311a88
  1. 41
      templates/client/popups/callback.html
  2. 39
      templates/client/static_client/css/main.css
  3. 2
      templates/client/static_client/css_min/main.min.css
  4. 5
      templates/client/static_client/js/main.js
  5. 5
      templates/client/static_client/js/vendor.js
  6. 2
      templates/client/static_client/js_min/_modules/page.about.min.js
  7. 4
      templates/client/static_client/js_min/vendor.min.js

@ -1,21 +1,28 @@
{% load static %}
{% load i18n %}
<div id="pw-callback" class="popup-window pw-period">
<header class="clearfix">
<div class="pw-title">{% trans 'Обратный звонок' %}</div>
</header>
<div class="pw-body clearfix">
<form class="pw-form" id="callback-form" action="/callback/">
<div class="pwf-line period">
<div class="pwf-field">
<input type="text" placeholder="Введите номер телефона" name="callback_phone" id="id_callback_phone">
</div>
</div>
<div class="pwf-buttons-line">
<button type="submit" class="icon-check">{% trans 'применить' %}</button>
</div>
</form>
</div>
<div id="pw-callback" class="popup-window сallback-modal">
<header class="clearfix">
<div class="pw-title">{% trans 'Обратный звонок' %}</div>
</header>
<div class="pw-body clearfix">
<div class="label">
<p>Вам удобнее, чтобы мы Вам позвонили? Укажите контактный номер телефона и имя, и наши консультанты свяжутся с Вами.</p>
</div>
<form class="pw-form" id="callback-form" action="/callback/">
<div class="pwf-line">
<div class="pwf-field">
<input type="text" placeholder="Контактное лицо" name="callback_name" id="id_callback_name">
</div>
</div>
<div class="pwf-line">
<div class="pwf-field">
<input type="text" placeholder="Контактный номер телефона" name="callback_phone" id="id_callback_phone">
</div>
</div>
<div class="pwf-buttons-line">
<button type="submit" class="submit">{% trans 'Отправить запрос' %}</button>
</div>
</form>
</div>
</div>

@ -861,7 +861,7 @@ a.icon-doc:before {
-moz-box-sizing: border-box;
box-sizing: border-box;
box-sizing: border-box;
width: 49.9%;
min-width: 140px;
float: left;
@ -1879,6 +1879,11 @@ button.icon-save:before {
height: 14px;
background-position: -203px -16px;
}
button.icon-arrow:before {
width: 8px;
height: 12px;
background-position: -176px 0;
}
@ -12274,7 +12279,7 @@ hr + .rq-note {
/*************************\
# блок умный поиск
catalog_search.html
catalog_search.html
\************************/
.mp-search .clear-all-button, .search-form-wrap .clear-all-button{
display: none;
@ -12483,8 +12488,8 @@ hr + .rq-note {
}
.note-wrap:hover .note-button{
-webkit-transition: none;
-o-transition: none;
transition: none;
-o-transition: none;
transition: none;
}
.note-wrap:hover .note-button{
border-color: #87c525;
@ -12921,3 +12926,29 @@ hr + .rq-note {
.about-page .tabs-opening{
margin-bottom: 20px;
}
/************************\
# callback modal window
\***********************/
.сallback-modal{
width: 534px;
}
.сallback-modal .pw-form .pwf-field{
width: 340px;
}
.сallback-modal .submit:before{
display: none;
}
.сallback-modal .submit:after{
content: ' ';
display: inline-block;
vertical-align: middle;
background: url(../img/sprites.png) -176px 0 no-repeat;
margin: -2px 7px 0 6px;
width: 8px;
height: 12px;
}
.сallback-modal .required.err:before{
margin-top: 2px;
}

File diff suppressed because one or more lines are too long

@ -107,6 +107,9 @@ function placeInput(width){
$.get(url, formData, function(data){
if (data.success){
$.fancybox.close();
$('#callback-form').find('input:text').val('');
$('#callback-form').find('.required').removeClass('required err');
$("#callback-form .error").remove();
}
else{
// delete prvious error
@ -115,7 +118,7 @@ function placeInput(width){
var $input = $('#id_callback_phone')
// generate new error
var $error = $("<div>").attr("class", "error").append(data.errors['callback_phone']);
$input.parent().prepend($error)
$input.parent().addClass('required err').prepend($error);
console.log(data.errors)
}
});

@ -1174,6 +1174,9 @@ function placeInput(width){
$.get(url, formData, function(data){
if (data.success){
$.fancybox.close();
$('#callback-form').find('input:text').val('');
$('#callback-form').find('.required').removeClass('required err');
$("#callback-form .error").remove();
}
else{
// delete prvious error
@ -1182,7 +1185,7 @@ function placeInput(width){
var $input = $('#id_callback_phone')
// generate new error
var $error = $("<div>").attr("class", "error").append(data.errors['callback_phone']);
$input.parent().prepend($error)
$input.parent().addClass('required err').prepend($error);
console.log(data.errors)
}
});

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.about?console.warn("WARNING: EXPO.eventsFeed is already defined!"):EXPO.about=function(){var t={};t.opt={};var s=(EXPO.common,function(t){this.opt=t;var s=this,i=this.opt,a=(i.tabClass,i.activeClass);this.$tabsList=$("#"+i.listId),this.$tabs=$("#"+i.tabsId),this.$tabsOpenings=$("#"+i.tabsOpeningId),$("a",this.$tabsList).on("click",function(){$(this).parent("li").addClass(a).siblings().removeClass(a);var t=$(this).attr("href");return t=t.replace("#",""),s.setActive(t),!1})});return s.prototype={initTabs:function(){},setActive:function(t){var s=this.opt.activeClass,i=this.opt.tabClass,a=this.opt.postfix;this.$tabs.children("."+i).hide().removeClass(s),this.$tabs.children("#"+t).fadeIn(function(){$(this).addClass(s)}),this.$tabsOpenings.children("."+i).removeClass(s),this.$tabsOpenings.children("#"+t+a).addClass(s)}},t.init=function(t){$.extend(this.opt,t);this.tabs=new s(this.opt.tabs)},t}();
var EXPO=EXPO||{};EXPO.about?console.warn("WARNING: EXPO.eventsFeed is already defined!"):EXPO.about=function(){var t={};t.opt={};var s=(EXPO.common,function(t){this.opt=t;var s=this,i=this.opt,a=(i.tabClass,i.activeClass);this.$tabsList=$("#"+i.listId),this.$tabs=$("#"+i.tabsId),this.$tabsOpenings=$("#"+i.tabsOpeningId),$("a",this.$tabsList).on("click",function(){$(this).parent("li").addClass(a).siblings().removeClass(a);var t=$(this).attr("href");return t=t.replace("#",""),s.setActive(t),!1})});return s.prototype={setActive:function(t){var s=this.opt.activeClass,i=this.opt.tabClass,a=this.opt.postfix;this.$tabs.children("."+i).hide().removeClass(s),this.$tabs.children("#"+t).fadeIn(function(){$(this).addClass(s)}),this.$tabsOpenings.children("."+i).removeClass(s),this.$tabsOpenings.children("#"+t+a).addClass(s)}},t.init=function(t){$.extend(this.opt,t);this.tabs=new s(this.opt.tabs)},t}();

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