From 15de5f6ccdcb706586703d2143e4fb00a180720e Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Wed, 11 Apr 2018 16:58:56 +0300
Subject: [PATCH] Move blocks templates to main project dir

---
 apps/course/templates/course/course.html      |  2 +-
 .../templates/course/course_only_lessons.html |  2 +-
 apps/course/templates/course/courses.html     |  4 +-
 apps/course/templates/course/lesson.html      |  4 +-
 apps/course/templates/course/result.html      |  2 +-
 .../templates}/blocks/comment.html            |  0
 .../templates}/blocks/comments.html           |  0
 .../templates}/blocks/game.html               |  0
 project/templates/blocks/partners.html        | 28 +++++++++++++
 project/templates/lilcity/main.html           | 41 +------------------
 10 files changed, 37 insertions(+), 46 deletions(-)
 rename {apps/course/templates/course => project/templates}/blocks/comment.html (100%)
 rename {apps/course/templates/course => project/templates}/blocks/comments.html (100%)
 rename {apps/course/templates/course => project/templates}/blocks/game.html (100%)
 create mode 100644 project/templates/blocks/partners.html

diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html
index f3069394..5224c601 100644
--- a/apps/course/templates/course/course.html
+++ b/apps/course/templates/course/course.html
@@ -437,7 +437,7 @@
       <div>Только зарегистрированные пользователи могут оставлять комментарии.</div>
       {% endif %}
       <div class="questions__list">
-        {% include "./blocks/comments.html" with object=course %}
+        {% include "templates/blocks/comments.html" with object=course %}
       </div>
     </div>
   </div>
diff --git a/apps/course/templates/course/course_only_lessons.html b/apps/course/templates/course/course_only_lessons.html
index 342b03ca..bd14f9d8 100644
--- a/apps/course/templates/course/course_only_lessons.html
+++ b/apps/course/templates/course/course_only_lessons.html
@@ -242,7 +242,7 @@
       <div>Только зарегистрированные пользователи могут оставлять комментарии.</div>
       {% endif %}
       <div class="questions__list">
-        {% include "./blocks/comments.html" with object=course %}
+        {% include "templates/blocks/comments.html" with object=course %}
       </div>
     </div>
   </div>
diff --git a/apps/course/templates/course/courses.html b/apps/course/templates/course/courses.html
index cd476226..44ee9436 100644
--- a/apps/course/templates/course/courses.html
+++ b/apps/course/templates/course/courses.html
@@ -45,5 +45,5 @@
       </div>
     </div>
   </div>
-  {% include "course/blocks/game.html" %}
-{% endblock content %}
\ No newline at end of file
+  {% include "templates/blocks/game.html" %}
+{% endblock content %}
diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html
index 9150710d..64d4abf1 100644
--- a/apps/course/templates/course/lesson.html
+++ b/apps/course/templates/course/lesson.html
@@ -46,7 +46,7 @@
     {% with template="course/content/"|add:content.ctype|add:".html" %}
     {% include template %}
     {% endwith %}
-    
+
 {% endfor %}
 {% comment %} <div class="section section_gradient">
   <div class="section__center center center_sm">
@@ -118,7 +118,7 @@
       <div>Только зарегистрированные пользователи могут оставлять комментарии.</div>
       {% endif %}
       <div class="questions__list">
-        {% include "./blocks/comments.html" with object=lesson %}
+        {% include "templates/blocks/comments.html" with object=lesson %}
       </div>
     </div>
   </div>
diff --git a/apps/course/templates/course/result.html b/apps/course/templates/course/result.html
index ed95d042..fbbaf85a 100644
--- a/apps/course/templates/course/result.html
+++ b/apps/course/templates/course/result.html
@@ -35,5 +35,5 @@
     </div>
   </div>
 </div>
-{% include "course/blocks/game.html" %}
+{% include "templates/blocks/game.html" %}
 {% endblock content %}
diff --git a/apps/course/templates/course/blocks/comment.html b/project/templates/blocks/comment.html
similarity index 100%
rename from apps/course/templates/course/blocks/comment.html
rename to project/templates/blocks/comment.html
diff --git a/apps/course/templates/course/blocks/comments.html b/project/templates/blocks/comments.html
similarity index 100%
rename from apps/course/templates/course/blocks/comments.html
rename to project/templates/blocks/comments.html
diff --git a/apps/course/templates/course/blocks/game.html b/project/templates/blocks/game.html
similarity index 100%
rename from apps/course/templates/course/blocks/game.html
rename to project/templates/blocks/game.html
diff --git a/project/templates/blocks/partners.html b/project/templates/blocks/partners.html
new file mode 100644
index 00000000..f724889b
--- /dev/null
+++ b/project/templates/blocks/partners.html
@@ -0,0 +1,28 @@
+{% load static %}
+<div class="section">
+  <div class="section__center center">
+    <a id="partners" name="partners">
+      <div class="title title_center">Наши партнеры</div>
+    </a>
+    <div class="partners">
+      <a class="partners__item" href="#">
+        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
+      </a>
+      <a class="partners__item" href="#">
+        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
+      </a>
+      <a class="partners__item" href="#">
+        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
+      </a>
+      <a class="partners__item" href="#">
+        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
+      </a>
+      <a class="partners__item" href="#">
+        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
+      </a>
+      <a class="partners__item" href="#">
+        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html
index 6fc3a9ea..d41a6988 100644
--- a/project/templates/lilcity/main.html
+++ b/project/templates/lilcity/main.html
@@ -351,43 +351,6 @@
   </div>
 </div>
 {% endif %}
-<div class="game">
-  <div class="game__center center">
-    <div class="game__wrap">
-      <div class="game__theme">LILCITY</div>
-      <div class="game__title">Приложения, развивающие игры и интерактивные книги от Lil City.</div>
-      <a class="game__btn btn btn_dark" href="#">УЗНАТЬ БОЛЬШЕ</a>
-    </div>
-  </div>
-  <div class="game__preview">
-    <img class="game__pic" src="{% static 'img/icons.png' %}">
-  </div>
-</div>
-<div class="section">
-  <div class="section__center center">
-    <a id="partners" name="partners">
-      <div class="title title_center">Наши партнеры</div>
-    </a>
-    <div class="partners">
-      <a class="partners__item" href="#">
-        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
-      </a>
-      <a class="partners__item" href="#">
-        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
-      </a>
-      <a class="partners__item" href="#">
-        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
-      </a>
-      <a class="partners__item" href="#">
-        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
-      </a>
-      <a class="partners__item" href="#">
-        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
-      </a>
-      <a class="partners__item" href="#">
-        <img class="partners__pic" src="{% static 'img/box.jpg' %}">
-      </a>
-    </div>
-  </div>
-</div>
+{% include "templates/blocks/game.html" %}
+{% include "templates/blocks/partners.html" %}
 {% endblock content %}