mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb

Browse source
This commit is contained in:
Jethro 2015-09-12 17:11:22 +02:00
commit fb97513870
8 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mamweb/templates/base.html
View file

@ -48,7 +48,7 @@
<div class='row'>
<div class='col-md-12'>
<a href='/'>
<div id="header">
<div id="header" class="{% block header %}{% endblock %}">
<img class="logo" src="{% static 'images/logo.png' %}" />
<!--<h1>{% block nadpis1b %}Nadpis 1. úrovně{% endblock %}</h1>-->
</div>

3
mamweb/templates/flatpages/default.html
View file

@ -100,4 +100,7 @@
{% block menu_clanky %}{% if "/clanky/" in flatpage.url %}selected{% endif %}{% endblock %}
{% block menu_archiv %}{% if "/archiv/" in flatpage.url %}selected{% endif %}{% endblock %}
{# zmena titulniho obrazku #}
{% block header %}{% if "/co-je-MaM/" in flatpage.url %}cojemam{% elif "/soustredeni/" in flatpage.url %}soustredeni{% elif "/zadani/" in flatpage.url %}zadani{% elif "/clanky/" in flatpage.url %}clanky{% elif "/archiv/" in flatpage.url %}archiv{% else %}odeslat{% endif %}{% endblock header %}
{# TODO zvirazneni submenu #}

2
seminar/templates/seminar/archiv/base.html
View file

@ -2,3 +2,5 @@
{% block menu_archiv %}selected{% endblock %}
{# zmena fotky #}{% block header %}archiv{% endblock %}

2
seminar/templates/seminar/clanky/base.html
View file

@ -2,6 +2,8 @@
{% block menu_clanky %}selected{% endblock %}
{# zmena fotky #}{% block header %}clanky{% endblock %}
{% block submenu %}
{% include "seminar/clanky/submenu.html" %}
{% endblock %}

3
seminar/templates/seminar/cojemam/organizatori.html
View file

@ -7,6 +7,7 @@
{% endif %}
{% endblock%}{% endblock%}
{# podbarveni menu a submenu #}
{% block menu_uvod %}selected{% endblock %}
{% block submenu %}
{% with "org" as selected %}
@ -14,6 +15,8 @@
{% endwith %}
{% endblock %}
{# zmena fotky #}{% block header %}cojemam{% endblock %}
{% block content %}
<div>
{% if not aktivni %}

2
seminar/templates/seminar/soustredeni/seznam_soustredeni.html
View file

@ -7,6 +7,8 @@
{% endwith %}
{% endblock submenu %}
{# zmena fotky #}{% block header %}soustredeni{% endblock %}
{% block content %}{% if user.is_authenticated %}{# PRACUJE SE STRANKA #}
<h2>

2
seminar/templates/seminar/titulnistrana.html
View file

@ -16,7 +16,7 @@
<li> Seminář: organizujeme odborná soustředění.
<h3><a href="/o-seminari">Co je na nás skvělé?</a></h3>
<h3><a href="//co-je-MaM/uvod/">Zjistit víc!</a></h3>
<h3><a href="/co-je-MaM/uvod/">Zjistit víc!</a></h3>
</center></p>
{# Novinky #}

2
seminar/templates/seminar/zadani/base.html
View file

@ -2,6 +2,8 @@
{% block menu_zadani %}selected{% endblock %}
{# zmena fotky #}{% block header %}zadani{% endblock %}
{% block submenu %}
{% include 'seminar/zadani/submenu.html' %}
{% endblock submenu %}