From dd67c977b8d892a2ef831d62b72b84487b8b0d7f Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Thu, 10 Sep 2015 12:11:28 +0200
Subject: [PATCH] Oprava dvojjakosti nadpisu

---
 mamweb/templates/404.html                                  | 7 ++++++-
 mamweb/templates/500.html                                  | 7 ++++++-
 mamweb/templates/base.html                                 | 4 ++--
 mamweb/templates/flatpages/default.html                    | 7 ++++++-
 seminar/templates/seminar/archiv/cisla.html                | 6 +++++-
 seminar/templates/seminar/archiv/cislo.html                | 6 +++++-
 seminar/templates/seminar/archiv/problem.html              | 4 ++--
 seminar/templates/seminar/archiv/rocnik.html               | 6 +++++-
 seminar/templates/seminar/archiv/temata.html               | 6 +++++-
 seminar/templates/seminar/cojemam/organizatori.html        | 4 ++--
 seminar/templates/seminar/pracuje_se.html                  | 7 ++++++-
 .../templates/seminar/soustredeni/seznam_soustredeni.html  | 6 +++++-
 seminar/templates/seminar/stav_databaze.html               | 6 +++++-
 seminar/templates/seminar/zadani/AktualniZadani.html       | 7 ++++++-
 seminar/templates/seminar/zadani/Temata.html               | 7 ++++++-
 15 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/mamweb/templates/404.html b/mamweb/templates/404.html
index b119dff5..485896d0 100644
--- a/mamweb/templates/404.html
+++ b/mamweb/templates/404.html
@@ -3,7 +3,12 @@
 {% load staticfiles %}
 
 {% block content %}
-  <h2>{% block nadpis1 %}Požadovaná stránka nenalezena{% endblock%}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Požadovaná stránka nenalezena
+    {% endblock %}{% endblock%}
+  </h2>
+
   <p>
     Tuto stránku jsme na našem servru nenalezli.
     Zkuste přejít na <a href="/">titulní stránku</a>
diff --git a/mamweb/templates/500.html b/mamweb/templates/500.html
index 8072c7a1..6c1c7b93 100644
--- a/mamweb/templates/500.html
+++ b/mamweb/templates/500.html
@@ -3,7 +3,12 @@
 {% load staticfiles %}
 
 {% block content %}
-  <h2>{% block nadpis1 %}O-jo-jo-jo-joj{% endblock %}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      O-jo-jo-jo-joj
+    {% endblock %}{% endblock %}
+  </h2>
+
   <p>
     Chybička se vloudila.
     Zkuste přejít na <a href="/">titulní stránku</a>
diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index e4bb4af4..722437a1 100644
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@@ -45,13 +45,13 @@
 	  <div id="header">
 		  <div class='header-lg visible-lg-block'>
 			<img class="logo" src="{% static 'images/logocb.png' %}" />
-      <h1>{% block nadpis1 %}Nadpis 1. úrovně{% endblock %}</h1>
+      <h1>{% block nadpis1a %}Nadpis 1. úrovně{% endblock %}</h1>
 			<img class="header" src="{% static 'images/liska6.png' %}" />
 			<!--<a href="/">Korespondenční seminář M&amp;M</a>-->
 		  </div>
 		  <div class='header-md visible-md-block'>
 			<img class="logo" src="{% static 'images/logocb.png' %}" />
-			<h1>Nadpis 1. úrovně</h1>
+      <h1>{% block nadpis1b %}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 4f0cbfa6..47060987 100644
--- a/mamweb/templates/flatpages/default.html
+++ b/mamweb/templates/flatpages/default.html
@@ -3,7 +3,12 @@
 {% block title %}{{ flatpage.title }}{% endblock title %}
 
 {% block content %}
-<h2>{% block nadpis1 %}{{ flatpage.title }}{% endblock %}</h2>
+<h2>
+  {% block nadpis1a %}{% block nadpis1b%}
+    {{ flatpage.title }}
+  {% endblock %}{% endblock %}
+</h2>
+
 <div>
 {{ flatpage.content }}
 </div>
diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html
index c5ab25f7..f16580c6 100644
--- a/seminar/templates/seminar/archiv/cisla.html
+++ b/seminar/templates/seminar/archiv/cisla.html
@@ -6,7 +6,11 @@
 
 {% block content %}
 <div>
-  <h2>{% block nadpis1 %}Archiv čísel {% endblock %}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Archiv čísel
+    {% endblock %}{% 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 23d115a7..d5e9f18c 100644
--- a/seminar/templates/seminar/archiv/cislo.html
+++ b/seminar/templates/seminar/archiv/cislo.html
@@ -2,7 +2,11 @@
 
 {% block content %}
 <div>
-  <h2>{% block nadpis1 %}Číslo {{ cislo }}{% endblock%}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Číslo {{ cislo }}
+    {% endblock %}{% 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 f2a6c39d..493c5089 100644
--- a/seminar/templates/seminar/archiv/problem.html
+++ b/seminar/templates/seminar/archiv/problem.html
@@ -6,12 +6,12 @@
 <div>
   {% if problem.cislo_zadani %}
     <h2>
-      {% block nadpis1 %}
+      {% block nadpis1a %}{% block nadpis1b %}
         {{ problem.nazev_typu }} {{ problem.kod_v_rocniku }}: {{ problem.nazev }}
         {% if problem.body %}
           ({{ problem.body }}b)
         {% endif %}
-      {% endblock %}
+      {% endblock %}{% endblock %}
     </h2>
 
     <p>Zadáno v čísle <a href='{{ problem.cislo_zadani.verejne_url }}'>{{ problem.cislo_zadani.kod }}</a>.
diff --git a/seminar/templates/seminar/archiv/rocnik.html b/seminar/templates/seminar/archiv/rocnik.html
index 558d9bfa..5cdb6dd3 100644
--- a/seminar/templates/seminar/archiv/rocnik.html
+++ b/seminar/templates/seminar/archiv/rocnik.html
@@ -2,7 +2,11 @@
 
 {% block content %}
 <div>
-  <h2>{% block nadpis1 %} Ročník {{ rocnik.roman }} {% endblock %}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Ročník {{ rocnik.roman }}
+    {% endblock %}{% endblock %}
+  </h2>
 
   <p>Ročník číslo {{ rocnik.rocnik }} ({{ rocnik.prvni_rok }}/{{ rocnik.druhy_rok }})
 
diff --git a/seminar/templates/seminar/archiv/temata.html b/seminar/templates/seminar/archiv/temata.html
index b9d57aaa..640d047b 100644
--- a/seminar/templates/seminar/archiv/temata.html
+++ b/seminar/templates/seminar/archiv/temata.html
@@ -1,7 +1,11 @@
 {% extends "seminar/archiv/base.html" %}
 
 {% block content %}
-  <h2>{% block nadpis1 %} Archiv témat {% endblock %}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Archiv témat 
+    {% endblock %}{% endblock%}
+  </h2>
 
   {% for tema in object_list %}
   {% with tema.cislo_zadani.rocnik.rocnik as rocnik %}
diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html
index 827ac7cf..b09ff8fa 100644
--- a/seminar/templates/seminar/cojemam/organizatori.html
+++ b/seminar/templates/seminar/cojemam/organizatori.html
@@ -1,11 +1,11 @@
 {% extends "seminar/cojemam/base.html" %}
-{% block nadpis1 %}
+{% block nadpis1a %}{% block nadpis1b %}
   {% if aktivni %}
     Organizátoři
   {% else %}
     Vysloužilí organizátoři
   {% endif %}
-{% endblock%}
+{% endblock%}{% endblock%}
 
 {% block content %}
 <div>
diff --git a/seminar/templates/seminar/pracuje_se.html b/seminar/templates/seminar/pracuje_se.html
index f79d3ee3..5349707d 100644
--- a/seminar/templates/seminar/pracuje_se.html
+++ b/seminar/templates/seminar/pracuje_se.html
@@ -1,7 +1,12 @@
 {% load staticfiles %}
 
 {% block content %}
-  <h2>{% block nadpis1 %}Tady se pracuje{% endblock%}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Tady se pracuje
+    {% endblock %}{% endblock %}
+  </h2>
+
   <p>
     Na této stránce velmi intenzivně pracujeme.
     Za dočasnou nedostupnost se omlouváme.
diff --git a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html
index 42d50db5..e1b12482 100644
--- a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html
+++ b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html
@@ -2,7 +2,11 @@
 
 {% block content %}{% if user.is_authenticated %}{# PRACUJE SE STRANKA #}
 
-  <h1>{% block nadpis1 %}Soustředění{% endblock %}</h1>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Soustředění
+    {% endblock %}{% endblock %}
+  </h2>
 
   {# 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 5c04b9a5..a8170290 100644
--- a/seminar/templates/seminar/stav_databaze.html
+++ b/seminar/templates/seminar/stav_databaze.html
@@ -2,7 +2,11 @@
 
 {% block content %}
 <div>
-  <h2>{% block nadpis1 %}Stav databáze{% endblock %}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Stav databáze
+    {% endblock %}{% endblock %}
+  </h2>
 
   <h3>Řešitelé</h3>
 
diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html
index 552dcf5d..15d4081c 100644
--- a/seminar/templates/seminar/zadani/AktualniZadani.html
+++ b/seminar/templates/seminar/zadani/AktualniZadani.html
@@ -2,7 +2,12 @@
 
 {% block content %}
 <div>
-  <h2>{% block nadpis1 %}Aktuální zadání{% endblock %}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Aktuální zadání
+    {% endblock %}{% endblock %}
+  </h2>
+  
   {% with nastaveni.aktualni_cislo as ac %}
 
       {% if ac.zadane_problemy.all %}
diff --git a/seminar/templates/seminar/zadani/Temata.html b/seminar/templates/seminar/zadani/Temata.html
index 4253c066..ca1c31b4 100644
--- a/seminar/templates/seminar/zadani/Temata.html
+++ b/seminar/templates/seminar/zadani/Temata.html
@@ -3,7 +3,12 @@
 {% block content %}
 {% with nastaveni.aktualni_rocnik as ar %}
 <div>
-  <h2>{% block nadpis1 %}Témata{% endblock %}</h2>
+  <h2>
+    {% block nadpis1a %}{% block nadpis1b %}
+      Témata
+    {% endblock %}{% endblock %}
+  </h2>
+
   <p>
     Témata jsou hlavním obsahem časopisu M&amp;M. Obvykle představují
     složitější a obecnější problémy než samostatné úlohy. Navíc je v&nbsp;jejich