From a25c249ad39c22ad35ef097f7a4d1ff0ea23106f Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Sun, 16 Aug 2015 15:31:10 +0200
Subject: [PATCH 1/6] Nadpis 1. urovne na navrzene misto

---
 mamweb/templates/base.html                                    | 2 +-
 mamweb/templates/flatpages/default.html                       | 2 +-
 seminar/templates/seminar/archiv/cisla.html                   | 2 +-
 seminar/templates/seminar/archiv/cislo.html                   | 2 +-
 seminar/templates/seminar/archiv/problem.html                 | 2 +-
 seminar/templates/seminar/archiv/rocnik.html                  | 2 +-
 seminar/templates/seminar/cojemam/organizatori.html           | 2 +-
 seminar/templates/seminar/soustredeni/seznam_soustredeni.html | 2 +-
 seminar/templates/seminar/stav_databaze.html                  | 2 +-
 seminar/templates/seminar/zadani/AktualniZadani.html          | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index e43a837a..6a423ad9 100644
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@@ -42,7 +42,7 @@
 	  <div id="header">
 		  <div class='header-lg visible-lg-block'>
 			<img class="logo" src="{% static 'images/logocb.png' %}" />
-			<h1>Nadpis 1. úrovně</h1>
+      <h1>{% block nadpis1 %}Nadpis 1. úrovně{% endblock %}</h1>
 			<img class="header" src="{% static 'images/liska6.png' %}" />
 			<!--<a href="/">Korespondenční seminář M&amp;M</a>-->
 		  </div>
diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html
index ea2b6a3b..4f0cbfa6 100644
--- a/mamweb/templates/flatpages/default.html
+++ b/mamweb/templates/flatpages/default.html
@@ -3,7 +3,7 @@
 {% block title %}{{ flatpage.title }}{% endblock title %}
 
 {% block content %}
-<h2>{{ flatpage.title }}</h2>
+<h2>{% block nadpis1 %}{{ flatpage.title }}{% endblock %}</h2>
 <div>
 {{ flatpage.content }}
 </div>
diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html
index 6036300c..c5ab25f7 100644
--- a/seminar/templates/seminar/archiv/cisla.html
+++ b/seminar/templates/seminar/archiv/cisla.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 <div>
-  <h2>Archiv čísel</h2>
+  <h2>{% block nadpis1 %}Archiv čísel {% endblock %}</h2>
 
   <ul>
     {% for r in object_list %}
diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html
index d14073e6..eec02339 100644
--- a/seminar/templates/seminar/archiv/cislo.html
+++ b/seminar/templates/seminar/archiv/cislo.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div>
-  <h2>Číslo {{ cislo }}</h2>
+  <h2>{% block nadpis1 %}Číslo {{ cislo }}{% endblock%}</h2>
 
   <p><a href='{{ cislo.rocnik.verejne_url }}'>Ročník {{ cislo.rocnik }}</a>
 
diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html
index da7ddab3..5742a180 100644
--- a/seminar/templates/seminar/archiv/problem.html
+++ b/seminar/templates/seminar/archiv/problem.html
@@ -5,7 +5,7 @@
 {% block content %}
 <div>
   {% if problem.cislo_zadani %}
-    <h2>Problém {{ problem.kod_v_rocniku }}: {{ problem.nazev }}</h2>
+    <h2>{% block nadpis1 %}Problém {{ problem.kod_v_rocniku }}: {{ problem.nazev }}{% endblock %}</h2>
 
     <p>Zadáno v čísle <a href='{{ problem.cislo_zadani.verejne_url }}'>{{ problem.cislo_zadani.kod }}</a>.
     {% if problem.cislo_reseni %}
diff --git a/seminar/templates/seminar/archiv/rocnik.html b/seminar/templates/seminar/archiv/rocnik.html
index 329941e8..be3a08eb 100644
--- a/seminar/templates/seminar/archiv/rocnik.html
+++ b/seminar/templates/seminar/archiv/rocnik.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div>
-  <h2>Ročník {{ rocnik.roman }}</h2>
+  <h2>{% block nadpis1 %} Ročník {{ rocnik.roman }} {% endblock %}</h2>
 
   <p>Ročník číslo {{ rocnik.rocnik }} ({{ rocnik.prvni_rok }}/{{ rocnik.druhy_rok }})
 
diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html
index 4de380aa..e827457a 100644
--- a/seminar/templates/seminar/cojemam/organizatori.html
+++ b/seminar/templates/seminar/cojemam/organizatori.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div>
-  <h2>Organizátoři</h2>
+  <h2>{% block nadpis1 %}Organizátoři{% endblock%}</h2>
 
   {% for org in object_list %}
     {% if org.user.is_active %}
diff --git a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html
index 1159f9e6..0e87ac6b 100644
--- a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html
+++ b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html
@@ -2,7 +2,7 @@
 
 {% block content %} 
 
-  <h1> Soustředění </h1>
+  <h1>{% block nadpis1 %}Soustředění{% endblock %}</h1>
 
   {# Projdi vsechna soustredeni #}
   {% for soustredeni in object_list %}
diff --git a/seminar/templates/seminar/stav_databaze.html b/seminar/templates/seminar/stav_databaze.html
index f9f55a58..5c04b9a5 100644
--- a/seminar/templates/seminar/stav_databaze.html
+++ b/seminar/templates/seminar/stav_databaze.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div>
-  <h2>Stav databáze</h2>
+  <h2>{% block nadpis1 %}Stav databáze{% endblock %}</h2>
 
   <h3>Řešitelé</h3>
 
diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html
index fb508005..9a2109cd 100644
--- a/seminar/templates/seminar/zadani/AktualniZadani.html
+++ b/seminar/templates/seminar/zadani/AktualniZadani.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div>
-  <h2>Aktuální zadání</h2>
+  <h2>{% block nadpis1 %}Aktuální zadání{% endblock %}</h2>
 
   {% for problem in  nastaveni.aktualni_cislo.zadane_problemy.all %}
     Problém {{problem}} <br>

From 5571f1be3c6c1b4265886d149c777b11fff88606 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Sun, 23 Aug 2015 15:06:47 +0200
Subject: [PATCH 2/6] Rozdeleni organizatoru na aktivni a neaktivni

---
 .../templates/seminar/cojemam/organizatori.html    | 14 ++++++++++++--
 seminar/urls.py                                    |  3 ++-
 seminar/views.py                                   | 12 ++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html
index e827457a..a9b8b774 100644
--- a/seminar/templates/seminar/cojemam/organizatori.html
+++ b/seminar/templates/seminar/cojemam/organizatori.html
@@ -1,9 +1,15 @@
 {% extends "seminar/cojemam/base.html" %}
 
+{% block nadpis1 %}
+  {% if aktivni %}
+    Organizátoři
+  {% else %}
+    Vysloužilí organizátoři
+  {% endif %}
+{% endblock%}
+
 {% block content %}
 <div>
-  <h2>{% block nadpis1 %}Organizátoři{% endblock%}</h2>
-
   {% for org in object_list %}
     {% if org.user.is_active %}
       <b>Aktivní</b>
@@ -40,6 +46,10 @@
     <hr>
   {% endfor %}
 
+  {% if aktivni%}
+    <a href="organizovali/">Vysloužilí organizátoři</a>
+  {% endif %}
+
 </div>
 {% endblock content %}
 
diff --git a/seminar/urls.py b/seminar/urls.py
index d6021be5..b392fe2c 100644
--- a/seminar/urls.py
+++ b/seminar/urls.py
@@ -3,7 +3,8 @@ from . import views, export
 
 urlpatterns = patterns('',
 
-    url(r'^co-je-MaM/organizatori/$', views.CojemamOrganizatoriView.as_view()),
+    url(r'^co-je-MaM/organizatori/$', views.CojemamOrganizatoriView.as_view(), name='organizatori'),
+    url(r'^co-je-MaM/organizatori/organizovali/$', views.CojemamOrganizatoriStariView.as_view(), name='stari_organizatori'),
 
     url(r'^archiv/cisla/$', views.CislaView.as_view()),
 
diff --git a/seminar/views.py b/seminar/views.py
index 2650ddf3..37499eb4 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -18,9 +18,21 @@ def AktualniZadaniView(request):
 
 ### Co je M&M
 
+## Organizatori
+
 class CojemamOrganizatoriView(generic.ListView):
     model = Organizator
     template_name='seminar/cojemam/organizatori.html'
+    queryset = Organizator.objects.filter(user__is_active=True)
+    def get_context_data(self, **kwargs):
+        context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs)
+        context['aktivni'] = True
+        return context
+
+class CojemamOrganizatoriStariView(generic.ListView):
+    model = Organizator
+    template_name='seminar/cojemam/organizatori.html'
+    queryset = Organizator.objects.filter(user__is_active=False)
 
 ### Archiv
 

From 1118a5b42f9e0a27cbd337b02948dfea0a9a61f8 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Tue, 1 Sep 2015 21:02:07 +0200
Subject: [PATCH 3/6] Razeni organizatoru podle jmena

---
 seminar/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seminar/views.py b/seminar/views.py
index 37499eb4..54f6391f 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -23,7 +23,7 @@ def AktualniZadaniView(request):
 class CojemamOrganizatoriView(generic.ListView):
     model = Organizator
     template_name='seminar/cojemam/organizatori.html'
-    queryset = Organizator.objects.filter(user__is_active=True)
+    queryset = Organizator.objects.filter(user__is_active=True).order_by('user__first_name')
     def get_context_data(self, **kwargs):
         context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs)
         context['aktivni'] = True

From e9364682e9c0c98a2814c9fd15a9365821dd0954 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Wed, 2 Sep 2015 21:20:27 +0200
Subject: [PATCH 4/6] Odstraneni horniho pruhu pro neprihlasene

Po prihlaseni se pruh objevuje.
Je potreba zobrazovat jen pro prihlasene organizatory.
---
 mamweb/templates/base.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index 6a423ad9..e4bb4af4 100644
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@@ -17,8 +17,9 @@
     <script type="text/javascript" src="{{ STATIC_URL }}fluent_comments/js/ajaxcomments.js"></script>
 
   </head>
-  <body class='{% if True %}org-logged-in{% endif %}'>
-    <!-- TODO: only on org login -->
+  <body class='{% if user.is_authenticated %}org-logged-in{% endif %}'>
+  {# TODO predelat pro pouze pro orgy (misto pro prihlasene) #}
+  {% if user.is_authenticated %} 
     <div class="login-bar" style='background: #F80;'>
       {% if view.object %}
 	Objekt {{ view.object }}: {{ view.object }}
@@ -29,6 +30,8 @@
 	<a href='{% url 'admin:flatpages_flatpage_change' flatpage.id %}'>[admin]</a>
       {% endif %}
     </div>
+  {% endif %}
+
     <div class="container">
 	  <div class='row'>
 		<div class='col-md-12'>

From c127f30c42e5df7711423f137d71854edcd77b53 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Wed, 2 Sep 2015 21:32:28 +0200
Subject: [PATCH 5/6] Slouceno pristi soustredeni a pripravujeme

---
 seminar/templates/seminar/soustredeni/submenu.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/seminar/templates/seminar/soustredeni/submenu.html b/seminar/templates/seminar/soustredeni/submenu.html
index b8f9bd71..c1e9deed 100644
--- a/seminar/templates/seminar/soustredeni/submenu.html
+++ b/seminar/templates/seminar/soustredeni/submenu.html
@@ -2,7 +2,6 @@
 
 <ul>
   <li><a href="{{cesta}}/uvod/">Úvod</a>
-  <li><a href="{{cesta}}/pristi/">Příští soustředění</a>
   <li><a href="{{cesta}}/pripravujeme/">Připravujeme</a>
   <li><a href="{{cesta}}/probehlo/">Proběhlo</a>
 </ul>

From 2a8d542d1e553601ce5f081af8b8717e6d5b5344 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Wed, 2 Sep 2015 21:39:01 +0200
Subject: [PATCH 6/6] Deaktivace odeslat reseni v menu

---
 mamweb/templates/menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html
index d0af5551..110e91f7 100644
--- a/mamweb/templates/menu.html
+++ b/mamweb/templates/menu.html
@@ -7,7 +7,7 @@
   <li><a href="/zadani/aktualni/">Zadání</a>
   <li><a href="/clanky/uvod/">Články</a>
   <li><a href="/archiv/cisla/">Archiv</a>
-  <li><a href="/odevzdat-reseni/muj-ucet">Odeslat řešení</a>
+  <li>{#<a href="/odevzdat-reseni/muj-ucet">#}Odeslat řešení{#</a>#}
 </ul>
 
 <!-- TODO smazat <ul>