From 07b163389db185f8f154894e3bd35a3bfc35279e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Wed, 28 Sep 2022 09:51:19 +0200 Subject: [PATCH] =?UTF-8?q?P=C5=99esun=20svg=20+=20zaslo=C5=BEkov=C3=A1n?= =?UTF-8?q?=C3=AD=20(aby=20bylo=20jasn=C3=A9,=20k=20=C4=8Demu=20pat=C5=99?= =?UTF-8?q?=C3=AD=20graph=20a=20templat=C5=AF=20jak-resit=20u=C5=BE=20bylo?= =?UTF-8?q?=20hodn=C4=9B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/jak-resit.html | 16 ---------------- .../templates/seminar/jakresit/jak-resit.html | 16 ++++++++++++++++ .../templates/seminar/jakresit}/jakresit_1.svg | 0 .../templates/seminar/jakresit}/jakresit_2.svg | 0 .../templates/seminar/jakresit}/jakresit_3.svg | 0 .../templates/seminar/titulnistrana}/graph.svg | 0 .../{ => titulnistrana}/titulnistrana.html | 2 +- seminar/views/views_all.py | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 seminar/templates/seminar/jak-resit.html create mode 100644 seminar/templates/seminar/jakresit/jak-resit.html rename {mamweb/templates => seminar/templates/seminar/jakresit}/jakresit_1.svg (100%) rename {mamweb/templates => seminar/templates/seminar/jakresit}/jakresit_2.svg (100%) rename {mamweb/templates => seminar/templates/seminar/jakresit}/jakresit_3.svg (100%) rename {mamweb/templates => seminar/templates/seminar/titulnistrana}/graph.svg (100%) rename seminar/templates/seminar/{ => titulnistrana}/titulnistrana.html (96%) diff --git a/seminar/templates/seminar/jak-resit.html b/seminar/templates/seminar/jak-resit.html deleted file mode 100644 index b418f5cc..00000000 --- a/seminar/templates/seminar/jak-resit.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'base.html' %} - -{% load humanize %} -{% load static %} - - -{% block content %} - -
- -{% include 'jakresit_1.svg' %} -{% include 'jakresit_2.svg' %} -{% include 'jakresit_3.svg' %} - -
-{% endblock %} diff --git a/seminar/templates/seminar/jakresit/jak-resit.html b/seminar/templates/seminar/jakresit/jak-resit.html new file mode 100644 index 00000000..fd278c68 --- /dev/null +++ b/seminar/templates/seminar/jakresit/jak-resit.html @@ -0,0 +1,16 @@ +{% extends 'base.html' %} + +{% load humanize %} +{% load static %} + + +{% block content %} + +
+ +{% include 'seminar/jakresit/jakresit_1.svg' %} +{% include 'seminar/jakresit/jakresit_2.svg' %} +{% include 'seminar/jakresit/jakresit_3.svg' %} + +
+{% endblock %} diff --git a/mamweb/templates/jakresit_1.svg b/seminar/templates/seminar/jakresit/jakresit_1.svg similarity index 100% rename from mamweb/templates/jakresit_1.svg rename to seminar/templates/seminar/jakresit/jakresit_1.svg diff --git a/mamweb/templates/jakresit_2.svg b/seminar/templates/seminar/jakresit/jakresit_2.svg similarity index 100% rename from mamweb/templates/jakresit_2.svg rename to seminar/templates/seminar/jakresit/jakresit_2.svg diff --git a/mamweb/templates/jakresit_3.svg b/seminar/templates/seminar/jakresit/jakresit_3.svg similarity index 100% rename from mamweb/templates/jakresit_3.svg rename to seminar/templates/seminar/jakresit/jakresit_3.svg diff --git a/mamweb/templates/graph.svg b/seminar/templates/seminar/titulnistrana/graph.svg similarity index 100% rename from mamweb/templates/graph.svg rename to seminar/templates/seminar/titulnistrana/graph.svg diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana/titulnistrana.html similarity index 96% rename from seminar/templates/seminar/titulnistrana.html rename to seminar/templates/seminar/titulnistrana/titulnistrana.html index bdcecb41..39675a3e 100644 --- a/seminar/templates/seminar/titulnistrana.html +++ b/seminar/templates/seminar/titulnistrana/titulnistrana.html @@ -79,7 +79,7 @@ function sousdeadline() {
- {% include 'graph.svg' %} + {% include 'seminar/titulnistrana/graph.svg' %}
diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 7e766541..49327aa3 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -259,7 +259,7 @@ def aktualni_temata(rocnik): class TitulniStranaView(generic.ListView): - template_name='seminar/titulnistrana.html' + template_name= 'seminar/titulnistrana/titulnistrana.html' def get_queryset(self): return spravne_novinky(self.request)[:3] @@ -669,7 +669,7 @@ def formularOKView(request, text=''): #------------------ Jak řešit - možná má být udělané úplně jinak class JakResitView(generic.ListView): - template_name = 'seminar/jak-resit.html' + template_name = 'seminar/jakresit/jak-resit.html' def get_queryset(self): return None