From a9e27dfd6c0c4a18eab645c5db56f5733c64480f Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Sun, 22 Apr 2018 18:56:53 +0300 Subject: [PATCH] Fix header links & new live lesson create view --- apps/school/urls.py | 1 + project/templates/blocks/header.html | 38 +++++++++++++++++----------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/apps/school/urls.py b/apps/school/urls.py index d3ebfd95..59973c6d 100644 --- a/apps/school/urls.py +++ b/apps/school/urls.py @@ -10,6 +10,7 @@ urlpatterns = [ path('', SchoolView.as_view(), name='school'), path('schedules/print', SchoolSchedulesPrintView.as_view(), name='school_schedules-print'), path('lessons/', LiveLessonsView.as_view(), name='lessons'), + path('lessons/create', LiveLessonEditView.as_view(), name='lessons-create'), path('lessons//edit', LiveLessonEditView.as_view(), name='lessons-edit'), path('lessons//', LiveLessonsDetailView.as_view(), name='lesson-detail'), ] diff --git a/project/templates/blocks/header.html b/project/templates/blocks/header.html index 1007fd6f..49a595b5 100644 --- a/project/templates/blocks/header.html +++ b/project/templates/blocks/header.html @@ -93,23 +93,31 @@
{% if request.user.role >= request.user.AUTHOR_ROLE %} - {{ request.user.balance }} руб. + + {{ request.user.balance }} руб. + {% if request.user.auth_token %} + {% if request.user.role == request.user.AUTHOR_ROLE or request.user.role == request.user.ADMIN_ROLE %} - {% comment %} - {% endcomment %} -
ДОБАВИТЬ КУРС
- - {% endif %} {% endif %} - -
ПРОФИЛЬ
- - -
НАСТРОЙКИ
- - -
ВЫЙТИ
- +
ДОБАВИТЬ КУРС
+ + {% endif %} + {% if request.user.role == request.user.TEACHER_ROLE or request.user.role == request.user.ADMIN_ROLE %} + +
ДОБАВИТЬ ОНЛАЙН-УРОК
+ + {% endif %} + {% endif %} + {% endif %} + +
ПРОФИЛЬ
+ + +
НАСТРОЙКИ
+ + +
ВЫЙТИ
+
{% else %}