From 0a0fa11efc7f118fe28e30ecbc7eee66aae1dbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= <matej.kocian@gmail.com>
Date: Sun, 13 Sep 2015 22:18:04 +0200
Subject: [PATCH] =?UTF-8?q?Zm=C4=9Bny=20organiz=C3=A1tor=C5=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* nezobrazovat rok, když nevíme (Hroch)
* fotky vycentrované v levém sloupci
---
 mamweb/static/css/mamweb.css                        |  5 +++++
 seminar/templates/seminar/cojemam/organizatori.html | 13 +++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css
index 81078459..0e289f3a 100644
--- a/mamweb/static/css/mamweb.css
+++ b/mamweb/static/css/mamweb.css
@@ -236,6 +236,11 @@ div.zadani_azad_termin {
 	float: right;
 }
 
+.foto_org {
+    width: 250px;
+    text-align: center;
+}
+
 @media (max-width: 991px) {
 	#header {
 		height: 196px;
diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html
index e6d5e001..41b1ea20 100644
--- a/seminar/templates/seminar/cojemam/organizatori.html
+++ b/seminar/templates/seminar/cojemam/organizatori.html
@@ -34,21 +34,22 @@
     <table>
     <tr>
     <td>
-    {% if org.foto %}
     <div class="foto_org">
+    {% if org.foto %}
       {# <img src="{{org.foto.url}}" height="{{org.foto.height}}"> #}
-      <a href="{{org.foto.url}}"><img src="{{org.foto_male.url}}" height="{{org.foto_male.height}}" alt="{{org.first_name}} {{org.last_name}}"></a>
-    </div>
+      <a href="{{org.foto.url}}"><img src="{{org.foto_male.url}}" height="{{org.foto_male.height}}" alt="{{org.user.first_name}} {{org.user.last_name}}"></a>
     {% endif %}
+    </div>
     </td>
     <td>
     <ul>
         <li>
           {% if aktivni %}
-            Organizuje od roku {{org.organizuje_od_roku}}
+            {% if org.organizuje_od_roku %}
+              Organizuje od roku {{org.organizuje_od_roku}}
+            {% endif %}
           {% else %}
-            {#TODO časovat dle rodu #}
-            Organizoval v letech {{org.organizuje_od_roku}}&ndash;{{org.organizuje_do_roku}}
+            Aktivní v letech {{org.organizuje_od_roku | default:"?" }}&ndash;{{org.organizuje_do_roku | default:"?" }}
           {% endif %}
       {% if org.studuje %}
         <li>Studuje: {{org.studuje}}