Merge branch 'feature/free-lessons' into 'master'

вкладка бесплатных уроков

See merge request lilschool/site!352
remotes/origin/hotfix/baner-save-25-07-19
Danil 7 years ago
commit 6d7ac9e3aa
  1. 2
      api/v1/serializers/config.py
  2. 25
      apps/school/templates/school/free_lessons.html
  3. 3
      web/src/js/pages/free-lessons.js
  4. 10
      web/src/sass/_common.sass

@ -31,7 +31,7 @@ class ConfigSerializer(serializers.ModelSerializer):
NUMBER_OF_COUNTRIES = serializers.IntegerField()
NUMBER_OF_CITIES = serializers.IntegerField()
FREE_LESSONS_VIDEO_URL = serializers.CharField(required=False)
FREE_LESSONS_VIDEO_PREVIEW_IMG = serializers.SerializerMethodField()
FREE_LESSONS_VIDEO_PREVIEW_IMG = serializers.SerializerMethodField(required=False)
class Meta:
model = Config

@ -4,7 +4,7 @@
{% block ogsite-name %}Первая образовательная онлайн-платформа креативного мышления для детей{% endblock ogsite-name %}
{% block content %}
<div class="main main_default" style="background-image: url({% static 'img/bg-2.jpg' %}); padding-top: 150px; min-height: 300px;">
<div class="main main_default free-lessons-title" style="background-image: url({% static 'img/bg-2.jpg' %});">
<div class="main__center center">
<div class="main__title">
<span class="main__bold">Месяц открытых дверей!</span>
@ -64,26 +64,5 @@
{% block foot %}
{% include "templates/blocks/popup_ref_link.html" %}
<script type="text/javascript" src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script>
<script type="text/javascript">
$(document).ready(function () {
$(document).on('popup-opened', (e, popup) => {
$('#referrer-url').select();
});
$('#referrer-url').click(function(){
$(this).select();
});
const clipboard = new ClipboardJS('#copy-referrer-url-btn');
clipboard.on('success', e => {
console.log(123);
//showNotification('success', 'Ссылка скопирована');
});
clipboard.on('error', function(e) {
console.error('Action:', e.action);
console.error('Trigger:', e.trigger);
});
});
</script>
<!--<script type="text/javascript" src="{% static 'freeLessons.js' %}"></script>-->
<script type="text/javascript" src="{% static 'freeLessons.js' %}"></script>
{% endblock foot %}

@ -3,9 +3,6 @@ import ClipboardJS from 'clipboard';
import {showNotification} from '../modules/notification';
$(document).ready(function () {
$(document).on('popup-opened', (e, popup) => {
$('#referrer-url').select();
});
const clipboard = new ClipboardJS('#copy-referrer-url-btn');
clipboard.on('success', e => {
showNotification('success', 'Ссылка скопирована');

@ -4782,3 +4782,13 @@ a
&_like &__like-btn
display: block
.free-lessons-title
padding-top: 140px
min-height: 300px
padding-bottom: 120px
+m
padding-top: 80px
min-height: 200px
padding-bottom: 60px

Loading…
Cancel
Save