diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index ec7a70e9..23ca8289 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -18,7 +18,7 @@
Ročník {% url 'seminar.rocnik' cislo.rocnik.id %} + +
# | Jméno {% for p in problemy %} - | {{ p.cislo_zadani.cislo }}.{{ p.kod }} + | {{ p.cislo_zadani.cislo }}.{{ p.kod }} {% endfor %} | Sum | Celkem
diff --git a/seminar/templates/seminar/problem.html b/seminar/templates/seminar/problem.html
index 26559344..646bf7a0 100644
--- a/seminar/templates/seminar/problem.html
+++ b/seminar/templates/seminar/problem.html
@@ -3,7 +3,11 @@
{% block content %}
- Problém {{ problem.nazev }}+Problém {{ problem.kod_v_rocniku }} {{ problem.nazev }}+ +Zadáno v čísle {{ problem.cislo_zadani.kod }}, + řešeno v čísle {{ problem.cislo_reseni.kod }}, + Text{{ problem.text_problemu |safe }} diff --git a/seminar/templates/seminar/rocnik.html b/seminar/templates/seminar/rocnik.html new file mode 100644 index 00000000..4d202129 --- /dev/null +++ b/seminar/templates/seminar/rocnik.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} +{% load staticfiles sekizai_tags %} + +{% block content %} +
+
+{% endblock content %}
+
diff --git a/seminar/urls.py b/seminar/urls.py
index 869b59ad..08884bb7 100644
--- a/seminar/urls.py
+++ b/seminar/urls.py
@@ -2,7 +2,8 @@ from django.conf.urls import patterns, url
from . import views
urlpatterns = patterns('',
- url(r'^problem/(?PRočník {{ rocnik.roman }}+ +Ročník číslo {{ rocnik.rocnik }} ({{ rocnik.prvni_rok }}/{{ rocnik.druhy_rok }}) + +
|
---|