Merge branch 'feature/links-page' into 'master'

Посадочная с  кнопками

See merge request lilschool/site!272
remotes/origin/feature/child-profile-18-03-19
Danil 7 years ago
commit c2da01ff6d
  1. 129
      project/templates/lilcity/index.html
  2. 114
      project/templates/lilcity/layer.html
  3. 82
      project/templates/lilcity/links.html
  4. 3
      project/urls.py
  5. 4
      project/views.py

@ -1,40 +1,18 @@
{% extends "templates/lilcity/layer.html" %}
{% load static %} {% load static %}
{% load setting from settings %} {% load setting from settings %}
{% load compress %} {% load compress %}
<!DOCTYPE html> {% block layer_head %}
<html> <script src="https://js.pusher.com/4.1/pusher.min.js"></script>
<head> <script>
<meta charset="utf-8"> LIL_SERVER_TIME = "{% now 'U' %}";
<title> LIL_SERVER_TIME_DIFF = Math.floor((new Date().getTime()) / 1000) - parseInt(LIL_SERVER_TIME);
{% block title %}Онлайн-курсы Lil School{% endblock title%} USER_ID = "{{ request.user.id }}";
</title> COURSE_ID = "{{ course.id }}";
<meta http-equiv="X-UA-Compatible" content="IE=Edge"> MIXPANEL_CUSTOM_LIB_URL = "/static/mixpanel-2-latest.js";
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> </script>
<meta name="theme-color" content="#fff">
<meta name="format-detection" content="telephone=no">
<meta name="description" content="{% block description %}Онлайн-курсы Lil School{% endblock description%}">
<!--Open Graph data-->
<meta property="og:title" content="{% block ogtitle %}Онлайн-курсы Lil School{% endblock ogtitle %}">
{% comment %} <meta property="og:type" content="article"> {% endcomment %}
<meta property="og:url" content="{% block ogurl %}{{ request.build_absolute_uri }}{% endblock ogurl %}">
<meta property="og:image" content="{% block ogimage %}http://{% setting 'MAIN_HOST' %}{% static 'img/video-1.jpg' %}{% endblock ogimage %}">
<meta property="og:image:width" content="{% block ogimage-width %}597{% endblock ogimage-width %}" />
<meta property="og:image:height" content="{% block ogimage-height %}318{% endblock ogimage-height %}" />
<meta property="og:description" content="{% block ogdescription %}Lil School — первая образовательная онлайн-платформа креативного мышления для детей{% endblock ogdescription %}">
<meta property="og:site_name" content="Онлайн-курсы Lil School">
<meta property="og:locale" content="ru_RU">
{% comment %} <meta property="fb:admins" content="Facebook numeric ID"> {% endcomment %}
<meta name="csrf-token" content="{{ csrf_token }}">
<meta name="yandex-verification" content="bb471d5abd9fdec7" />
<meta name="google-site-verification" content="3ULNxGYLRXUpDpKuZgMLTTrXAJx7UEzwAXseCcfdm1s" />
{% compress css %}
<link rel="stylesheet" media="all" href={% static "app.css" %}>
{% endcompress %}
<link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %}"/>
<!-- Start of LiveChat (www.livechatinc.com) code --> <!-- Start of LiveChat (www.livechatinc.com) code -->
<script type="text/javascript"> <script type="text/javascript">
window.__lc = window.__lc || {}; window.__lc = window.__lc || {};
@ -49,86 +27,10 @@
})(); })();
</script> </script>
<!-- End of LiveChat code --> <!-- End of LiveChat code -->
<script src="https://js.pusher.com/4.1/pusher.min.js"></script>
<script>
var viewportmeta = document.querySelector('meta[name="viewport"]');
if (viewportmeta) {
if (screen.width <= 360) {
var newScale = screen.width / 360;
viewportmeta.content = 'width=360, minimum-scale=' + newScale + ', user-scalable=0, maximum-scale=1, initial-scale=' + newScale + '';
}
else {
viewportmeta.content = 'width=device-width, maximum-scale=1.6, initial-scale=1.0';
}
}
</script>
<script>
LIL_SERVER_TIME = "{% now 'U' %}";
LIL_SERVER_TIME_DIFF = Math.floor((new Date().getTime()) / 1000) - parseInt(LIL_SERVER_TIME);
USER_ID = "{{ request.user.id }}";
COURSE_ID = "{{ course.id }}";
MIXPANEL_CUSTOM_LIB_URL = "/static/mixpanel-2-latest.js";
</script>
<!-- Facebook Pixel Code -->
<script>
!function(f,b,e,v,n,t,s)
{if(f.fbq)return;n=f.fbq=function(){n.callMethod?
n.callMethod.apply(n,arguments):n.queue.push(arguments)};
if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
n.queue=[];t=b.createElement(e);t.async=!0;
t.src=v;s=b.getElementsByTagName(e)[0];
s.parentNode.insertBefore(t,s)}(window,document,'script',
'https://connect.facebook.net/en_US/fbevents.js');
fbq('init', '194961257900508');
fbq('track', 'PageView');
</script>
<noscript>
<img height="1" width="1"
src="https://www.facebook.com/tr?id=194961257900508&ev=PageView
&noscript=1"/>
</noscript>
<!-- End Facebook Pixel Code -->
<!-- Global site tag (gtag.js) - Google Ads: 808701460 -->
<script async src="https://www.googletagmanager.com/gtag/js?id=AW-808701460"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'AW-808701460');
</script>
<!-- Yandex.Metrika counter -->
<script type="text/javascript" >
(function (d, w, c) {
(w[c] = w[c] || []).push(function() {
try {
w.yaCounter49354039 = new Ya.Metrika2({
id:49354039,
clickmap:true,
trackLinks:true,
accurateTrackBounce:true,
webvisor:true
});
} catch(e) { }
});
var n = d.getElementsByTagName("script")[0],
s = d.createElement("script"),
f = function () { n.parentNode.insertBefore(s, n); };
s.type = "text/javascript";
s.async = true;
s.src = "https://mc.yandex.ru/metrika/tag.js";
if (w.opera == "[object Opera]") {
d.addEventListener("DOMContentLoaded", f, false);
} else { f(); }
})(document, window, "yandex_metrika_callbacks2");
</script>
<noscript><div><img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->
{% include "templates/blocks/mixpanel.html" %}
{% block head %}{% endblock head %} {% block head %}{% endblock head %}
</head> {% endblock layer_head %}
<body>
{% block layer_body %}
{% include "templates/blocks/social.html" %} {% include "templates/blocks/social.html" %}
{% include "templates/blocks/baner.html" %} {% include "templates/blocks/baner.html" %}
<div class="outer js-outer"> <div class="outer js-outer">
@ -160,5 +62,4 @@
</script> </script>
{% block foot %}{% endblock foot %} {% block foot %}{% endblock foot %}
{% block foot_js %}{% endblock foot_js %} {% block foot_js %}{% endblock foot_js %}
</body> {% endblock layer_body %}
</html>

@ -0,0 +1,114 @@
<!DOCTYPE html>
{% load static %}
{% load setting from settings %}
{% load compress %}
<html>
<head>
<meta charset="utf-8">
<title>
{% block title %}Онлайн-курсы Lil School{% endblock title%}
</title>
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<meta name="theme-color" content="#fff">
<meta name="format-detection" content="telephone=no">
<meta name="description" content="{% block description %}Онлайн-курсы Lil School{% endblock description%}">
<!--Open Graph data-->
<meta property="og:title" content="{% block ogtitle %}Онлайн-курсы Lil School{% endblock ogtitle %}">
{% comment %} <meta property="og:type" content="article"> {% endcomment %}
<meta property="og:url" content="{% block ogurl %}{{ request.build_absolute_uri }}{% endblock ogurl %}">
<meta property="og:image" content="{% block ogimage %}http://{% setting 'MAIN_HOST' %}{% static 'img/video-1.jpg' %}{% endblock ogimage %}">
<meta property="og:image:width" content="{% block ogimage-width %}597{% endblock ogimage-width %}" />
<meta property="og:image:height" content="{% block ogimage-height %}318{% endblock ogimage-height %}" />
<meta property="og:description" content="{% block ogdescription %}Lil School — первая образовательная онлайн-платформа креативного мышления для детей{% endblock ogdescription %}">
<meta property="og:site_name" content="Онлайн-курсы Lil School">
<meta property="og:locale" content="ru_RU">
{% comment %} <meta property="fb:admins" content="Facebook numeric ID"> {% endcomment %}
<meta name="csrf-token" content="{{ csrf_token }}">
<meta name="yandex-verification" content="bb471d5abd9fdec7" />
<meta name="google-site-verification" content="3ULNxGYLRXUpDpKuZgMLTTrXAJx7UEzwAXseCcfdm1s" />
{% compress css %}
<link rel="stylesheet" media="all" href={% static "app.css" %}>
{% endcompress %}
<link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %}"/>
<script>
var viewportmeta = document.querySelector('meta[name="viewport"]');
if (viewportmeta) {
if (screen.width <= 360) {
var newScale = screen.width / 360;
viewportmeta.content = 'width=360, minimum-scale=' + newScale + ', user-scalable=0, maximum-scale=1, initial-scale=' + newScale + '';
}
else {
viewportmeta.content = 'width=device-width, maximum-scale=1.6, initial-scale=1.0';
}
}
</script>
<!-- Facebook Pixel Code -->
<script>
!function(f,b,e,v,n,t,s)
{if(f.fbq)return;n=f.fbq=function(){n.callMethod?
n.callMethod.apply(n,arguments):n.queue.push(arguments)};
if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
n.queue=[];t=b.createElement(e);t.async=!0;
t.src=v;s=b.getElementsByTagName(e)[0];
s.parentNode.insertBefore(t,s)}(window,document,'script',
'https://connect.facebook.net/en_US/fbevents.js');
fbq('init', '194961257900508');
fbq('track', 'PageView');
</script>
<noscript>
<img height="1" width="1"
src="https://www.facebook.com/tr?id=194961257900508&ev=PageView
&noscript=1"/>
</noscript>
<!-- End Facebook Pixel Code -->
<!-- Global site tag (gtag.js) - Google Ads: 808701460 -->
<script async src="https://www.googletagmanager.com/gtag/js?id=AW-808701460"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'AW-808701460');
</script>
<!-- Yandex.Metrika counter -->
<script type="text/javascript" >
(function (d, w, c) {
(w[c] = w[c] || []).push(function() {
try {
w.yaCounter49354039 = new Ya.Metrika2({
id:49354039,
clickmap:true,
trackLinks:true,
accurateTrackBounce:true,
webvisor:true
});
} catch(e) { }
});
var n = d.getElementsByTagName("script")[0],
s = d.createElement("script"),
f = function () { n.parentNode.insertBefore(s, n); };
s.type = "text/javascript";
s.async = true;
s.src = "https://mc.yandex.ru/metrika/tag.js";
if (w.opera == "[object Opera]") {
d.addEventListener("DOMContentLoaded", f, false);
} else { f(); }
})(document, window, "yandex_metrika_callbacks2");
</script>
<noscript><div><img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->
{% include "templates/blocks/mixpanel.html" %}
{% block layer_head %}{% endblock layer_head %}
</head>
<body>
{% block layer_body %}
{% endblock layer_body %}
</body>
</html>

@ -0,0 +1,82 @@
{% extends "templates/lilcity/layer.html" %} {% load static %}
{% block title %}School LIL.CITY{% endblock title %}
{% block layer_head %}
<style>
</style>
{% endblock layer_head %}
{% block layer_body %}
<div class="main main_default" style="
min-height: auto;
padding-top: 20px;
padding-bottom: 0;
margin-top: 0;">
<div class="main__center center">
<a href="{% url 'index' %}?utm_source=posadochnaya_stranica&utm_medium=main_page&utm_campaign=main_page">
<div style="
height: 90px;
background: url({% static '/img/school-lil-city.svg?205d8a56465e' %}) no-repeat center 0;
"></div>
</a>
<div class="main__title">
<span class="main__bold">Lil School</span> — первая образовательная онлайн-платформа креативного мышления для детей! 5+
</div>
</div>
</div>
<div class="section">
<div class="section__center center">
<div style="display: flex; flex-direction: column;">
<a class="btn" style="margin: 10px 0;"
href="{% url 'index' %}?utm_source=posadochnaya_stranica&utm_medium=probniy_urok&utm_campaign=probniy_urok">
Бесплатный пробный урок</a>
<a class="btn" style="margin: 10px 0;"
href="{% url 'school:school' %}/?utm_source=posadochnaya_stranica&utm_medium=onlayn_shkola&utm_campaign=onlayn_shkola">
Онлайн школа</a>
<a class="btn" style="margin: 10px 0;"
href="{% url 'courses' %}/?utm_source=posadochnaya_stranica&utm_medium=Videokursy&utm_campaign=Videokursy">
Видеокурсы</a>
<a class="btn" style="margin: 10px 0;"
href="{% url 'gift-certificates' %}?utm_source=posadochnaya_stranica&utm_medium=Sertifikaty&utm_campaign=Sertifikaty">
Подарочные сертификаты</a>
<a class="btn" style="margin: 10px 0;"
href="{% url 'course' 'metodicheskoe-posobie-dlya-razvitiya-kreativnogo-mishleniya-detey' %}?utm_source=posadochnaya_stranica&utm_medium=Metodichka&utm_campaign=Metodichka">
Методическое пособие</a>
<a class="btn" style="margin: 10px 0;"
href="{% url 'course' 'kak-stat-illiustratorom' %}?utm_source=posadochnaya_stranica&utm_medium=Kurs_sashaKru&utm_campaign=Kurs_sashaKru">
Курс иллюстрации от SashaKru
</a>
</div>
</div>
</div>
<div class="section">
<div class="title title_center">Подписывайтесь на наши социальные сети</div>
</div>
<div style="font-size: 2.4em; display: flex; margin-bottom: 30px;">
<div style="margin: 0 auto;">
<a target="_blank" href="{{ config.SERVICE_INSTAGRAM_URL }}" style="margin: 0 20px; display: inline-block;">
<svg class="icon icon-instagram">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-instagram"></use>
</svg>
</a>
<a target="_blank" href="{{ config.SERVICE_TWITTER_URL }}" style="margin: 0 20px; display: inline-block;">
<svg class="icon icon-twitter">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-twitter"></use>
</svg>
</a>
<a target="_blank" href="{{ config.SERVICE_FB_URL }}" style="margin: 0 20px; display: inline-block;">
<svg class="icon icon-fb">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-fb"></use>
</svg>
</a>
<a target="_blank" href="{{ config.SERVICE_YOUTUBE_URL }}" style="margin: 0 20px; display: inline-block;">
<svg class="icon icon-youtube">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-youtube"></use>
</svg>
</a>
</div>
</div>
{% endblock layer_body %}

@ -37,7 +37,7 @@ from apps.payment.views import (
SchoolBuyView, GiftCertificatesView, GiftCertificateBuyView, SchoolBuyView, GiftCertificatesView, GiftCertificateBuyView,
GiftCertificateBuySuccessView, GiftCertificateGetView) GiftCertificateBuySuccessView, GiftCertificateGetView)
from .views import AboutView, IndexView, SchoolSchedulesView from .views import AboutView, IndexView, SchoolSchedulesView, LinksView
# TODO trim slash in the end # TODO trim slash in the end
urlpatterns = [ urlpatterns = [
@ -98,6 +98,7 @@ urlpatterns = [
name='gift-certificate-payment-success'), name='gift-certificate-payment-success'),
path('gift-certificate/<str:slug>/get', GiftCertificateGetView.as_view(), name='gift-certificate-get'), path('gift-certificate/<str:slug>/get', GiftCertificateGetView.as_view(), name='gift-certificate-get'),
path('faq', FAQView.as_view(), name='faq'), path('faq', FAQView.as_view(), name='faq'),
path('links', LinksView.as_view(), name='links'),
] ]

@ -123,3 +123,7 @@ class SchoolSchedulesView(TemplateView):
context = super().get_context_data() context = super().get_context_data()
context['school_schedules'] = SchoolSchedule.objects.all() context['school_schedules'] = SchoolSchedule.objects.all()
return context return context
class LinksView(TemplateView):
template_name = 'templates/lilcity/links.html'

Loading…
Cancel
Save