From ac572abc9a6b1a2133eb70380b13148cefe1501e Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 15 Feb 2018 15:30:56 +0300 Subject: [PATCH] LIL-246. Lesson list --- apps/course/templates/course/course.html | 36 ++- .../templates/course/course_only_lessons.html | 273 ++++++++++++++++++ project/urls.py | 7 +- 3 files changed, 304 insertions(+), 12 deletions(-) create mode 100644 apps/course/templates/course/course_only_lessons.html diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html index f0e5794d..2186602a 100644 --- a/apps/course/templates/course/course.html +++ b/apps/course/templates/course/course.html @@ -131,15 +131,25 @@
- + Описание курса + {% if request.user.role == request.user.AUTHOR_ROLE or request.user.role == request.user.ADMIN_ROLE %} + УРОКИ + {% comment %} + + {% endcomment %} + + {% else %} + {% endif %}
{% if course.cover %} @@ -231,7 +241,11 @@
Содержание курса
{% for lesson in course.lessons.all %} - + {% if request.user.role == request.user.AUTHOR_ROLE or request.user.role == request.user.ADMIN_ROLE %} + + {% else %} +
+ {% endif %}
{{ lesson.title }}
@@ -247,7 +261,11 @@
{{ lesson.short_description | safe }}
- + {% if request.user.role == request.user.AUTHOR_ROLE or request.user.role == request.user.ADMIN_ROLE %} + + {% else %} +
+ {% endif %} {% endfor %}
{% comment %}
diff --git a/apps/course/templates/course/course_only_lessons.html b/apps/course/templates/course/course_only_lessons.html new file mode 100644 index 00000000..88667fc0 --- /dev/null +++ b/apps/course/templates/course/course_only_lessons.html @@ -0,0 +1,273 @@ +{% extends "templates/lilcity/index.html" %} +{% load static %} +{% load data_liked from data_liked %} +{% load rupluralize from plural %} +{% block title %}{{ course.title }} - {{ block.super }}{% endblock title %} +{% comment %} seo tags {% endcomment %} +{% block description %}{{ course.short_description }}{% endblock description%} +{% block twurl %}{{ request.build_absolute_uri }}{% endblock twurl %} +{% block ogtitle %}{{ course.title }} - {{ block.super }}{% endblock ogtitle %} +{% block ogurl %}{{ request.build_absolute_uri }}{% endblock ogurl %} +{% if course.cover %} +{% block ogimage %}{{ request.build_absolute_uri }}{{ course.cover.url }}{% endblock ogimage %} +{% endif %} +{% block ogdescription %}{{ course.short_description }}{% endblock ogdescription %} + +{% block content %} +
+
+
+ +
+ + + +
+
Вернуться
+ + +
+
+
+
{{ course.category.title | upper }}
+ {% data_liked user course as liked %} + +
+
{{ course.title }}
+
{{ course.short_description }}
+ +
+ {% if course.author.photo %} +
+ +
+ {% else %} +
+ +
+ {% endif %} +
+
{{ course.author.get_full_name }}
+
+
{{ course.created_at_humanize }}
+
+
+
+ +
+
+
+
+ + + +
+
{{ course.duration | rupluralize:"день,дня,дней" }}
+
+
+
+ + + +
+
{{ course.created_at | date:"d F Yг." }}
+
+
+
+ + + +
+
{{ course.price|floatformat:"-2" }}₽
+
+
+
+
+
+ + + +
+
{{ course.lessons.count | rupluralize:"урок,урока,уроков" }}
+
+
+
+ + + +
+
{{ course.count_videos_in_lessons }} видео
+
+
+
+
+ Описание курса + УРОКИ + {% comment %} + + {% endcomment %} + +
+
+
+{% if user.is_authenticated and course.lessons.exists %} +
+
+
+
Содержание курса
+
+ {% for lesson in course.lessons.all %} + +
+
{{ lesson.title }}
+
+ {% if lesson.cover %} +
+ +
+ {% else %} +
+ +
+ {% endif %} +
{{ lesson.short_description | safe }}
+
+
+ + {% endfor %} +
+ {% comment %}
+ +
{% endcomment %} +
+
+
+{% comment %}
+
+
Материалы, которые понадобятся
+
+ {% for material in course.materials.all %} +
+ {% if material.cover %} +
+ +
+ {% else %} +
+ +
+ {% endif %} +
+
{{ material.title }}
+
{{ material.short_description }}
+
+
+ {% endfor %} +
+
+
{% endcomment %} +{% endif %} +{% if course.gallery %} +
+
+ {% include "course/content/gallery.html" with results=True %} +
+
+{% endif %} +
+
+
Задавайте вопросы:
+
+ {% if user.is_authenticated %} +
+ +
+ +
+
+
В ответ на + этот комментарий. + Отменить +
+
+ +
+ +
+
+ {% else %} +
Только зарегистрированные пользователи могут оставлять комментарии.
+ {% endif %} +
+ {% include "./blocks/comments.html" with object=course %} +
+
+
+
+
+
+ +
+
+{% endblock content %} \ No newline at end of file diff --git a/project/urls.py b/project/urls.py index a2ac246b..2df911b7 100644 --- a/project/urls.py +++ b/project/urls.py @@ -34,12 +34,13 @@ urlpatterns = [ path('admin/', admin.site.urls), path('auth/', include(('apps.auth.urls', 'lilcity'))), path('courses/', CoursesView.as_view(), name='courses'), - path('course//', CourseView.as_view(), name='course'), - path('course//', CourseView.as_view(), name='course'), - path('course//like', likes, name='likes'), path('course/create', CourseEditView.as_view(), name='course_create'), path('course/on-moderation', CourseOnModerationView.as_view(), name='course-on-moderation'), + path('course//', CourseView.as_view(), name='course'), + path('course//', CourseView.as_view(), name='course'), path('course//edit', CourseEditView.as_view(), name='course_edit'), + path('course//lessons', CourseView.as_view(template_name='course/course_only_lessons.html'), name='course-only-lessons'), + 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'),