diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 6c6d206a..e849effa 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -25,9 +25,11 @@ a { color: #6f2509; } -a:active { - color: #6f2509; +a:focus, a:hover, a:active { + color: #e84e10; + text-decoration: none; } +a:focus a:hover h1 { /*todo: odlišit 1 a 2 */ font-size: 200%; @@ -546,8 +548,8 @@ ul.submenu { width: 70%; margin-left: auto; margin-right: auto; - } + } /*stránka organizátorů*/ diff --git a/mamweb/static/images/graf/adrenalinove.jpeg b/mamweb/static/images/graf/adrenalinove.jpeg new file mode 100644 index 00000000..e90ee50d Binary files /dev/null and b/mamweb/static/images/graf/adrenalinove.jpeg differ diff --git a/mamweb/static/images/graf/behaci.jpeg b/mamweb/static/images/graf/behaci.jpeg new file mode 100644 index 00000000..c9930c18 Binary files /dev/null and b/mamweb/static/images/graf/behaci.jpeg differ diff --git a/mamweb/static/images/graf/ceny.jpeg b/mamweb/static/images/graf/ceny.jpeg new file mode 100644 index 00000000..fb6fb475 Binary files /dev/null and b/mamweb/static/images/graf/ceny.jpeg differ diff --git a/mamweb/static/images/graf/deskovky.jpeg b/mamweb/static/images/graf/deskovky.jpeg new file mode 100644 index 00000000..d55acdbc Binary files /dev/null and b/mamweb/static/images/graf/deskovky.jpeg differ diff --git a/mamweb/static/images/graf/dort.jpeg b/mamweb/static/images/graf/dort.jpeg new file mode 100644 index 00000000..21623e35 Binary files /dev/null and b/mamweb/static/images/graf/dort.jpeg differ diff --git a/mamweb/static/images/graf/hry.jpeg b/mamweb/static/images/graf/hry.jpeg new file mode 100644 index 00000000..9103a3eb Binary files /dev/null and b/mamweb/static/images/graf/hry.jpeg differ diff --git a/mamweb/static/images/graf/jidlo.jpeg b/mamweb/static/images/graf/jidlo.jpeg new file mode 100644 index 00000000..98c08463 Binary files /dev/null and b/mamweb/static/images/graf/jidlo.jpeg differ diff --git a/mamweb/static/images/graf/konfery.jpeg b/mamweb/static/images/graf/konfery.jpeg new file mode 100644 index 00000000..eebe44e9 Binary files /dev/null and b/mamweb/static/images/graf/konfery.jpeg differ diff --git a/mamweb/static/images/graf/legenda.jpeg b/mamweb/static/images/graf/legenda.jpeg new file mode 100644 index 00000000..6824b026 Binary files /dev/null and b/mamweb/static/images/graf/legenda.jpeg differ diff --git a/mamweb/static/images/graf/prednasky.jpeg b/mamweb/static/images/graf/prednasky.jpeg new file mode 100644 index 00000000..778d6cd5 Binary files /dev/null and b/mamweb/static/images/graf/prednasky.jpeg differ diff --git a/mamweb/static/images/graf/strategicke.jpeg b/mamweb/static/images/graf/strategicke.jpeg new file mode 100644 index 00000000..88ec8f4b Binary files /dev/null and b/mamweb/static/images/graf/strategicke.jpeg differ diff --git a/mamweb/static/images/graf/vylet.jpeg b/mamweb/static/images/graf/vylet.jpeg new file mode 100644 index 00000000..f7a0eea9 Binary files /dev/null and b/mamweb/static/images/graf/vylet.jpeg differ diff --git a/mamweb/static/images/graph.png b/mamweb/static/images/graph.png deleted file mode 100644 index 41aaafff..00000000 Binary files a/mamweb/static/images/graph.png and /dev/null differ diff --git a/mamweb/static/images/graph_new.png b/mamweb/static/images/graph_new.png deleted file mode 100644 index 699aabd4..00000000 Binary files a/mamweb/static/images/graph_new.png and /dev/null differ diff --git a/mamweb/templates/graph.svg b/mamweb/templates/graph.svg new file mode 100644 index 00000000..da3680d6 --- /dev/null +++ b/mamweb/templates/graph.svg @@ -0,0 +1,731 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + Strategické + + + + + + Běhací + + + + + + Adrenalinové + + + + + + Jídlo + + + + + + Přednášky + + + + + + Soustředění + + + + + + Konfery + + + + + + Výlet + + + + + + Legenda + + + + + + M&M + + + + + + Časopis + + + + + + Články + + + + + + Matematika + + + + + + Fyzika + + + + + + Informatika + + + + + + Témata + + + + + + Dort + + + + + + Ceny pro vítěze + + + + + + + + + + + + + + + + + + + + + + + Hry + + + Hry + + + + diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index b12bd1a8..8e8f1aaa 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -18,14 +18,15 @@ {# zmena fotky #}{% block header %}cojemam{% endblock %} {% block content %} -
+ {% if not aktivni %}
Aktivní organizátoři

{% endif %} - {% for org in object_list %} +
+ {% for org in object_list %}

diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html index 1f9c3068..bf9a884a 100644 --- a/seminar/templates/seminar/titulnistrana.html +++ b/seminar/templates/seminar/titulnistrana.html @@ -13,7 +13,7 @@

M&M je korespondenční seminář. Několikrát do roka zdarma vydáváme časopis a v něm zajímavé podněty k přemýšlení. Ty na ně můžeš reagovat.
- + M&M je taky soutěž. Můžeš vyhrát knížky, deskovky nebo dokonce dort. Můžeš se dostat na matfyz bez přijímaček. A především s námi můžeš jet na skvělé soustředění.

@@ -33,38 +33,13 @@ M&M je korespondenční seminář. Několikrát do roka zdarma vydáváme č
- - - - - - - - - - - - - - - - - - - - - - - +
+ {% include 'graph.svg' %} +
-

Zjistit víc!
- - - - {% endblock %}