From b48d79029c9af455d1c585d0113de5a1ff6700d9 Mon Sep 17 00:00:00 2001
From: Mikhail Bortnikov <godm.bort@gmail.com>
Date: Mon, 24 Apr 2017 16:12:15 +0300
Subject: [PATCH 1/6] =?UTF-8?q?=D0=9C=D0=B5=D1=88=D0=B0=D0=BB=D0=BE=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BC=D0=B0=D1=88=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/homework.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/homework.js b/static/js/homework.js
index da4fd46..6b36064 100755
--- a/static/js/homework.js
+++ b/static/js/homework.js
@@ -76,7 +76,7 @@ function show_popup(){
     popup = document.getElementById('teacher_popup')
     popup.classList.toggle('hidden')
     popup.onclick = function(e){
-        if e.target == this{
+        if (e.target == this){
             popup.classList.add('hidden')
         }
     }
@@ -257,4 +257,4 @@ $(function(){
       $('html,body').stop().animate({ scrollTop: $('#go_to_textarea').offset().top }, 1000);
       e.preventDefault();
     });
-});
\ No newline at end of file
+});

From 7452f93b0eb8d5257a572817d240e50a19779990 Mon Sep 17 00:00:00 2001
From: Mikhail Bortnikov <godm.bort@gmail.com>
Date: Wed, 26 Apr 2017 17:13:42 +0300
Subject: [PATCH 2/6] =?UTF-8?q?=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D1=83=D1=80=D0=BE=D0=BA=D0=B8=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=B6=D0=B5=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BE=D0=BD=20?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/course.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/course.html b/templates/course.html
index ba8c606..73b7b90 100755
--- a/templates/course.html
+++ b/templates/course.html
@@ -188,7 +188,7 @@
                                 </div>
                             {% endif %}
 
-                            {% if i.head.lessons_length > 1 %}
+                            {% if i.head.lessons_length >= 1 %}
                                 <ul style="padding: 0 0 0 15px;">
                                     {% for lesson in i.lessons %}
                                         <li style="    padding-bottom: 3px;">

From 5a5bd65320ba5aa182a2079e7fd8b9d7998b30d3 Mon Sep 17 00:00:00 2001
From: Mikhail Bortnikov <godm.bort@gmail.com>
Date: Wed, 26 Apr 2017 17:46:33 +0300
Subject: [PATCH 3/6] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=B5=D0=BD=D1=82=D1=8B?=
 =?UTF-8?q?=20=D0=BD=D0=B5=20=D1=81=D0=BA=D0=B0=D1=87=D0=B0=D1=82,=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D1=88=D1=8C=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/homework.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/static/js/homework.js b/static/js/homework.js
index 6b36064..b3b3565 100755
--- a/static/js/homework.js
+++ b/static/js/homework.js
@@ -29,11 +29,10 @@ function send_comment(form, root){
                         $('[name='+$('#'+root).attr('sketch_place')+']').html('');
 
                         if (!$('[name=try_'+data['data']['try']['id']+']').html()){
-                            $('[name=comment_list_place]').append('<h3 style="margin-bottom: 25px;margin-left: 20px;' +
+                            $('[name=comment_list_place]').after('<h3 style="margin-bottom: 25px;margin-left: 20px;' +
                                 'font-weight: bold;border-bottom: 1px dotted #ccc;padding-bottom: 5px;">' +
-                                '<i class="glyphicon glyphicon-briefcase"></i>&nbsp;Попыток: (<span name="comments_length">1</span>) : </h3>' +
-                                '<div class="col-lg-12" name="homework_comments_block"></div>');
-                            $('[name=homework_comments_block]').append(new_try(data['data']['try']))
+                                '<i class="glyphicon glyphicon-briefcase"></i>&nbsp;Попыток: (<span name="comments_length">1</span>)</h3>');
+                           $('[name=sent_comment_progress]').before(new_try(data['data']['try']));
                         }
                         $('[name=try_comments_'+data['data']['try']['id']+']').append('<div name="comment_'+data['data']['comment']['id']+'"></div>');
                         write_comment($('[name=comment_'+data['data']['comment']['id']+']'), data['data']['comment']);

From 871bc623fb221c452abb0f42a09ac170da3509d9 Mon Sep 17 00:00:00 2001
From: Mikhail Bortnikov <godm.bort@gmail.com>
Date: Thu, 4 May 2017 16:52:53 +0300
Subject: [PATCH 4/6] =?UTF-8?q?=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=83=D0=B2=D0=B5=D1=80=D0=B5=D0=BD=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BD=D1=8F=D1=82=D0=B8=D1=8F=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=B0=D1=88=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/homework.js            | 8 +-------
 templates/workshop_homework.html | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/static/js/homework.js b/static/js/homework.js
index b3b3565..7be554a 100755
--- a/static/js/homework.js
+++ b/static/js/homework.js
@@ -68,16 +68,10 @@ function send_homework_down_teacher(form, root){
     }
 }
 function show_popup(){
-    // нужно было сделать быстро - поэтому сделали гавно (с) skillbox
-    // нужно переделать под jquery
-    // сделать тоже самое и для кнопки отказать. 
-    // Хороший способ передавать функцию отправки (up & down) сюда и здесь её запускать
     popup = document.getElementById('teacher_popup')
     popup.classList.toggle('hidden')
     popup.onclick = function(e){
-        if (e.target == this){
-            popup.classList.add('hidden')
-        }
+        popup.classList.add('hidden')
     }
 }
 function send_homework_up_teacher(form, root){
diff --git a/templates/workshop_homework.html b/templates/workshop_homework.html
index 781ceb2..36e1743 100755
--- a/templates/workshop_homework.html
+++ b/templates/workshop_homework.html
@@ -165,7 +165,7 @@
 
                                   </div>
                                   <div class="col-xs-12 col-sm-12 col-md-3 p-r-none m-b-md">
-                                    <button class="btn btn-lg btn-success m-t-xs pull-right" style="    border-radius: 0 20px 20px 0;" onclick="send_homework_up_teacher('comment_send_form', 'form_file_load')">
+                                    <button class="btn btn-lg btn-success m-t-xs pull-right" style="    border-radius: 0 20px 20px 0;" onclick="show_popup()">
                                         <i class="glyphicon glyphicon-thumbs-up" style="    margin: 0 10px 0 5px;"></i> Одобрить
                                     </button>
                                       <button class="btn btn-lg btn-danger m-t-xs pull-right" style="    border-radius: 20px 0 0 20px;" onclick="send_homework_down_teacher('comment_send_form', 'form_file_load')">

From 1055decfac90d1f71e1355f1069ce02b89e60ac6 Mon Sep 17 00:00:00 2001
From: Mikhail Bortnikov <godm.bort@gmail.com>
Date: Thu, 4 May 2017 16:55:24 +0300
Subject: [PATCH 5/6] =?UTF-8?q?=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B0=D0=BA=D0=BA=D0=B0=D1=83=D0=BD=D1=82=20?=
 =?UTF-8?q?=D0=B2=20=D0=BB=D0=B8=D1=87=D0=BD=D0=BE=D0=BC=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=B8=D0=BD=D0=B5=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/profile.html b/templates/profile.html
index c4e5c17..e3f4c73 100755
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -89,7 +89,7 @@
     padding-bottom: 10px;">
                         <i class="glyphicon glyphicon-link" style="margin-top: 7px;"></i> <input id="foo" style="    color: #0099CC;
     width: 239px;
-    border: 0;" readonly value="{{ DOMAIN }}{{ request.user.interactive_key }}">
+    border: 0;" readonly value="{{ DOMAIN }}/{{ request.user.interactive_key }}">
                         <button id="copy_unique_user_id" class="btn" type="button" data-clipboard-action="copy" data-clipboard-target="#foo" style="float: right;" onclick="show_system_message('Ссылка скопирована')">
                         <i class="glyphicon glyphicon-duplicate"></i> <span class="hidden-xs hidden-sm">Скопировать</span>
                         </button>

From ba88788d11949bb7c43870cce05b3e193bf9cf68 Mon Sep 17 00:00:00 2001
From: Mikhail Bortnikov <godm.bort@gmail.com>
Date: Thu, 4 May 2017 16:59:14 +0300
Subject: [PATCH 6/6] =?UTF-8?q?=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=20=D1=83=D1=80=D0=BE=D0=BA=20=D0=B4=D0=B0=D0=B6=D0=B5=20?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BE=D0=BD=20=D0=BE=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/course.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/course.html b/templates/course.html
index 73b7b90..ba8c606 100755
--- a/templates/course.html
+++ b/templates/course.html
@@ -188,7 +188,7 @@
                                 </div>
                             {% endif %}
 
-                            {% if i.head.lessons_length >= 1 %}
+                            {% if i.head.lessons_length > 1 %}
                                 <ul style="padding: 0 0 0 15px;">
                                     {% for lesson in i.lessons %}
                                         <li style="    padding-bottom: 3px;">