Merge branch 'master' into mybranch

diff --combined eventos/templates/eventos/talk-improve.html
index 0000000,89c9d2a..ffdb648
mode 000000,100644..100644
--- /dev/null
--- 2/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 %}

diff --combined eventos/views.py
index 6103045,36c0004..e52fb1d
--- 1/eventos/views.py
--- 2/eventos/views.py
+++ b/eventos/views.py
@@@ -27,7 -27,6 +27,7 @@@ from django.template import RequestCont
  from eventos.models import Palestrante, Trabalho, TipoTrabalho, Trilha, Evento, Improve
  from eventos.forms import RegisterSpeaker
  from django.db.models import Q
 +import smtplib
  
  forbidden = \
      HttpResponseForbidden('<h2>You are not allowed to do this action.<h2>')
@@@ -143,12 -142,12 +143,12 @@@ def speaker_details(request, lid)
      speaker = get_object_or_404(Palestrante, pk=lid)
      d = {'speaker' : speaker}
      if not hasattr(request.user, 'palestrante_set'):
-         return render_to_response('eventos/speaker-details2.html', Context(d),
+         return render_to_response('eventos/speaker-view.html', Context(d),
                                    context_instance=RequestContext(request))
  
      entity = request.user.palestrante_set.get()
      if entity.id != int(lid):
-         return render_to_response('eventos/speaker-details2.html', Context(d),
+         return render_to_response('eventos/speaker-view.html', Context(d),
                                    context_instance=RequestContext(request))
  
      form = SpeakerForm(request.POST or None, instance=entity)
@@@ -307,8 -306,7 +307,8 @@@ def talk_improve(request, tid)
          return forbidden
  
      talk = get_object_or_404(Trabalho, pk=tid)
 -    speaker = talk.palestrante
 +    speakers = [i for i in talk.outros_palestrantes.all()]
 +    speakers = [ talk.palestrante ] + speakers
      improve = Improve.objects.filter(trabalho=talk)
  
      # building the form
@@@ -323,24 -321,12 +323,24 @@@
          if cleaned['trabalho'].evento.id != event.id:
              return forbidden
  
 +        emails = [i.email for i in speakers]
 +        user = cleaned['usuario'].get_full_name()
 +        comments = cleaned['comentario']
 +        msg = (u"From: emsl@minaslivre.org\r\nTo: %s\r\n"
 +               u"Subject: Comentário em seu Trabalho EMSL 2008\r\n"
 +               u"Content-Type: text/plain; charset=utf-8\r\n"
 +               u"\r\n %s comentou seu trabalho.\r\n%s\r\r\n"
 +               % (", ".join(emails), user, comments))
 +        smtp = smtplib.SMTP("localhost")
 +        smtp.sendmail("emsl@minaslivre.org", emails, str(msg.encode("utf8")))
 +        smtp.quit()
 +
          instance = form.save()
          return HttpResponseRedirect('/improve/%d/' % talk.id)
  
      c = {'talk': talk, 'form': form, 'improve': improve,
-          'len_comments': len(improve), 'speakers': speakers}
-     return render_to_response('eventos/talk_improve.html', Context(c),
+          'len_comments': len(improve), 'speaker': speaker}
+     return render_to_response('eventos/talk-improve.html', Context(c),
                                context_instance=RequestContext(request))
  
  def subscribe(request):