Merge branch 'data_migrations' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into data_migrations

5 years ago · e05919a9db
9 changed files with 6 additions and 32 deletions
--- a/seminar/templates/seminar/archiv/base_cisla.html
+++ b/seminar/templates/seminar/archiv/base_cisla.html
@ -1,8 +0,0 @@
 {% extends "seminar/archiv/base.html" %}
 {% block submenu %}
  {% with "cisla" as selected %}
  {% include "seminar/archiv/submenu.html" %}
  {% endwith %}
 {% endblock %}
--- a/seminar/templates/seminar/archiv/base_temata.html
+++ b/seminar/templates/seminar/archiv/base_temata.html
@ -1,8 +0,0 @@
 {% extends "seminar/archiv/base.html" %}
 {% block submenu %}
  {% with "temata" as selected %}
  {% include "seminar/archiv/submenu.html" %}
  {% endwith %}
 {% endblock %}
--- a/seminar/templates/seminar/archiv/base_ulohy.html
+++ b/seminar/templates/seminar/archiv/base_ulohy.html
@ -1,10 +0,0 @@
 {% extends "seminar/archiv/base.html" %}
 {% block menu_archiv %}selected{% endblock %}
 {% block submenu %}
  {% with "ulohy" as selected %}
  {% include "seminar/archiv/submenu.html" %}
  {% endwith %}
 {% endblock %}
--- a/seminar/templates/seminar/archiv/cisla.html
+++ b/seminar/templates/seminar/archiv/cisla.html
@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base_cisla.html" %}
+{% extends "seminar/archiv/base.html" %}
 {% block content %}
 <div>
--- a/seminar/templates/seminar/archiv/cislo.html
+++ b/seminar/templates/seminar/archiv/cislo.html
@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base_cisla.html" %}
+{% extends "seminar/archiv/base.html" %}
 {% block content %}
 <div>
--- a/seminar/templates/seminar/archiv/prispevek.html
+++ b/seminar/templates/seminar/archiv/prispevek.html
@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base_temata.html" %}
+{% extends "seminar/archiv/base.html" %}
 {% block title %}
  {{prispevek.nazev}}
--- a/seminar/templates/seminar/archiv/problem.html
+++ b/seminar/templates/seminar/archiv/problem.html
@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base_ulohy.html" %}
+{% extends "seminar/archiv/base.html" %}
 {% load comments %}
--- a/seminar/templates/seminar/archiv/rocnik.html
+++ b/seminar/templates/seminar/archiv/rocnik.html
@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base_cisla.html" %}
+{% extends "seminar/archiv/base.html" %}
 {% block content %}
 <div>
--- a/seminar/templates/seminar/archiv/temata.html
+++ b/seminar/templates/seminar/archiv/temata.html
@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base_temata.html" %}
+{% extends "seminar/archiv/base.html" %}
 {% block content %}
  <h1>
`@ -1,4 +1,4 @@`
	`{% extends "seminar/archiv/base_ulohy.html" %}`	`{% extends "seminar/archiv/base.html" %}`

	`{% load comments %}`	`{% load comments %}`