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

Merged

Browse Source
remotes/origin/1203
Назар Котюк 11 years ago
parent 29ac2c0b4b 3e247aab40
commit d612b1e776
10 changed files with 38 additions and 25 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. 4
      templates/client/includes/article/article_preview.html
  2. 1
      templates/client/includes/footer.html
  3. 2
      templates/client/service/tickets.html
  4. 21
      templates/client/service/tour.html
  5. 16
      templates/client/static_client/css/main.css
  6. 2
      templates/client/static_client/css_min/main.min.css
  7. 7
      templates/client/static_client/js/main.js
  8. 7
      templates/client/static_client/js/vendor.js
  9. 1
      templates/client/static_client/js_min/_modules/page.tour.min.js
  10. 2
      templates/client/static_client/js_min/vendor.min.js

4
templates/client/includes/article/article_preview.html
Unescape View File

@ -6,5 +6,7 @@
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" class="pic" alt="">
{% endthumbnail %}
{% else %}
<img src="{% static 'client/img/no-logo.png' %}" class="pic" alt="" />
<div class="cli-pict">
<img src="{% static 'client/img/no-logo.png' %}" class="no-logo" alt="" />
</div>
{% endif %}

1
templates/client/includes/footer.html
Unescape View File

@ -49,6 +49,7 @@
<div class="counters">
<ul>
<li>
<!--LiveInternet counter--><script type="text/javascript"><!--
document.write("<a href='http://www.liveinternet.ru/click' "+

2
templates/client/service/tickets.html
Unescape View File

@ -162,7 +162,7 @@
<div class="rq-order-button">
<div class="rqob-wrap">
<div class="rqob-price">{% trans 'Регистрация 2000 руб.' %} {{ service.price }} {{ service.currency }} + {% trans 'билет организатора' %}</div>
<div class="rqob-price">{% trans 'Регистрация 2000 руб.' %} {% comment %}{{ service.price }} {{ service.currency }} {% endcomment %} + {% trans 'билет организатора' %}</div>
<div class="rqob-button">
<a class="ob-text" href="#">{% trans 'Сделать запрос' %}</a>
</div>

21
templates/client/service/tour.html
Unescape View File

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

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

@ -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 {
@ -11573,7 +11576,18 @@ hr + .rq-note {
.acticle_list_big strong span:before {content: ' ';display: inline-block;vertical-align: middle; width: 13px; height: 16px; background: url(../img/sprites.png) -183px -145px no-repeat; margin: 0 5px 0 0; position: relative; top: -2px;}
.acticle_list_big .icon { display: inline-block; width: 12px; height: 13px; position: relative; top: 3px; margin: 0 3px 0 0;background: url(../img/sprites.png) -305px -162px no-repeat;}
.mf-line1 { margin-bottom: 0;}
.acticle_list_big .cli-pict .no-logo{
width: 100px;
margin-top: 40px;
}
.acticle_list_big .cli-pict{
position: absolute;
left: 0;
top: 0;
width: 250px;
height: 180px;
margin-left: 0;
}
.country_table { width: 100%; margin: 6px 0 12px 0;}
.country_table tr td { text-align: left; vertical-align: top; width: 50%;}
.country_table tr td ul { list-style-type: none; margin: 0 0 0 0; padding: 0 0 0 0;}

2
templates/client/static_client/css_min/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

7
templates/client/static_client/js/main.js
Unescape View File

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

7
templates/client/static_client/js/vendor.js
Unescape View File

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

1
templates/client/static_client/js_min/_modules/page.tour.min.js vendored
Unescape View File

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

2
templates/client/static_client/js_min/vendor.min.js vendored
View File

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