From 63bc158e548ac099a5d314364ad45ca1f552308c Mon Sep 17 00:00:00 2001
From: Tomas Gavenciak <gavento@ucw.cz>
Date: Thu, 14 May 2015 00:51:19 +0200
Subject: [PATCH] Uprava zakladnich template - pridava se "admin bar"

---
 mamweb/templates/base.html                    | 7 +++++++
 mamweb/templates/home.html                    | 2 +-
 mamweb/templates/menu.html                    | 4 ++--
 seminar/templates/seminar/AktualniZadani.html | 1 -
 seminar/templates/seminar/cislo.html          | 9 ++++-----
 seminar/templates/seminar/problem.html        | 5 ++---
 seminar/templates/seminar/rocnik.html         | 3 +--
 7 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index 23ca8289..4aa19173 100644
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@@ -12,6 +12,13 @@
     <script src="{% static 'js/jquery-1.11.1.js' %}"></script>
   </head>
   <body class='{% if True %}org-logged-in{% endif %}'>
+    <!-- TODO: only on org login -->
+    <div class="login-bar" style='background: #F80;'>
+      {% if view.object %}
+      Objekt {{ view.object }}: {{ view.object }}
+      {% if view.object.admin_url %}<a href='{{ view.object.admin_url }}'>[admin]</a>{% endif %}
+      {% endif %}
+    </div>
     <div class="container">
       <div class='header'>
 	Korespondenční seminář M&amp;M
diff --git a/mamweb/templates/home.html b/mamweb/templates/home.html
index e7c89743..90c697d4 100644
--- a/mamweb/templates/home.html
+++ b/mamweb/templates/home.html
@@ -3,7 +3,7 @@
 {% block content %}
 <div>
 <h2>Vítejte na testwebu MaM!</h2>
-<p><a href='/admin/'>Administrátorské rozhraní</a> (admin/admin)
+<p><a href='{% url 'admin:index' %}'>Administrátorské rozhraní</a> (admin/admin)
 </div>
 {% endblock content %}
 
diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html
index a06803b8..2c024d70 100644
--- a/mamweb/templates/menu.html
+++ b/mamweb/templates/menu.html
@@ -3,10 +3,10 @@
 
 <h2>MENU</h2>
 
-<p><a href='{% url 'seminar.aktualni_zadani' %}'>Aktuální zadání</a>
+<p><a href='{% url 'seminar_aktualni_zadani' %}'>Aktuální zadání</a>
 
 <ul>
 {% for r in rs %}
-<li><a href='{% url 'seminar.rocnik' r.id %}'>Ročník {{ r }}</a>
+<li><a href='{{ r.verejne_url }}'>Ročník {{ r }}</a>
 {% endfor %}
 </ul>
diff --git a/seminar/templates/seminar/AktualniZadani.html b/seminar/templates/seminar/AktualniZadani.html
index e24aa5b0..ba07d6d8 100644
--- a/seminar/templates/seminar/AktualniZadani.html
+++ b/seminar/templates/seminar/AktualniZadani.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load staticfiles sekizai_tags %}
 
 {% block content %}
 <div>
diff --git a/seminar/templates/seminar/cislo.html b/seminar/templates/seminar/cislo.html
index ad2aa215..cec05a88 100644
--- a/seminar/templates/seminar/cislo.html
+++ b/seminar/templates/seminar/cislo.html
@@ -1,23 +1,22 @@
 {% extends "base.html" %}
-{% load staticfiles sekizai_tags %}
 
 {% block content %}
 <div>
   <h2>Číslo {{ cislo }}</h2>
 
-  <p><a href='{% url 'seminar.rocnik' cislo.rocnik.id %}'>Ročník {{ cislo.rocnik }}</a>
+  <p><a href='{{ cislo.rocnik.verejne_url }}'>Ročník {{ cislo.rocnik }}</a>
 
   <h3>Zadané problémy</h3>
   <ul>
   {% for p in cislo.zadane_problemy.all %}
-    <li><a href='{% url 'seminar.problem' p.id %}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a>
+    <li><a href='{{ p.verejne_url }}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a>
   {% endfor %}
   </ul>
 
   <h3>Řešené problémy</h3>
   <ul>
   {% for p in cislo.resene_problemy.all %}
-    <li><a href='{% url 'seminar.problem' p.id %}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a>
+    <li><a href='{{ p.verejne_url }}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a>
   {% endfor %}
   </ul>
 
@@ -28,7 +27,7 @@
       <th class='border-r'>#
       <th class='border-r'>Jméno
       {% for p in problemy %}
-      <th class='border-r'><a href="{% url 'seminar.problem' p.id %}">{{ p.cislo_zadani.cislo }}.{{ p.kod }}</a>
+      <th class='border-r'><a href="{{ p.verejne_url }}">{{ p.cislo_zadani.cislo }}.{{ p.kod }}</a>
       {% endfor %}
       <th class='border-r'>Sum
       <th>Celkem
diff --git a/seminar/templates/seminar/problem.html b/seminar/templates/seminar/problem.html
index 646bf7a0..acb3d075 100644
--- a/seminar/templates/seminar/problem.html
+++ b/seminar/templates/seminar/problem.html
@@ -1,12 +1,11 @@
 {% extends "base.html" %}
-{% load staticfiles sekizai_tags %}
 
 {% block content %}
 <div>
   <h2>Problém {{ problem.kod_v_rocniku }} {{ problem.nazev }}</h2>
 
-  <p>Zadáno v čísle <a href='{% url 'seminar.cislo' problem.cislo_zadani.id %}'>{{ problem.cislo_zadani.kod }}</a>,
-  <p>řešeno v čísle <a href='{% url 'seminar.cislo' problem.cislo_reseni.id %}'>{{ problem.cislo_reseni.kod }}</a>,
+  <p>Zadáno v čísle <a href='{{ problem.cislo_zadani.verejne_url }}'>{{ problem.cislo_zadani.kod }}</a>,
+  <p>řešeno v čísle <a href='{{ problem.cislo_reseni.verejne_url }}'>{{ problem.cislo_reseni.kod }}</a>,
  
 
   <h3>Text</h3>
diff --git a/seminar/templates/seminar/rocnik.html b/seminar/templates/seminar/rocnik.html
index 4d202129..5bf2852b 100644
--- a/seminar/templates/seminar/rocnik.html
+++ b/seminar/templates/seminar/rocnik.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load staticfiles sekizai_tags %}
 
 {% block content %}
 <div>
@@ -9,7 +8,7 @@
 
   <ul>
   {% for c in rocnik.verejna_cisla %}
-  <li><a href="{% url 'seminar.cislo' c.id %}">Číslo {{ c.kod }}</a>
+  <li><a href="{{ c.verejne_url }}">Číslo {{ c.kod }}</a>
   {% endfor %}
   </ul>
 
