Skip to content

Commit ed98f96

Browse files
MelevirMelevir
committed
return wrong merge results
1 parent f465b73 commit ed98f96

File tree

3 files changed

+168
-156
lines changed

3 files changed

+168
-156
lines changed

‎landing_page/mainpage/templates/mainpage/include/index_hero.html‎

Lines changed: 87 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -15,99 +15,107 @@ <h3 class="h3 col-12 col-md-10 col-xl-8">Ближайший набор прой
1515
Напишете собственный проект. Опытные питонисты, имеющие опыт «боевой» разработки, всю дорогу будут
1616
проверять ваш код и давать рекомендации.
1717
</p>
18-
<h4 class="curs-place col-12 col-md-8 col-xl-12 fadeInLeft animated-on-ready">
19-
С {{ enrollment.start_date | date:"j E" }} по {{ enrollment.end_date | date:"j E" }}
20-
</h4>
21-
<h4 class="curs-place col-12 col-md-8 col-xl-12 fadeInLeft animated-on-ready">
22-
Регистрация закроется {{ enrollment.end_registration_date | date:"j E" }}
23-
</h4>
24-
<div
25-
class="hero-time col-md-auto col-xl-4 d-flex justify-content-center counter-container"
26-
data-count-down="{{ registration_closes_date_formatted }}"
27-
>
28-
<div class="row justify-content-center"><b class="d-block">00</b><span class="tm-name">дней</span></div>
29-
<span class="delimeter">:</span>
30-
<div class="row justify-content-center"><b class="d-block">00</b><span class="tm-name">часов</span></div>
31-
<span class="delimeter">:</span>
32-
<div class="row justify-content-center"><b class="d-block">00</b><span class="tm-name">минут</span></div>
33-
<span class="delimeter">:</span>
34-
<div class="row justify-content-center"><b class="d-block">00</b><span class="tm-name">секунд</span></div>
35-
</div>
18+
{% if enrollment %}
19+
<h4 class="curs-place col-12 col-md-8 col-xl-12 fadeInLeft animated-on-ready">
20+
С {{ enrollment.start_date | date:"j E" }} по {{ enrollment.end_date | date:"j E" }}
21+
</h4>
22+
<h4 class="curs-place col-12 col-md-8 col-xl-12 fadeInLeft animated-on-ready">
23+
Регистрация закроется {{ enrollment.end_registration_date | date:"j E" }}
24+
</h4>
25+
<div
26+
class="hero-time col-md-auto col-xl-4 d-flex justify-content-center counter-container"
27+
data-count-down="{{ registration_closes_date_formatted }}"
28+
>
29+
<div class="row justify-content-center"><b class="d-block">00</b><span class="tm-name">дней</span></div>
30+
<span class="delimeter">:</span>
31+
<div class="row justify-content-center"><b class="d-block">00</b><span class="tm-name">часов</span></div>
32+
<span class="delimeter">:</span>
33+
<div class="row justify-content-center"><b class="d-block">00</b><span class="tm-name">минут</span></div>
34+
<span class="delimeter">:</span>
35+
<div class="row justify-content-center"><b class="d-block">00</b><span class="tm-name">секунд</span></div>
36+
</div>
37+
{% else %}
38+
<h4 class="curs-place col-12 col-md-8 col-xl-12">
39+
Сейчас регистрация закрыта, но мы скоро регистрацию на новый набор
40+
</h4>
41+
{% endif %}
3642
</div>
37-
<div class="ticket-block row ">
38-
<div class="col-md-12 col-lg-8">
39-
<div class="card slideInUp animated-on-ready">
40-
<div class="card-body d-flex flex-column justify-content-between">
41-
<h3 class="card-heading brackets brackets-yellow">Учитесь онлайн</h3>
42-
<div class="price-list">
43-
<div class="price-item payment-before">
44-
<div class="pt-lg-3">
45-
<div class="price-parent">
46-
<div class="price-date"><b>Ранняя регистрация</b></div>
47-
<div class="price-date">
48-
До {{ enrollment.early_price_date_to | date:"j E" }}
43+
{% if enrollment %}
44+
<div class="ticket-block row">
45+
<div class="col-md-12 col-lg-8">
46+
<div class="card slideInUp animated-on-ready">
47+
<div class="card-body d-flex flex-column justify-content-between">
48+
<h3 class="card-heading brackets brackets-yellow">Учитесь онлайн</h3>
49+
<div class="price-list">
50+
<div class="price-item payment-before">
51+
<div class="pt-lg-3">
52+
<div class="price-parent">
53+
<div class="price-date"><b>Ранняя регистрация</b></div>
54+
<div class="price-date">
55+
До {{ enrollment.early_price_date_to | date:"j E" }}
56+
</div>
57+
<strong class="price">{{ enrollment.early_price_rub }} р.</strong>
58+
</div>
59+
<div class="decr-price-parent">
60+
<a href="#howToPay" class="decr-price d-none d-lg-block scroll-to">
61+
В рассрочку <strong>от 3500 р/мес</strong>
62+
</a>
63+
<a href="#howToPay" class="decr-price d-lg-none scroll-to" style="padding-top: 5px">
64+
Есть рассрочка
65+
</a>
4966
</div>
50-
<strong class="price">{{ enrollment.early_price_rub }} р.</strong>
51-
</div>
52-
<div class="decr-price-parent">
53-
<a href="#howToPay" class="decr-price d-none d-lg-block scroll-to">
54-
В рассрочку <strong>от 3500 р/мес</strong>
55-
</a>
56-
<a href="#howToPay" class="decr-price d-lg-none scroll-to" style="padding-top: 5px">
57-
Есть рассрочка
58-
</a>
5967
</div>
60-
</div>
61-
{% if today <= enrollment.early_price_date_to %}
62-
{% if enrollment.platim_url %}
63-
<a class="btn btn-warning btn-add btn-buy" href="{{ enrollment.platim_url }}" target="_blank">
64-
Купить билет
65-
</a>
68+
{% if today <= enrollment.early_price_date_to %}
69+
{% if enrollment.platim_url %}
70+
<a class="btn btn-warning btn-add btn-buy" href="{{ enrollment.platim_url }}" target="_blank">
71+
Купить билет
72+
</a>
73+
{% else %}
74+
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
75+
Купить билет
76+
</button>
77+
{% endif %}
6678
{% else %}
67-
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
68-
Купить билет
79+
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal" disabled data-target="#overlay">
80+
Регистрация закрыта
6981
</button>
7082
{% endif %}
71-
{% else %}
72-
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal" disabled data-target="#overlay">
73-
Регистрация закрыта
74-
</button>
75-
{% endif %}
76-
</div>
77-
<div class="price-item payment-after">
78-
<div class="pt-lg-3">
79-
<div class="price-parent">
80-
<div class="price-date"><b>Обычная регистрация</b></div>
81-
<div class="price-date"> С {{ enrollment.late_price_date_from | date:"j E" }}</div>
82-
<strong class="price">{{ enrollment.late_price_rub }} р.</strong>
83-
</div>
84-
<div class="decr-price-parent">
85-
<a href="#howToPay" class="decr-price d-none d-lg-block scroll-to">
86-
В рассрочку <strong>от 4000 р/мес</strong>
87-
</a>
88-
<a href="#howToPay" class="decr-price d-lg-none scroll-to" style="padding-top: 5px">Есть рассрочка</a>
89-
</div>
9083
</div>
91-
{% if today >= enrollment.late_price_date_from %}
92-
{% if enrollment.platim_url %}
93-
<a class="btn btn-warning btn-add btn-buy" href="{{ enrollment.platim_url }}" target="_blank">
94-
Купить билет
95-
</a>
84+
<div class="price-item payment-after">
85+
<div class="pt-lg-3">
86+
<div class="price-parent">
87+
<div class="price-date"><b>Обычная регистрация</b></div>
88+
<div class="price-date"> С {{ enrollment.late_price_date_from | date:"j E" }}</div>
89+
<strong class="price">{{ enrollment.late_price_rub }} р.</strong>
90+
</div>
91+
<div class="decr-price-parent">
92+
<a href="#howToPay" class="decr-price d-none d-lg-block scroll-to">
93+
В рассрочку <strong>от 4000 р/мес</strong>
94+
</a>
95+
<a href="#howToPay" class="decr-price d-lg-none scroll-to" style="padding-top: 5px">Есть рассрочка</a>
96+
</div>
97+
</div>
98+
{% if today >= enrollment.late_price_date_from %}
99+
{% if enrollment.platim_url %}
100+
<a class="btn btn-warning btn-add btn-buy" href="{{ enrollment.platim_url }}" target="_blank">
101+
Купить билет
102+
</a>
103+
{% else %}
104+
<button class="btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
105+
Купить билет
106+
</button>
107+
{% endif %}
96108
{% else %}
97-
<button class="btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
98-
Купить билет
109+
<button class="btn btn-warning btn-add btn-buy" disabled data-toggle="modal" data-target="#overlay">
110+
Регистрация закрыта
99111
</button>
100112
{% endif %}
101-
{% else %}
102-
<button class="btn btn-warning btn-add btn-buy" disabled data-toggle="modal" data-target="#overlay">
103-
Регистрация закрыта
104-
</button>
105-
{% endif %}
113+
</div>
106114
</div>
107115
</div>
108116
</div>
109117
</div>
110118
</div>
111-
</div>
119+
{% endif %}
112120
</div>
113121
</section>

‎landing_page/mainpage/templates/mainpage/include/index_menu.html‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@
1515
</a>
1616
</div>
1717

18-
{% if enrollment.platim_url %}
19-
<a class="custom-btn btn btn-outline-warning" href="{{ enrollment.platim_url }}" target="_blank">
20-
Записаться
21-
</a>
22-
{% else %}
23-
<a data-toggle="modal" data-target="#overlay" class="custom-btn btn btn-outline-warning" href="#counter">
24-
Записаться
25-
</a>
18+
{% if enrollment %}
19+
{% if enrollment.platim_url %}
20+
<a class="custom-btn btn btn-outline-warning" href="{{ enrollment.platim_url }}" target="_blank">
21+
Записаться
22+
</a>
23+
{% else %}
24+
<a data-toggle="modal" data-target="#overlay" class="custom-btn btn btn-outline-warning" href="#counter">
25+
Записаться
26+
</a>
27+
{% endif %}
2628
{% endif %}
2729
</div>
2830
<ul class="nav justify-content-start justify-content-lg-end smooth-scroll">

0 commit comments

Comments
 (0)