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

Uprava zakladnich template - pridava se "admin bar"

Browse source
This commit is contained in:
Tomas Gavenciak 2015-05-14 00:51:19 +02:00
parent 3ac2b34dd8
commit 63bc158e54
7 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mamweb/templates/base.html
View file

@ -12,6 +12,13 @@
<script src="{% static 'js/jquery-1.11.1.js' %}"></script> <script src="{% static 'js/jquery-1.11.1.js' %}"></script>
</head> </head>
<body class='{% if True %}org-logged-in{% endif %}'> <body class='{% if True %}org-logged-in{% endif %}'>
<!-- TODO: only on org login -->
<div class="login-bar" style='background: #F80;'>
{% if view.object %}
Objekt {{ view.object }}: {{ view.object }}
{% if view.object.admin_url %}<a href='{{ view.object.admin_url }}'>[admin]</a>{% endif %}
{% endif %}
</div>
<div class="container"> <div class="container">
<div class='header'> <div class='header'>
Korespondenční seminář M&amp;M Korespondenční seminář M&amp;M

2
mamweb/templates/home.html
View file

@ -3,7 +3,7 @@
{% block content %} {% block content %}
<div> <div>
<h2>Vítejte na testwebu MaM!</h2> <h2>Vítejte na testwebu MaM!</h2>
<p><a href='/admin/'>Administrátorské rozhraní</a> (admin/admin) <p><a href='{% url 'admin:index' %}'>Administrátorské rozhraní</a> (admin/admin)
</div> </div>
{% endblock content %} {% endblock content %}

4
mamweb/templates/menu.html
View file

@ -3,10 +3,10 @@
<h2>MENU</h2> <h2>MENU</h2>
<p><a href='{% url 'seminar.aktualni_zadani' %}'>Aktuální zadání</a> <p><a href='{% url 'seminar_aktualni_zadani' %}'>Aktuální zadání</a>
<ul> <ul>
{% for r in rs %} {% for r in rs %}
<li><a href='{% url 'seminar.rocnik' r.id %}'>Ročník {{ r }}</a> <li><a href='{{ r.verejne_url }}'>Ročník {{ r }}</a>
{% endfor %} {% endfor %}
</ul> </ul>

1
seminar/templates/seminar/AktualniZadani.html
View file

@ -1,5 +1,4 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles sekizai_tags %}
{% block content %} {% block content %}
<div> <div>

9
seminar/templates/seminar/cislo.html
View file

@ -1,23 +1,22 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles sekizai_tags %}
{% block content %} {% block content %}
<div> <div>
<h2>Číslo {{ cislo }}</h2> <h2>Číslo {{ cislo }}</h2>
<p><a href='{% url 'seminar.rocnik' cislo.rocnik.id %}'>Ročník {{ cislo.rocnik }}</a> <p><a href='{{ cislo.rocnik.verejne_url }}'>Ročník {{ cislo.rocnik }}</a>
<h3>Zadané problémy</h3> <h3>Zadané problémy</h3>
<ul> <ul>
{% for p in cislo.zadane_problemy.all %} {% for p in cislo.zadane_problemy.all %}
<li><a href='{% url 'seminar.problem' p.id %}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a> <li><a href='{{ p.verejne_url }}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a>
{% endfor %} {% endfor %}
</ul> </ul>
<h3>Řešené problémy</h3> <h3>Řešené problémy</h3>
<ul> <ul>
{% for p in cislo.resene_problemy.all %} {% for p in cislo.resene_problemy.all %}
<li><a href='{% url 'seminar.problem' p.id %}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a> <li><a href='{{ p.verejne_url }}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a>
{% endfor %} {% endfor %}
</ul> </ul>
@ -28,7 +27,7 @@
<th class='border-r'># <th class='border-r'>#
<th class='border-r'>Jméno <th class='border-r'>Jméno
{% for p in problemy %} {% for p in problemy %}
<th class='border-r'><a href="{% url 'seminar.problem' p.id %}">{{ p.cislo_zadani.cislo }}.{{ p.kod }}</a> <th class='border-r'><a href="{{ p.verejne_url }}">{{ p.cislo_zadani.cislo }}.{{ p.kod }}</a>
{% endfor %} {% endfor %}
<th class='border-r'>Sum <th class='border-r'>Sum
<th>Celkem <th>Celkem

5
seminar/templates/seminar/problem.html
View file

@ -1,12 +1,11 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles sekizai_tags %}
{% block content %} {% block content %}
<div> <div>
<h2>Problém {{ problem.kod_v_rocniku }} {{ problem.nazev }}</h2> <h2>Problém {{ problem.kod_v_rocniku }} {{ problem.nazev }}</h2>
<p>Zadáno v čísle <a href='{% url 'seminar.cislo' problem.cislo_zadani.id %}'>{{ problem.cislo_zadani.kod }}</a>, <p>Zadáno v čísle <a href='{{ problem.cislo_zadani.verejne_url }}'>{{ problem.cislo_zadani.kod }}</a>,
<p>řešeno v čísle <a href='{% url 'seminar.cislo' problem.cislo_reseni.id %}'>{{ problem.cislo_reseni.kod }}</a>, <p>řešeno v čísle <a href='{{ problem.cislo_reseni.verejne_url }}'>{{ problem.cislo_reseni.kod }}</a>,
<h3>Text</h3> <h3>Text</h3>

3
seminar/templates/seminar/rocnik.html
View file

@ -1,5 +1,4 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles sekizai_tags %}
{% block content %} {% block content %}
<div> <div>
@ -9,7 +8,7 @@
<ul> <ul>
{% for c in rocnik.verejna_cisla %} {% for c in rocnik.verejna_cisla %}
<li><a href="{% url 'seminar.cislo' c.id %}">Číslo {{ c.kod }}</a> <li><a href="{{ c.verejne_url }}">Číslo {{ c.kod }}</a>
{% endfor %} {% endfor %}
</ul> </ul>