@@ -128,13 +218,17 @@
Материалы, которые понадобятся
- {% for material in course.materials.all %}
+ {% for material in course.materials.all %}
{% if material.cover %}
-
+
+
+
{% else %}
-
- {% endif %}
+
+
+
+ {% endif %}
{{ material.title }}
{{ material.short_description }}
@@ -148,18 +242,42 @@
Галерея итогов обучения
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -168,7 +286,7 @@
@@ -186,9 +312,13 @@
Этот курс поможет детям узнать о том как из простых форм создавать веселый и харизматичных персонажей.
{% if course.author.photo %}
-
+
+
+
{% else %}
-
+
+
+
{% endif %}
{{ course.author.get_full_name }}
@@ -200,18 +330,32 @@
+
+
+
@@ -221,24 +365,26 @@
- {% include "./blocks/comments.html" with object=course %}
+ {% include "./blocks/comments.html" with object=course %}
@@ -247,10 +393,29 @@
-{% endblock content %}
+{% endblock content %}
\ No newline at end of file
diff --git a/apps/course/templatetags/plural.py b/apps/course/templatetags/plural.py
new file mode 100644
index 00000000..9ff90c4d
--- /dev/null
+++ b/apps/course/templatetags/plural.py
@@ -0,0 +1,16 @@
+from django import template
+from django.template.defaultfilters import stringfilter
+
+register = template.Library()
+
+
+@register.filter(is_safe=False)
+@stringfilter
+def rupluralize(value, arg):
+ args = arg.split(',')
+ try:
+ value = str(0 if not value or int(value) <= 0 else value)[-1:]
+ return value + ' ' + args[0 if value == '1' else (1 if value in '234' else 2)]
+ except:
+ raise template.TemplateSyntaxError
+ return ''
diff --git a/apps/course/views.py b/apps/course/views.py
index 38d3f921..8f5c7d14 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -87,6 +87,55 @@ def coursecomment(request, course_id):
})
+@login_required
+@csrf_exempt
+@require_http_methods(['POST'])
+def lessoncomment(request, Lesson):
+ try:
+ lesson = Lesson.objects.get(id=lesson_id)
+ except Lesson.DoesNotExist:
+ return JsonResponse({
+ 'success': False,
+ 'errors': ['Lesson with id f{lesson_id} not found']
+ }, status=400)
+ else:
+ reply_to = request.POST.get('reply_id', 0)
+ comment = request.POST.get('comment', '')
+ if not comment:
+ return JsonResponse({
+ 'success': False,
+ 'errors': ['Comment can not be empty']
+ }, status=400)
+
+ if not int(reply_to):
+ lessoncomment = LessonComment.objects.create(
+ author=request.user,
+ content=comment,
+ course=course,
+ )
+ else:
+ try:
+ _lessoncomment = LessonComment.objects.get(id=reply_to)
+ except LessonComment.DoesNotExist:
+ return JsonResponse({
+ 'success': False,
+ 'errors': ['CourseComment with id f{reply_to} not found']
+ }, status=400)
+ else:
+ lessoncomment = LessonComment.objects.create(
+ author=request.user,
+ content=comment,
+ course=course,
+ parent=_lessoncomment,
+ )
+ ctx = {'node': lessoncomment, 'user': request.user}
+ html = loader.render_to_string('course/blocks/comment.html', ctx)
+ return JsonResponse({
+ 'success': True,
+ 'comment': html,
+ })
+
+
class CourseView(DetailView):
model = Course
context_object_name = 'course'
diff --git a/apps/notification/templates/notification/email/_base.html b/apps/notification/templates/notification/email/_base.html
index 92d6d367..b4ce1c89 100644
--- a/apps/notification/templates/notification/email/_base.html
+++ b/apps/notification/templates/notification/email/_base.html
@@ -61,7 +61,7 @@
- Отписаться от рассылки
+ {% comment %} Отписаться от рассылки {% endcomment %}
|
diff --git a/apps/notification/templates/notification/email/verification_email.html b/apps/notification/templates/notification/email/verification_email.html
index 0a3bbeff..9763f0c9 100644
--- a/apps/notification/templates/notification/email/verification_email.html
+++ b/apps/notification/templates/notification/email/verification_email.html
@@ -1,5 +1,10 @@
{% extends "notification/email/_base.html" %}
{% block content %}
- {{ token }}
-{% endblock content %}
\ No newline at end of file
+
Спасибо за регистрацию! Для продолжения работы, подтвердите, пожалуйста, электронную почту.
+
+{% endblock content %}
diff --git a/apps/user/fixtures/superuser.json b/apps/user/fixtures/superuser.json
index f9fc5b21..385896cb 100644
--- a/apps/user/fixtures/superuser.json
+++ b/apps/user/fixtures/superuser.json
@@ -4,29 +4,30 @@
"pk": 1,
"fields": {
"password": "pbkdf2_sha256$100000$HoGxjmAQy4yo$3u+CrUiFtooddpg16OEUaSSjqUlwgFUBP1gt75hEoJs=",
- "last_login": "2018-01-28T08:41:44.702Z",
+ "last_login": "2018-01-31T14:51:34Z",
"is_superuser": true,
"username": "admin@lil.city",
- "first_name": "",
- "last_name": "",
+ "first_name": "Lil",
+ "last_name": "City",
"is_staff": true,
"is_active": true,
- "date_joined": "2018-01-28T08:41:19.690Z",
+ "date_joined": "2018-01-28T08:41:19Z",
"email": "admin@lil.city",
"role": 0,
- "gender": "",
+ "gender": "n",
"country": "",
"city": "",
- "about": "",
- "instagram": "",
- "facebook": "",
- "twitter": "",
- "pinterest": "",
- "youtube": "",
- "vkontakte": "",
+ "about": "\u0417\u0430\u043a\u043e\u043d\u0447\u0438\u043b\u0430 \u041f\u0425\u0423 \u0438\u043c \u041a.\u0410.\u0421\u0430\u0432\u0438\u0446\u043a\u043e\u0433\u043e \u0445\u0443\u0434\u043e\u0436\u043d\u0438\u043a \u0442\u0435\u0430\u0442\u0440\u0430 \u0438 \u043a\u0438\u043d\u043e. \u0420\u0430\u0431\u043e\u0442\u0430\u043b\u0430 \u0441 \u043a\u0440\u0443\u043f\u043d\u0435\u0439\u0448\u0438\u043c\u0438 \u0440\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0438\u043c\u0438 \u0438 \u0437\u0430\u0440\u0443\u0431\u0435\u0436\u043d\u044b\u043c\u0438 \u0438\u0437\u0434\u0430\u0442\u0435\u043b\u044c\u0441\u0442\u0432\u0430\u043c\u0438. \u0423\u0447\u0430\u0441\u0442\u043d\u0438\u043a \u0438 \u043f\u043e\u0431\u0435\u0434\u0438\u0442\u0435\u043b\u044c \u043c\u0435\u0436\u0434\u0443\u043d\u0430\u0440\u043e\u0434\u043d\u044b\u0445 \u0432\u044b\u0441\u0442\u0430\u0432\u043e\u043a. \u041e\u0441\u043d\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043a\u043e\u043c\u043f\u0430\u043d\u0438\u0438 \"Lil City\".",
+ "instagram": null,
+ "facebook": null,
+ "twitter": null,
+ "pinterest": null,
+ "youtube": null,
+ "vkontakte": null,
"fb_id": null,
"fb_data": {},
"is_email_proved": false,
+ "photo": "",
"groups": [],
"user_permissions": []
}
diff --git a/media/lessons/kat-watercolor.jpg b/media/lessons/kat-watercolor.jpg
new file mode 100644
index 00000000..d426e7f5
Binary files /dev/null and b/media/lessons/kat-watercolor.jpg differ
diff --git a/media/lessons/kat-watercolor_QYFi9sq.jpg b/media/lessons/kat-watercolor_QYFi9sq.jpg
new file mode 100644
index 00000000..d426e7f5
Binary files /dev/null and b/media/lessons/kat-watercolor_QYFi9sq.jpg differ
diff --git a/media/lessons/kat-watercolor_SA9juHa.jpg b/media/lessons/kat-watercolor_SA9juHa.jpg
new file mode 100644
index 00000000..d426e7f5
Binary files /dev/null and b/media/lessons/kat-watercolor_SA9juHa.jpg differ
diff --git a/media/materials/kat-watercolor.jpg b/media/materials/kat-watercolor.jpg
new file mode 100644
index 00000000..d426e7f5
Binary files /dev/null and b/media/materials/kat-watercolor.jpg differ
diff --git a/media/materials/shutterstock_125323070-700x861.jpg b/media/materials/shutterstock_125323070-700x861.jpg
new file mode 100644
index 00000000..15d790e4
Binary files /dev/null and b/media/materials/shutterstock_125323070-700x861.jpg differ
diff --git a/media/materials/краски.jpeg b/media/materials/краски.jpeg
new file mode 100644
index 00000000..c0d34541
Binary files /dev/null and b/media/materials/краски.jpeg differ
diff --git a/project/settings.py b/project/settings.py
index 41d842cc..f55487d1 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -127,7 +127,7 @@ AUTH_USER_MODEL = 'user.User'
# Internationalization
# https://docs.djangoproject.com/en/2.0/topics/i18n/
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'ru-RU'
TIME_ZONE = 'UTC'
diff --git a/project/urls.py b/project/urls.py
index 701135a6..30854945 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -21,6 +21,7 @@ from django.conf import settings
from apps.course.views import (
CoursesView, likes, coursecomment,
CourseView, LessonView, SearchView,
+ lessoncomment,
)
from apps.user.views import UserView
@@ -32,6 +33,7 @@ urlpatterns = [
path('course/
/like', likes, name='likes'),
path('course//comment', coursecomment, name='coursecomment'),
path('lesson//', LessonView.as_view(), name='lesson'),
+ path('lesson//comment', lessoncomment, name='lessoncomment'),
path('search/', SearchView.as_view(), name='search'),
path('user//', UserView.as_view(), name='user'),
path('', TemplateView.as_view(template_name="templates/lilcity/main.html"), name='index'),
+