remotes/origin/1203
pavel 11 years ago
parent 9c72196430
commit 26c62c036c
  1. 21
      templates/client/service/tour.html
  2. 3
      templates/client/static_client/css/main.css
  3. 2
      templates/client/static_client/css_min/main.min.css
  4. 7
      templates/client/static_client/js/main.js
  5. 7
      templates/client/static_client/js/vendor.js
  6. 1
      templates/client/static_client/js_min/_modules/page.tour.min.js
  7. 2
      templates/client/static_client/js_min/vendor.min.js

@ -149,23 +149,16 @@
<div class="rq-sub-sect-body">
<div class="rq-s-line">
<div class="c-select-box select" data-placeholder="{% trans 'Знание языков' %}">
<div class="csb-selected-items"></div>
<div class="csb-menu-wrap">
<div class="scroll-container csb-menu">
<div class="scroll-content clearfix">
<ul>
{% for choice_id, choice_label in form.languages.field.choices %}
<li><label><input type="checkbox" name="languages" value="{{ choice_id }}" />{{ choice_label }}</label></li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
<div class="mf-field full-width">
<input type="text" name="languages" id="id_languages" placeholder="{% trans 'Знание языков' %}"/>
<div class="error-blob"></div>
</div>
</div>
<div class="rq-s-line">
<!-- todo: сделать input:text-->
<div class="c-select-box select" data-placeholder="{% trans 'Тематика' %}">
<div class="csb-selected-items"></div>
<div class="csb-menu-wrap">

@ -7832,6 +7832,9 @@ a.order-button:hover .ob-text,
box-sizing: border-box;
padding-bottom: 5px;
}
.mf-line .mf-field.full-width {
width: 100%;
}
.mf-line.cols-2 .mf-field,
.mf-line.cols-2 > label {

File diff suppressed because one or more lines are too long

@ -1193,8 +1193,8 @@ function placeInput(width){
var $fieldsContainer = $sSect.children('.rq-sub-sect-body');
function checkState () {
var $inputs = $fieldsContainer.find('input, select');
var $selectBox = $fieldsContainer.find('div.c-select-box');
var $inputs = $fieldsContainer.find('input, select'),
$selectBox = $fieldsContainer.find('div.c-select-box');
if ($check.prop('checked')) {
$fieldsContainer.removeClass('disabled');
@ -1203,7 +1203,8 @@ function placeInput(width){
} else {
$fieldsContainer.addClass('disabled');
$selectBox.addClass('disabled');
$inputs.prop('disabled', true);
$inputs.prop("checked",false).prop('disabled', true);
$inputs.trigger("change");
}
}

@ -4234,8 +4234,8 @@ function placeInput(width){
var $fieldsContainer = $sSect.children('.rq-sub-sect-body');
function checkState () {
var $inputs = $fieldsContainer.find('input, select');
var $selectBox = $fieldsContainer.find('div.c-select-box');
var $inputs = $fieldsContainer.find('input, select'),
$selectBox = $fieldsContainer.find('div.c-select-box');
if ($check.prop('checked')) {
$fieldsContainer.removeClass('disabled');
@ -4244,7 +4244,8 @@ function placeInput(width){
} else {
$fieldsContainer.addClass('disabled');
$selectBox.addClass('disabled');
$inputs.prop('disabled', true);
$inputs.prop("checked",false).prop('disabled', true);
$inputs.trigger("change");
}
}

@ -0,0 +1 @@
var EXPO=EXPO||{};EXPO.tour?console.warn("WARNING: EXPO.tour is already defined!"):EXPO.tour=function(){var t={};t.opt={};EXPO.common;return t.init=function(t){this.opt={fromDateId:"id_fr",toDateId:"id_to"},$.extend(this.opt,t);var e=this.opt,o=$(document.getElementById(e.fromDateId)),n=$(document.getElementById(e.toDateId));$(function(){$.datepicker.setDefaults($.datepicker.regional.ru),o.datepicker({dateFormat:"dd.mm.yy",showOn:"button",showOtherMonths:!0,constrainInput:!0,onClose:function(t){n.datepicker("option","minDate",t)}}).inputmask("99.99.9999",{showMaskOnHover:!1,insertMode:!1,oncomplete:function(){$activeField=this}}),n.datepicker({dateFormat:"dd.mm.yy",showOn:"button",showOtherMonths:!0,constrainInput:!0,onClose:function(t){o.datepicker("option","maxDate",t)}}).inputmask("99.99.9999",{showMaskOnHover:!1,insertMode:!1,oncomplete:function(){$activeField=this}})})},t}();

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