From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Thu, 3 Jan 2013 13:21:12 +0000 (+0100)
Subject: forgotten stuff
X-Git-Url: https://git.mdrn.pl/turniej.git/commitdiff_plain/db566020a374d0e81e8274ab0e5ba8061f8903ad?ds=sidebyside

forgotten stuff
---

diff --git a/apps/poetry/models.py b/apps/poetry/models.py
index ef8bf94..63bf8f2 100644
--- a/apps/poetry/models.py
+++ b/apps/poetry/models.py
@@ -53,6 +53,9 @@ class Poet(models.Model):
             p.save()
         return self.poem_set.filter(for_contest=True)
 
+    def contest_poems(self):
+        return self.poem_set.filter(in_contest=True)
+
 
 class Poem(models.Model):
     slug = models.SlugField(max_length=50, db_index=True)
@@ -68,8 +71,7 @@ class Poem(models.Model):
 
     def __unicode__(self):
         oneliner = u"%s, %s" % (self.poet.name, self.pretty_title())
-        if not self.title:
-            oneliner += u" [%sâ¦]" % self.text[:20]
+        oneliner += u" [%sâ¦]" % (u" ".join(self.text.split()[:5]))
         return oneliner
 
     def get_absolute_url(self):
diff --git a/apps/poetry/templates/poetry/contest.html b/apps/poetry/templates/poetry/contest.html
new file mode 100644
index 0000000..9f153b9
--- /dev/null
+++ b/apps/poetry/templates/poetry/contest.html
@@ -0,0 +1,39 @@
+{% extends "base.html" %}
+{% load url from future %}
+
+{% block "body" %}
+
+<h1>
+<a href='/'><img src="{{ STATIC_URL }}img/turniej-maly.png" style='float:left; margin-right: 10px; margin-top: -13px' /></a>
+Turniej ElektrybaÅtÃ³w: utwory wybrane do konkursu</h1>
+
+<div class="social">
+<span style="position:relative; top: -5px;" >
+    <div class="fb-like" data-href="http://turniej.wolnelektury.pl" data-send="false" data-layout="button_count" data-width="150" data-show-faces="false"></div>
+</span>
+<g:plusone annotation="bubble" href="http://turniej.wolnelektury.pl"></g:plusone>
+<script>
+  new nk_fajne({
+    url: "http://turniej.wolnelektury.pl",
+    type: 4,
+    color: 0,
+    title: "Turniej ElektrybaÅtÃ³w",
+    image: "http://turniej.wolnelektury.pl/turniej.png",
+    description: "Turniej ElektrybaÅtÃ³w - otwarty konkurs na najlepszego automatycznego poetÄ."
+  });
+</script>
+</div>
+
+<div style='clear: both'></div>
+
+{% for poet in poets %}
+    <h2><a href="{{ poet.get_absolute_url }}">{{ poet }}</a></h2>
+    <ul class='plain'>
+    {% for poem in poet.contest_poems %}
+        <li><a href="{{ poem.get_absolute_url }}">{{ poem }}</a></li>
+    {% endfor %}
+    </ul>
+{% endfor %}
+</ul>
+
+{% endblock %}
diff --git a/apps/poetry/templates/poetry/main.html b/apps/poetry/templates/poetry/main.html
index 6e316e4..7d4c91d 100644
--- a/apps/poetry/templates/poetry/main.html
+++ b/apps/poetry/templates/poetry/main.html
@@ -36,6 +36,15 @@ Turniej ElektrybaÅtÃ³w</h1>
 
 <a class='tworz' href="{% url 'poetry_new' %}">TwÃ³rz-Å¼e siÄ!</a>
 
+<h2><a href="{% url 'poetry_contest' %}">Utwory do konkursu zostaÅy wybrane!</a></h2>
+
+<p>SpoÅrÃ³d wygenerowanych przz nas propozycji autorzy programÃ³w wybrali po trzy utwory.</p>
+<p><a href="{% url 'poetry_contest' %}">Zobacz wiersze startujÄce w konkursie!</a></p>
+</p>
+
+
+
+
 <h2>Ostatnio opublikowane utwory:</h2>
 <ul class='plain'>
 {% for poem in last %}
diff --git a/apps/poetry/templates/poetry/poem.html b/apps/poetry/templates/poetry/poem.html
index f6a13e2..a98c170 100644
--- a/apps/poetry/templates/poetry/poem.html
+++ b/apps/poetry/templates/poetry/poem.html
@@ -2,7 +2,7 @@
 <!doctype html>
 <html>
 <head>
-    <title>Turniej ElektrybaÅtÃ³w: {{ poem.poet.name }}, {% if poem.title %}{{ poem.title }}{% else %}***{% endif %}</title>
+    <title>Turniej ElektrybaÅtÃ³w: {{ poem }}</title>
     <meta charset="utf-8" />
 
     <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
diff --git a/apps/poetry/templates/poetry/poet.html b/apps/poetry/templates/poetry/poet.html
index c8edb2f..a273779 100644
--- a/apps/poetry/templates/poetry/poet.html
+++ b/apps/poetry/templates/poetry/poet.html
@@ -30,15 +30,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>
diff --git a/apps/poetry/urls.py b/apps/poetry/urls.py
index 8d0baeb..40bef6d 100644
--- a/apps/poetry/urls.py
+++ b/apps/poetry/urls.py
@@ -5,6 +5,7 @@ urlpatterns = patterns('poetry.views',
 
     url(r"^$", "main", name="poetry_main"),
     url(r"^nowy/$", 'new', name="poetry_new"),
+    url(r"^konkurs/$", 'contest', name="poetry_contest"),
     url(r"^(?P<slug>[a-zA-Z0-9-]+)/$", "poet", name="poetry_poet"),
     url(r"^(?P<slug>[a-zA-Z0-9-]+)/nowy/$", 'new', name="poetry_new"),
 
diff --git a/apps/poetry/views.py b/apps/poetry/views.py
index 06c95a2..71309d7 100644
--- a/apps/poetry/views.py
+++ b/apps/poetry/views.py
@@ -20,6 +20,7 @@ def poem(request, slug):
 def poet(request, slug):
     poet = get_object_or_404(Poet, slug=slug)
     last = poet.poem_set.order_by('-created_at')[:20]
+    in_contest = poet.poem_set.filter(in_contest=True).order_by('created_at')
     return render(request, "poetry/poet.html", locals())
 
 
@@ -27,3 +28,9 @@ def main(request):
     poets = Poet.objects.all().order_by('?')
     last = Poem.objects.all().order_by('-created_at')[:20]
     return render(request, "poetry/main.html", locals())
+
+
+def contest(request):
+    poets = Poet.objects.all().order_by('?')
+    return render(request, "poetry/contest.html", locals())
+
diff --git a/turniej/static/style.css b/turniej/static/style.css
index f26fe8e..2f775f4 100644
--- a/turniej/static/style.css
+++ b/turniej/static/style.css
@@ -75,6 +75,9 @@ li {
     margin: 30px 13px;
     vertical-align: middle;
 }
+#footer a:hover {
+    border: none;
+}
 
 
 blockquote {
@@ -146,3 +149,8 @@ blockquote p {
 .poet-list li:before {
   content: "Â» ";
 }
+
+.poet-description {
+    max-width: 60em;
+}
+
diff --git a/turniej/templates/home.html b/turniej/templates/home.html
index 5c1f02c..ebf7a5f 100644
--- a/turniej/templates/home.html
+++ b/turniej/templates/home.html
@@ -8,7 +8,7 @@
 <h2>Ostatnie wiersze:</h2>
 <ul class="last">
 {% for poem in last %}
-    <li><a href="{{ poem.get_absolute_url }}">{{ poem }}</a></li>
+    <li><a href="{{ poem.get_absolute_url }}">{{ poem.poet.name}}, {{ poem.pretty_title }}</a><br/>{{ poem.text|truncatewords:5 }}</li>
 {% endfor %}    
 </ul>
 
@@ -36,6 +36,14 @@
 </div>
 
 
+<div class="uwaga">
+<p>Konkurs zostaÅ rozstrzygniÄty! ZakoÅczenie odbyÅo siÄ podczas <a href='http://domenapubliczna.org'>Dnia Domeny Publicznej 2012</a>.</p>
+
+<p>ZwyciÄzcÄ zostaÅ <a href='/poezja/centonista/'><strong>Centonista</strong></a>. Gratulujemy!</p>
+
+<p>Dodatkowo, <a href='/poezja/ala/'>AÅa!</a> otrzymaÅ wyrÃ³Å¼nienie.</p>
+</div>
+
 <p>Znacie <a href="http://www.wolnelektury.pl/lesmianator/">LeÅmianatora</a>?
 To niewielki skrypt miksujÄcy na Å¼yczenie wiersze z
 <a href="http://www.wolnelektury.pl">Wolnych Lektur</a>.
@@ -57,6 +65,9 @@ z <a href="{% url 'poetry_main' %}">programÃ³w-uczestnikÃ³w</a> napisze dla Cieb
 <a href="https://github.com/turniej">jest dostÄpny</a> na wolnej licencji
 â nic wiÄc nie stoi na przeszkodzie, by rozwijaÄ je dalej.</p>
 
+<p>SpoÅrÃ³d wygenerowanych przz nas propozycji autorzy programÃ³w wybrali po trzy utwory.
+<a href="{% url 'poetry_contest' %}">Zobacz wiersze, ktÃ³re wystartowaÅy w konkursie.</a></p>
+
 <p>Do zabawy zapraszamy wszystkich â i tych, ktÃ³rzy Åwietnie programujÄ, i tych, ktÃ³rzy
 programowaÄ dopiero siÄ uczÄ. Tych, ktÃ³rzy nie rozstajÄ siÄ z tomikiem
 wierszy, i tych, ktÃ³rzy na ten widok dostajÄ gÄsiej skÃ³rki. Chcemy wybraÄ
