From d03298fb86e254fa7c0c7d7ad8afc92e54abc0c9 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Thu, 4 Jun 2015 10:13:52 +0200
Subject: [PATCH] Premisteni archivniho menu do archivu

---
 mamweb/templates/menu.html                  |  8 ++------
 seminar/templates/seminar/archiv/cisla.html | 22 +++++++++++++++++++++
 seminar/urls.py                             |  8 +++++---
 seminar/views.py                            |  4 ++++
 4 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 seminar/templates/seminar/archiv/cisla.html

diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html
index ed75100b..76958171 100644
--- a/mamweb/templates/menu.html
+++ b/mamweb/templates/menu.html
@@ -12,12 +12,8 @@
   <!--  <li><a href="/odevzdat-reseni/muj-ucet">Odeslat řešení</a>-->
 </ul>
 
-<h2>STARÉ MENU</h2>
-
-<p><a href='{% url 'seminar_aktualni_zadani' %}'>Aktuální zadání</a>
-
-<ul>
+<!-- TODO smazat <ul>
 {% for r in rs %}
 <li><a href='{{ r.verejne_url }}'>Ročník {{ r }}</a>
 {% endfor %}
-</ul>
+</ul>-->
diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html
new file mode 100644
index 00000000..46760288
--- /dev/null
+++ b/seminar/templates/seminar/archiv/cisla.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+
+{% block submenu %}
+  {% include "seminar/archiv/submenu.html" %}
+{% endblock %}
+
+{% block content %}
+<div>
+  <h2>Archiv čísel</h2>
+
+  <ul>
+    {% for r in object_list %}
+    <li><a href='{{ r.verejne_url }}'>Ročník {{ r }}</a>
+    {% empty %}
+      Niesú žiadne ročníky
+    {% endfor %}
+  </ul>
+
+
+</div>
+{% endblock content %}
+
diff --git a/seminar/urls.py b/seminar/urls.py
index 15d9d722..ab909ecd 100644
--- a/seminar/urls.py
+++ b/seminar/urls.py
@@ -5,9 +5,11 @@ urlpatterns = patterns('',
 
     url(r'^co-je-MaM/organizatori/$', views.CojemamOrganizatoriView.as_view()),
 
-    url(r'^rocnik/(?P<pk>\d+)/$', views.RocnikView.as_view(), name='seminar_rocnik'),
-    url(r'^cislo/(?P<pk>\d+)/$', views.CisloView.as_view(), name='seminar_cislo'),
-    url(r'^problem/(?P<pk>\d+)/$', views.ProblemView.as_view(), name='seminar_problem'),
+    url(r'^archiv/cisla/$', views.CislaView.as_view()),
+    url(r'^archiv/cisla/rocnik/(?P<pk>\d+)/$', views.RocnikView.as_view(), name='seminar_rocnik'),
+    url(r'^archiv/cisla/cislo/(?P<pk>\d+)/$', views.CisloView.as_view(), name='seminar_cislo'),
+    url(r'^archiv/cisla/problem/(?P<pk>\d+)/$', views.ProblemView.as_view(), name='seminar_problem'),
+
     url(r'^soustredeni/(?P<pk>\d+)/$', views.SoustredeniView.as_view(), name='seminar_soustredeni'),
 
     url(r'^zadani/$', views.AktualniZadaniView, name='seminar_aktualni_zadani'),
diff --git a/seminar/views.py b/seminar/views.py
index fed81e4c..6637023a 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -17,6 +17,10 @@ def AktualniZadaniView(request):
 class CojemamOrganizatoriView(generic.TemplateView):
     template_name='seminar/cojemam/organizatori.html'
 
+class CislaView(generic.ListView):
+    model = Rocnik
+    template_name='seminar/archiv/cisla.html'
+
 class RocnikView(generic.DetailView):
     model = Rocnik
     template_name = 'seminar/rocnik.html'