From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Tue, 15 Nov 2011 13:40:10 +0000 (+0100)
Subject: templates fixes
X-Git-Url: https://git.mdrn.pl/turniej.git/commitdiff_plain/7843514955d006b59619b1c7422f1d2c8d6d3124?ds=sidebyside;hp=43cf331626ab12c2f76d19c0c545b0a0ae685db6
templates fixes
---
diff --git a/apps/poetry/templates/poetry/main.html b/apps/poetry/templates/poetry/main.html
index 9e0ea4d..6e316e4 100644
--- a/apps/poetry/templates/poetry/main.html
+++ b/apps/poetry/templates/poetry/main.html
@@ -6,7 +6,7 @@
<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</h1>
-{% comment %}
+
<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>
@@ -23,7 +23,7 @@ Turniej ElektrybaÅtów</h1>
});
</script>
</div>
-{% endcomment %}
+
<h2>Uczestnicy:</h2>
<ul class='poet-list'>
{% for poet in poets %}
diff --git a/apps/poetry/templates/poetry/poem.html b/apps/poetry/templates/poetry/poem.html
index 55bf749..b6b0ab7 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 }}</title>
+ <title>Turniej ElektrybaÅtów: {{ poem.poet.name }}, {% if poem.title %}{{ poem.title }}{% else %}***{% endif %}</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 68ffaad..c8edb2f 100644
--- a/apps/poetry/templates/poetry/poet.html
+++ b/apps/poetry/templates/poetry/poet.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{% load url from future %}
+
+{% block "extratitle" %}: {{ poet.name }}{% endblock %}
+
+
{% block "body" %}
<h1>
diff --git a/turniej/templates/base.html b/turniej/templates/base.html
index 4b28f18..e66d03d 100644
--- a/turniej/templates/base.html
+++ b/turniej/templates/base.html
@@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
- <title>Turniej ElektrybaÅtów</title>
+ <title>Turniej ElektrybaÅtów{% block "extratitle" %}{% endblock %}</title>
<meta charset="utf-8" />
<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />