From cf83fb0593b1caa2a09039dcecd8302fbe919d8e Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Wed, 3 Jun 2015 14:16:30 +0200
Subject: [PATCH] struktura menu + submenu Co je M&M

---
 mamweb/templates/base.html                          |  2 ++
 mamweb/templates/flatpages/default.html             |  6 ++++++
 mamweb/templates/menu.html                          | 13 ++++++++++++-
 seminar/templates/seminar/cojemam/organizatori.html | 13 +++++++++++++
 seminar/templates/seminar/cojemam/submenu.html      |  8 ++++++++
 seminar/urls.py                                     |  3 +++
 seminar/views.py                                    |  5 +++++
 7 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 seminar/templates/seminar/cojemam/organizatori.html
 create mode 100644 seminar/templates/seminar/cojemam/submenu.html

diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index ff931421..d351ff7d 100644
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@@ -36,6 +36,8 @@
       <div class='row'>
 	<div class='col-md-4' style=''>
 	  {% include "menu.html" %}
+    {% block submenu %}
+    {% endblock %}
 	</div>
 	<div class='col-md-8'>
 	  {% block content %}
diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html
index d4d45502..71c93e3f 100644
--- a/mamweb/templates/flatpages/default.html
+++ b/mamweb/templates/flatpages/default.html
@@ -9,3 +9,9 @@
 </div>
 {% endblock content %}
 
+{% block submenu %}
+  {% if "/co-je-MaM/" in flatpage.url %}
+    {% include "seminar/cojemam/submenu.html" %}
+  {% endif %}
+{% endblock %}
+
diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html
index 2c024d70..ed75100b 100644
--- a/mamweb/templates/menu.html
+++ b/mamweb/templates/menu.html
@@ -1,7 +1,18 @@
 {% load i18n cache mam_menu %}
 {% aktualni_rocniky as rs %}
 
-<h2>MENU</h2>
+<h2> MENU </h2>
+
+<ul>
+  <li><a href="/co-je-MaM/uvod/">Co je M&amp;M</a>
+  <li><a href="/soustredeni/uvod/">Soustředění</a>
+  <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>-->
+</ul>
+
+<h2>STARÉ MENU</h2>
 
 <p><a href='{% url 'seminar_aktualni_zadani' %}'>Aktuální zadání</a>
 
diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html
new file mode 100644
index 00000000..d71566bc
--- /dev/null
+++ b/seminar/templates/seminar/cojemam/organizatori.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+{% block submenu %}
+  {% include "seminar/cojemam/submenu.html" %}
+{% endblock %}
+
+{% block content %}
+<div>
+  <h2>Organizátoři</h2>
+
+</div>
+{% endblock content %}
+
diff --git a/seminar/templates/seminar/cojemam/submenu.html b/seminar/templates/seminar/cojemam/submenu.html
new file mode 100644
index 00000000..4d449a20
--- /dev/null
+++ b/seminar/templates/seminar/cojemam/submenu.html
@@ -0,0 +1,8 @@
+<ul>
+  <li><a href="../uvod/">Úvod</a>
+  <li><a href="../jak-resit/">Jak řešit</a>
+  <li><a href="../organizatori/">Organizátoři</a>
+  <li><a href="../FAQ/">FAQ</a>
+</ul>
+
+
diff --git a/seminar/urls.py b/seminar/urls.py
index 0ef0aed9..15d9d722 100644
--- a/seminar/urls.py
+++ b/seminar/urls.py
@@ -2,6 +2,9 @@ from django.conf.urls import patterns, url
 from . import views, export
 
 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'),
diff --git a/seminar/views.py b/seminar/views.py
index 39f60bd5..fed81e4c 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -12,6 +12,11 @@ def AktualniZadaniView(request):
                 },
             )
 
+# Co je M&M
+
+class CojemamOrganizatoriView(generic.TemplateView):
+    template_name='seminar/cojemam/organizatori.html'
+
 class RocnikView(generic.DetailView):
     model = Rocnik
     template_name = 'seminar/rocnik.html'