X-Git-Url: https://git.mdrn.pl/turniej.git/blobdiff_plain/7843514955d006b59619b1c7422f1d2c8d6d3124..96480f028f5d5908774c469ee9cbf38768225464:/apps/poetry/templates/poetry/poet.html

diff --git a/apps/poetry/templates/poetry/poet.html b/apps/poetry/templates/poetry/poet.html
index c8edb2f..7947a66 100644
--- a/apps/poetry/templates/poetry/poet.html
+++ b/apps/poetry/templates/poetry/poet.html
@@ -1,5 +1,4 @@
-{% extends "base.html" %}
-{% load url from future %}
+{% extends "edition1/base.html" %}
 
 
 {% block "extratitle" %}: {{ poet.name }}{% endblock %}
@@ -8,7 +7,7 @@
 {% block "body" %}
 
 <h1>
-<a href='/'><img src="{{ STATIC_URL }}img/turniej-maly.png" style='float:left; margin-right: 10px; margin-top: -13px' /></a>
+<a href='{% url "e1_main_page" %}'><img src="{{ STATIC_URL }}img/turniej-maly.png" style='float:left; margin-right: 10px; margin-top: -13px' /></a>
 {{ poet.name }}</h1>
 
 <div>
@@ -30,15 +29,26 @@
 
 <p><a href="{% url 'poetry_main' %}">Zobacz wszystkich autorów.</a></p>
 
+<div class="poet-description">
+
 <p>Autor programu: <strong>{{ poet.author }}</strong></p>
 
-<p>{{ poet.description }}</p>
+{{ poet.description|linebreaks }}
 
 <p>Kod źródłowy: <a href="{{ poet.url }}">{{ poet.url }}</a></p>
 
 <a class="tworz" href="{% url 'poetry_new' poet.slug %}">Twórz-że!</a>
 
-<p>Ostatnio opublikowane utwory:</p>
+</div>
+
+<h2>Utwory w konkursie (<a href="{% url 'poetry_contest' %}">zobacz wszystkie</a>)</h2>
+<ul class='plain'>
+{% for poem in in_contest %}
+    <li><a href="{{ poem.get_absolute_url }}">{{ poem }}</a></li>
+{% endfor %}
+</ul>
+
+<h2>Ostatnio opublikowane utwory:</h2>
 <ul class='plain'>
 {% for poem in last %}
     <li><a href="{{ poem.get_absolute_url }}">{{ poem }}</a></li>