Проверить все ли Правки сделаны, и убрать в архив выполненные. https://drive.google.com/drive/u/1/folders/1uMOTtwuntNUszTUzl3RThiYn9bKsRG2Z?ogsrc=32

remotes/origin/editis_13-01-19
gzbender 7 years ago
parent 67a7460349
commit 6559ad2822
  1. 3
      project/templates/blocks/video.html
  2. 3
      project/views.py
  3. 3
      web/src/js/modules/popup.js
  4. 1
      web/src/sass/_common.sass

@ -1,10 +1,9 @@
<div class="section section_video">
<div class="section__center center center_sm" style="text-align: center;">
<div class="title">Пробный урок</div>
<img class="main-video-preview js-video-modal" data-video-url="{{ config.MAIN_PAGE_VIDEO_URL }}" data-trial-lesson="1"
src="{{ config.MAIN_PAGE_VIDEO_PREVIEW_IMG.url }}"/>
<a href="#" class="btn js-video-modal btn_stroke-black" style="margin: 20px;"
data-video-url="{{ config.MAIN_PAGE_VIDEO_URL }}" data-trial-lesson="1">Смотреть бесплатно</a>
data-video-url="{{ config.MAIN_PAGE_VIDEO_URL }}" data-trial-lesson="1">Смотреть бесплатно урок</a>
<div>Много развивающих видео на&nbsp;нашем <a href="{{ config.SERVICE_YOUTUBE_URL }}">YouTube&nbsp;канале</a></div>
</div>
</div>

@ -105,7 +105,8 @@ class IndexView(TemplateView):
'school_schedules': SchoolSchedule.objects.all(),
'school_schedules_purchased': set(school_schedules_purchased),
'teachers': User.objects.filter(role=User.TEACHER_ROLE, show_in_mainpage=True),
'works_count': Payment.objects.filter(status__in=Payment.PW_PAID_STATUSES).count() * 5,
'works_count': (Payment.objects.filter(status__in=Payment.PW_PAID_STATUSES)
.distinct().order_by('user_id').values_list('user_id').count() * 8 + 40000),
'subscription_ends': school_payment.filter(add_days=False).first().date_end if school_payment_exists else None,
'subscription_ends_humanize': school_payment.filter(add_days=False).first().date_end_humanize if school_payment_exists else None,

@ -340,6 +340,7 @@ $(document).ready(function () {
var $order = popup.find('.order');
var $orderPrice = popup.find('.order_price_text');
var $orderDates = popup.find('.order__dates');
var $orderDays = popup.find('.order__days');
var dateStart = popup.data('date-start');
var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
var weekdays = [];
@ -377,6 +378,7 @@ $(document).ready(function () {
} else {
text = amount + 'p.';
}
$orderDays.text(daysText.length == 7 ? 'Понедельник - Воскресенье' : daysText.join(', '));
$orderPrice.html(text);
$orderDates.text(moment(response.data.date_start).format('D MMM') + ' - ' + moment(response.data.date_end).format('D MMM'));
$('.but_btn_popup').attr('href', link+'?'+decodeURIComponent($.param({
@ -390,6 +392,7 @@ $(document).ready(function () {
}
else {
$orderPrice.html('0p.');
$orderDays.text('Ничего не выбрано');
$bonuses.hide();
}

@ -2420,6 +2420,7 @@ a.grey-link
width: 100%
height: auto
cursor: pointer
margin-top: -140px;
.head
display: flex

Loading…
Cancel
Save