From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Date: Fri, 7 Nov 2008 21:46:52 +0000 (-0200)
Subject: Merge branch 'master' into mybranch
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fema.git;a=commitdiff_plain;h=89ac8daa7f099aef26e364f7137c5577c6758443

Merge branch 'master' into mybranch
---

89ac8daa7f099aef26e364f7137c5577c6758443
diff --cc eventos/templates/eventos/talk-improve.html
index 0000000,89c9d2a..ffdb648
mode 000000,100644..100644
--- a/eventos/templates/eventos/talk-improve.html
+++ b/eventos/templates/eventos/talk-improve.html
@@@ -1,0 -1,45 +1,47 @@@
+ {% extends "base.html" %}
+ 
+ {% block content %}
+ <h2>Aprimorar Trabalho: {{ talk.titulo }}</h2>
+ 
++{% for speaker in speakers %}
+ <div><strong>Palestrante:</strong> <a href="/speaker/{{ speaker.id }}">{{ speaker.nome }}</a></div>
++{% endfor %}
+ <div><strong>trilha:</strong> {{ talk.trilha }}</div>
+ <div><strong>Tipo:</strong> {{ talk.tipo }}</div>
+ <div><strong>Descricao curta:</strong> {{ talk.descricao_curta}}</div>
+ <div><strong>Descricao longa:</strong> {{ talk.descricao_longa }}</div>
+ 
+ {% if improve %}
+ <br /><br />
+ <strong>{{ len_comments }} COMENTÁRIO(S)</strong>
+ {% endif %}
+ 
+ <ul id="comment-list">
+ {% for i in improve  %}
+     <li class="{% cycle 'odd' 'even' %}">
+       <span>Postado por {{ i.usuario }}</span>
+       <em>({{ i.pub_date|date:"d/m/Y" }})</em>
+       <br />
+ 
+       {{ i.comentario }}
+     </li>
+ {% endfor %}
+ </ul>
+ 
+ {% if user.is_authenticated %}
+ 
+ <form id="improve-add" method="post" action="./">
+   {{ form.as_p }}
+   <input type="submit" value="Comentar" />
+ </form>
+ 
+ {% else %}
+ 
+ <strong>
+   Por favor, <a href="/subscribe/">cadastre-se</a> para deixar seu
+   comentário.
+ </strong>
+ 
+ {% endif %}
+ 
+ {% endblock %}