Browse Source
Conflicts: mamweb/templates/menu.html seminar/templates/seminar/novinky.html seminar/views.pyremotes/origin/vyslbez12
Aneta
9 years ago
42 changed files with 587 additions and 333 deletions
|
After Width: | Height: | Size: 679 KiB |
|
After Width: | Height: | Size: 50 KiB |
|
After Width: | Height: | Size: 239 B |
|
After Width: | Height: | Size: 572 B |
|
After Width: | Height: | Size: 239 B |
|
After Width: | Height: | Size: 653 B |
@ -1,6 +1,4 @@ |
|||||
{% extends "base.html" %} |
{% extends "base.html" %} |
||||
|
|
||||
{% block submenu %} |
{% block menu_archiv %}selected{% endblock %} |
||||
{% include "seminar/archiv/submenu.html" %} |
|
||||
{% endblock %} |
|
||||
|
|
||||
|
|||||
@ -0,0 +1,8 @@ |
|||||
|
{% extends "seminar/archiv/base.html" %} |
||||
|
|
||||
|
{% block submenu %} |
||||
|
{% with "cisla" as selected %} |
||||
|
{% include "seminar/archiv/submenu.html" %} |
||||
|
{% endwith %} |
||||
|
{% endblock %} |
||||
|
|
||||
@ -0,0 +1,8 @@ |
|||||
|
{% extends "seminar/archiv/base.html" %} |
||||
|
|
||||
|
{% block submenu %} |
||||
|
{% with "temata" as selected %} |
||||
|
{% include "seminar/archiv/submenu.html" %} |
||||
|
{% endwith %} |
||||
|
{% endblock %} |
||||
|
|
||||
@ -0,0 +1,10 @@ |
|||||
|
{% extends "seminar/archiv/base.html" %} |
||||
|
|
||||
|
{% block menu_archiv %}selected{% endblock %} |
||||
|
|
||||
|
{% block submenu %} |
||||
|
{% with "ulohy" as selected %} |
||||
|
{% include "seminar/archiv/submenu.html" %} |
||||
|
{% endwith %} |
||||
|
{% endblock %} |
||||
|
|
||||
@ -0,0 +1,23 @@ |
|||||
|
{% extends "seminar/archiv/base_temata.html" %} |
||||
|
|
||||
|
{% block content %} |
||||
|
<h2> |
||||
|
{% block nadpis1a %}{% block nadpis1b %} |
||||
|
Archiv témat |
||||
|
{% endblock %}{% endblock%} |
||||
|
</h2> |
||||
|
|
||||
|
{% for tema in object_list %} |
||||
|
{% with tema.cislo_zadani.rocnik.rocnik as rocnik %} |
||||
|
{% ifchanged rocnik %} |
||||
|
{% if not forloop.first %}</ul>{% endif %} |
||||
|
<h3>{{ rocnik }}. ročník</h3> |
||||
|
<ul> |
||||
|
{% endifchanged %} |
||||
|
<li> |
||||
|
<a href="{{ tema.verejne_url }}">{{ tema.kod_v_rocniku }}: {{ tema.nazev }}</a> |
||||
|
{% endwith %} |
||||
|
{% endfor %} |
||||
|
</ul> |
||||
|
|
||||
|
{% endblock content %} |
||||
@ -1,15 +1,32 @@ |
|||||
{% extends 'base.html' %} |
{% for novinka in object_list %} |
||||
Před začátkem bloku. |
{# pripravene div-y na stylovani#} |
||||
{% block body %} |
<div> |
||||
Tady bude začátek. |
{# datum #} |
||||
{% for novinka in novinky %} |
<div><b>{{novinka.datum}}</b></div> |
||||
{% if novinka.datum > pred_2_mesici and novinka.zverejneno %} |
{# text #} |
||||
<p> |
{{ novinka.text | safe }} |
||||
Tady bude novinka. |
{# obrazek #} |
||||
{{ novinka.text }} |
{% if novinka.obrazek %} |
||||
</p> |
<div> |
||||
<img src='{{ novinka.obrazek }}'> |
<img src='{{novinka.obrazek.url}}' |
||||
{% endif %} |
height=' |
||||
{% endfor%} |
{% if novinka.obrazek.height > 200 %} {# vyska obrazku natvrdo #} |
||||
Tady bude konec. |
200 |
||||
{% endblock %} |
{% else %} |
||||
|
{{novinka.obrazek.height}} |
||||
|
{% endif%} |
||||
|
'> |
||||
|
</div> |
||||
|
{% endif %} |
||||
|
{# autor #} |
||||
|
{% if user.is_staff %} |
||||
|
<div>{{novinka.autor.first_name}} |
||||
|
{% if novinka.autor.organizator.prezdivka%} |
||||
|
„{{novinka.autor.organizator.prezdivka}}“ |
||||
|
{% endif %} |
||||
|
{{novinka.autor.last_name}} |
||||
|
</div> |
||||
|
{% endif %} |
||||
|
</div> |
||||
|
{% endfor%} |
||||
|
|
||||
|
|||||
@ -1,9 +1,9 @@ |
|||||
{% with "/soustredeni" as cesta %} |
{% with "/soustredeni" as cesta %} |
||||
|
|
||||
<ul> |
<ul> |
||||
<li><a href="{{cesta}}/uvod/">Úvod</a> |
<li class="{% if selected == "uvod" %}selected{% endif %}"><a href="{{cesta}}/">Úvod</a> |
||||
<li><a href="{{cesta}}/pripravujeme/">Připravujeme</a> |
<li class="{% if selected == "pripravujeme" %}selected{% endif %}"><a href="{{cesta}}/pripravujeme/">Připravujeme</a> |
||||
<li><a href="{{cesta}}/probehlo/">Proběhlo</a> |
<li class="{% if selected == "probehlo" %}selected{% endif %}"><a href="{{cesta}}/probehlo/">Proběhlo</a> |
||||
</ul> |
</ul> |
||||
|
|
||||
{% endwith %} |
{% endwith %} |
||||
|
|||||
@ -0,0 +1,13 @@ |
|||||
|
{% extends 'base.html' %} |
||||
|
|
||||
|
{% block content %} |
||||
|
|
||||
|
<h2> |
||||
|
{% block nadpis1a %}{% block nadpis1b %} |
||||
|
Archiv novinek |
||||
|
{% endblock %}{% endblock %} |
||||
|
</h2> |
||||
|
|
||||
|
{% include 'seminar/novinky.html' %} |
||||
|
|
||||
|
{% endblock %} |
||||
@ -1,8 +1,20 @@ |
|||||
Trala! |
|
||||
{% extends 'base.html' %} |
{% extends 'base.html' %} |
||||
|
|
||||
HU! |
|
||||
{% block novinky %} |
{% block content %} |
||||
Tady bude nadpis pro novinky. |
|
||||
{% include 'novinky.html' %} |
{# Uvitaci text #} |
||||
|
<h2> |
||||
|
{% block nadpis1a %}{% block nadpis1b %} |
||||
|
Tož vitajte! |
||||
|
{% endblock %}{% endblock %} |
||||
|
</h2> |
||||
|
<p> Uvítací text či-co.</p> |
||||
|
|
||||
|
{# Novinky #} |
||||
|
<h2>Novinky</h2> |
||||
|
{% include 'seminar/novinky.html' %} |
||||
|
|
||||
|
<a href='/stare-novinky/'>Archiv novinek</a> |
||||
|
|
||||
{% endblock %} |
{% endblock %} |
||||
|
|||||
@ -1,11 +1,11 @@ |
|||||
{% with "/zadani" as cesta %} |
{% with "/zadani" as cesta %} |
||||
|
|
||||
<ul> |
<ul> |
||||
<li><a href="{{cesta}}/aktualni/">Aktuální zadání</a> |
<li class="{% if selected == "aktualni" %}selected{% endif %}"><a href="{{cesta}}/aktualni/">Aktuální zadání</a> |
||||
<li><a href="{{cesta}}/ulohy/">Úlohy</a> |
<li class="{% if selected == "ulohy" %}selected{% endif %}"><a href="{{cesta}}/ulohy/">Úlohy</a> |
||||
<li><a href="{{cesta}}/temata/">Témata</a> |
<li class="{% if selected == "temata" %}selected{% endif %}"><a href="{{cesta}}/temata/">Témata</a> |
||||
<li><a href="{{cesta}}/aktualni-cislo/">Aktuální číslo</a> |
<li class="{% if selected == "aktualni-cislo" %}selected{% endif %}"><a href="{{cesta}}/aktualni-cislo/">Aktuální číslo</a> |
||||
<li><a href="{{cesta}}/vysledkove-listiny/">Výsledkové listiny</a> |
<li class="{% if selected == "vysledkove-listiny" %}selected{% endif %}"><a href="{{cesta}}/vysledkove-listiny/">Výsledkové listiny</a> |
||||
</ul> |
</ul> |
||||
|
|
||||
{% endwith %} |
{% endwith %} |
||||
|
|||||
Loading…
Reference in new issue