fnp / turniej.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 43cf331)
templates fixes
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 15 Nov 2011 13:40:10 +0000 (14:40 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 15 Nov 2011 13:40:10 +0000 (14:40 +0100)
apps/poetry/templates/poetry/main.html patch | blob | history
apps/poetry/templates/poetry/poem.html patch | blob | history
apps/poetry/templates/poetry/poet.html patch | blob | history
turniej/templates/base.html patch | blob | history

diff --git a/apps/poetry/templates/poetry/main.html b/apps/poetry/templates/poetry/main.html
index 9e0ea4d..6e316e4 100644 (file)
--- 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>
 <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>
 <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>
   });
 </script>
 </div>
-{% endcomment %}
+
 <h2>Uczestnicy:</h2>
 <ul class='poet-list'>
 {% for poet in poets %}
 <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 (file)
--- a/apps/poetry/templates/poetry/poem.html
+++ b/apps/poetry/templates/poetry/poem.html
@@ -2,7 +2,7 @@
 <!doctype html>
 <html>
 <head>
 <!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" />
     <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 (file)
--- 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 %}
 
 {% extends "base.html" %}
 {% load url from future %}
 
+
+{% block "extratitle" %}: {{ poet.name }}{% endblock %}
+
+
 {% block "body" %}
 
 <h1>
 {% block "body" %}
 
 <h1>
diff --git a/turniej/templates/base.html b/turniej/templates/base.html
index 4b28f18..e66d03d 100644 (file)
--- a/turniej/templates/base.html
+++ b/turniej/templates/base.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
 <!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" />
     <meta charset="utf-8" />
 
     <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />