From 95083e82f76fd483ed20858d5ad0c6ae16ec5102 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 29 May 2019 19:46:55 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D1=81=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=B8=D0=B4=D0=B5=D0=BE?=
 =?UTF-8?q?=20=D1=81=20=D1=8E=D1=82=D1=83=D0=B1=D0=B0=20=D0=B2=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=B0=D0=BF=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/js/modules/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index 1894241e..f1960d57 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -81,7 +81,7 @@ $(document).ready(function () {
             channel = 'youtube';
         }
         if(url.indexOf('youtube.com') > -1 && url.indexOf('watch') > -1){
-            const m = /[?&]v=([a-zA-Z]+)(&.)?/.exec(url);
+            const m = /[?&]v=([a-zA-Z\d]+)(&.)?/.exec(url);
             channel = 'youtube';
             videoId = m && m[1];
         }

From 3c9bf7ff46a052ea1d84bc5aa40162b2da168d98 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 29 May 2019 20:22:08 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D1=81=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=B8=D0=B4=D0=B5=D0=BE?=
 =?UTF-8?q?=20=D1=81=20=D1=8E=D1=82=D1=83=D0=B1=D0=B0=20=D0=B2=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=B0=D0=BF=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/js/modules/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index f1960d57..c774c6ef 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -81,7 +81,7 @@ $(document).ready(function () {
             channel = 'youtube';
         }
         if(url.indexOf('youtube.com') > -1 && url.indexOf('watch') > -1){
-            const m = /[?&]v=([a-zA-Z\d]+)(&.)?/.exec(url);
+            const m = /[?&]v=([^&]+)(&.+)?$/.exec(url);
             channel = 'youtube';
             videoId = m && m[1];
         }

From 19faba4162da2700b7e493dfde8b88836970e900 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 29 May 2019 20:25:14 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D1=81=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=B8=D0=B4=D0=B5=D0=BE?=
 =?UTF-8?q?=20=D1=81=20=D1=8E=D1=82=D1=83=D0=B1=D0=B0=20=D0=B2=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=B0=D0=BF=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/school/templates/blocks/schedule_item.html | 4 ++--
 project/templates/blocks/video.html             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/school/templates/blocks/schedule_item.html b/apps/school/templates/blocks/schedule_item.html
index 593d0426..4de76462 100644
--- a/apps/school/templates/blocks/schedule_item.html
+++ b/apps/school/templates/blocks/schedule_item.html
@@ -7,7 +7,7 @@
       <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
         {{ school_schedule }}
         {% if not is_purchased and request.user_agent.is_mobile and school_schedule.trial_lesson %}
-        <a class="timing__trial-lesson js-video-modal" href="#" data-trial-lesson="1" data-video-url="{{ school_schedule.trial_lesson }}">Пробный урок</a>
+        <a class="timing__trial-lesson js-video-modal" href="#" data-trial-lesson="1" data-video-url="{{ school_schedule.trial_lesson|safe }}">Пробный урок</a>
         {% endif %}
       </div>
       {% if is_purchased and live_lesson %}
@@ -25,7 +25,7 @@
           {% endif %}
         {% endif %}
         {% if not is_purchased and not request.user_agent.is_mobile and school_schedule.trial_lesson and not is_drawing_camp %}
-        <a class="timing__trial-lesson js-video-modal" href="#" data-trial-lesson="1" data-video-url="{{ school_schedule.trial_lesson }}">Пробный урок</a>
+        <a class="timing__trial-lesson js-video-modal" href="#" data-trial-lesson="1" data-video-url="{{ school_schedule.trial_lesson|safe }}">Пробный урок</a>
         {% endif %}
       </div>
     </div>
diff --git a/project/templates/blocks/video.html b/project/templates/blocks/video.html
index c0eebf5a..2d1fcada 100644
--- a/project/templates/blocks/video.html
+++ b/project/templates/blocks/video.html
@@ -1,10 +1,10 @@
 <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"
+    <img class="main-video-preview js-video-modal" data-video-url="{{ config.MAIN_PAGE_VIDEO_URL|safe }}" 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>
-    <div>Много развивающих видео на&nbsp;нашем <a href="{{ config.SERVICE_YOUTUBE_URL }}">YouTube&nbsp;канале</a></div>
+       data-video-url="{{ config.MAIN_PAGE_VIDEO_URL|safe }}" data-trial-lesson="1">Смотреть бесплатно</a>
+    <div>Много развивающих видео на&nbsp;нашем <a href="{{ config.SERVICE_YOUTUBE_URL|safe }}">YouTube&nbsp;канале</a></div>
   </div>
 </div>