Merge branch 'master' into mybranch

[cascardo/ema.git] / eventos / views.py

diff --git a/eventos/views.py b/eventos/views.py
index 6103045..e52fb1d 100644 (file)
--- a/eventos/views.py
+++ b/eventos/views.py
@@ -143,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)
@@ -339,8 +339,8 @@ def talk_improve(request, tid):
         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):