From 6e968cec29e5aabea7e3d4663d3c308a89f21d14 Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Fri, 20 Apr 2018 15:09:01 +0300
Subject: [PATCH] Fix header menu links

---
 apps/school/templates/blocks/about.html            |  2 +-
 apps/school/templates/blocks/advantages.html       |  2 +-
 apps/school/templates/blocks/schedule.html         |  2 +-
 .../templates/blocks/schedule_purchased.html       |  2 +-
 apps/school/templates/school/school.html           |  2 ++
 project/templates/blocks/about.html                |  2 +-
 project/templates/blocks/advantages.html           | 10 +++++-----
 project/templates/blocks/header.html               | 14 ++++++++------
 project/templates/blocks/partners.html             |  4 ++--
 9 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/apps/school/templates/blocks/about.html b/apps/school/templates/blocks/about.html
index be87f8f3..ecd3f1d8 100644
--- a/apps/school/templates/blocks/about.html
+++ b/apps/school/templates/blocks/about.html
@@ -1,5 +1,5 @@
 {% load static %}
-<div class="section">
+<div class="section" id="about">
   <div class="section__center center">
     <div class="title title_center">О школе</div>
     <div class="about">
diff --git a/apps/school/templates/blocks/advantages.html b/apps/school/templates/blocks/advantages.html
index f0de99fc..7538d3cd 100644
--- a/apps/school/templates/blocks/advantages.html
+++ b/apps/school/templates/blocks/advantages.html
@@ -1,5 +1,5 @@
 {% load static %}
-<div class="section section_benefits">
+<div class="section section_benefits" id="advantages">
   <div class="section__center center">
     <div class="title title_center">Преимущества</div>
     <div class="benefits benefits_colors">
diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html
index 4d91e276..62256198 100644
--- a/apps/school/templates/blocks/schedule.html
+++ b/apps/school/templates/blocks/schedule.html
@@ -1,6 +1,6 @@
 {% load static %}
 {% load thumbnail %}
-<div class="section">
+<div class="section" id="schedule">
   <div class="section__center center center_md">
     <div class="title title_center">Расписание</div>
     <div class="timing js-timing">
diff --git a/apps/school/templates/blocks/schedule_purchased.html b/apps/school/templates/blocks/schedule_purchased.html
index e17a3d61..f1ce1198 100644
--- a/apps/school/templates/blocks/schedule_purchased.html
+++ b/apps/school/templates/blocks/schedule_purchased.html
@@ -1,5 +1,5 @@
 {% load static %} {% load thumbnail %}
-<div class="section">
+<div class="section" id="schedule">
   <div class="section__center center">
     <div class="casing">
       <div class="casing__col">
diff --git a/apps/school/templates/school/school.html b/apps/school/templates/school/school.html
index 15ded766..b0a55c99 100644
--- a/apps/school/templates/school/school.html
+++ b/apps/school/templates/school/school.html
@@ -5,6 +5,8 @@
 {% include "../blocks/advantages.html" %}
 {% include "../blocks/online.html" %}
 {% include "../blocks/schedule.html" %}
+{% include "templates/blocks/game.html" %}
+{% include "templates/blocks/partners.html" %}
 {% else %}
 {% include "../blocks/schedule_purchased.html" %}
 {% endif %}
diff --git a/project/templates/blocks/about.html b/project/templates/blocks/about.html
index 7c9f17b9..3fc738b7 100644
--- a/project/templates/blocks/about.html
+++ b/project/templates/blocks/about.html
@@ -1,5 +1,5 @@
 {% load static %}
-<div class="section section_school">
+<div class="section section_school" id="about">
   <div class="section__center center">
     <div class="title title_center">Lil City School</div>
     <div class="text text_only_curve">
diff --git a/project/templates/blocks/advantages.html b/project/templates/blocks/advantages.html
index a74c4795..7538d3cd 100644
--- a/project/templates/blocks/advantages.html
+++ b/project/templates/blocks/advantages.html
@@ -1,12 +1,12 @@
 {% load static %}
-<div class="section section_benefits">
+<div class="section section_benefits" id="advantages">
   <div class="section__center center">
     <div class="title title_center">Преимущества</div>
     <div class="benefits benefits_colors">
       <div class="benefits__item">
         <div class="benefits__preview">
           <svg class="icon icon-thumb">
-            <use xlink:href="{%  static 'img/sprite.svg' %}#icon-thumb"></use>
+            <use xlink:href="{% static 'img/sprite.svg' %}#icon-thumb"></use>
           </svg>
         </div>
         <div class="benefits__title">Доступность</div>
@@ -15,7 +15,7 @@
       <div class="benefits__item">
         <div class="benefits__preview">
           <svg class="icon icon-wallet">
-            <use xlink:href="{%  static 'img/sprite.svg' %}#icon-wallet"></use>
+            <use xlink:href="{% static 'img/sprite.svg' %}#icon-wallet"></use>
           </svg>
         </div>
         <div class="benefits__title">Стоимость</div>
@@ -24,7 +24,7 @@
       <div class="benefits__item">
         <div class="benefits__preview">
           <svg class="icon icon-location">
-            <use xlink:href="{%  static 'img/sprite.svg' %}#icon-location"></use>
+            <use xlink:href="{% static 'img/sprite.svg' %}#icon-location"></use>
           </svg>
         </div>
         <div class="benefits__title">Свобода перемещений</div>
@@ -33,7 +33,7 @@
       <div class="benefits__item">
         <div class="benefits__preview">
           <svg class="icon icon-searching">
-            <use xlink:href="{%  static 'img/sprite.svg' %}#icon-searching"></use>
+            <use xlink:href="{% static 'img/sprite.svg' %}#icon-searching"></use>
           </svg>
         </div>
         <div class="benefits__title">Выбор преподавателя </div>
diff --git a/project/templates/blocks/header.html b/project/templates/blocks/header.html
index ea813ae9..1007fd6f 100644
--- a/project/templates/blocks/header.html
+++ b/project/templates/blocks/header.html
@@ -32,29 +32,31 @@
               {% endif %}
             </a>
             <div class="header__list js-header-list">
-              <a class="header__link" data-scroll href="/#about">
+              <a class="header__link" data-scroll href="#about">
                 <div class="header__title">О школе</div>
               </a>
               {% comment %}
               <a class="header__link" href="/">
                 <div class="header__title">Процесс</div>
               </a> {% endcomment %}
-              <a class="header__link" href="/#advantages">
+              <a class="header__link" href="#advantages">
                 <div class="header__title">Преимущества</div>
               </a>
-              <a class="header__link" href="/#reviews">
+              {% comment %}
+              <a class="header__link" href="#reviews">
                 <div class="header__title">Отзывы</div>
               </a>
-              <a class="header__link" href="/#gallery">
+              <a class="header__link" href="#gallery">
                 <div class="header__title">Галерея</div>
               </a>
               <a class="header__link" href="/#teachers">
                 <div class="header__title">Преподаватели</div>
               </a>
-              <a class="header__link" href="/#schedule">
+              {% endcomment %}
+              <a class="header__link" href="{% url 'school:school' %}#schedule">
                 <div class="header__title">Расписание</div>
               </a>
-              <a class="header__link" href="/#partners">
+              <a class="header__link" href="#partners">
                 <div class="header__title">Партнеры</div>
               </a>
               {% comment %}
diff --git a/project/templates/blocks/partners.html b/project/templates/blocks/partners.html
index f724889b..6777a4e7 100644
--- a/project/templates/blocks/partners.html
+++ b/project/templates/blocks/partners.html
@@ -1,7 +1,7 @@
 {% load static %}
-<div class="section">
+<div class="section" id="partners">
   <div class="section__center center">
-    <a id="partners" name="partners">
+    <a name="partners">
       <div class="title title_center">Наши партнеры</div>
     </a>
     <div class="partners">