Merge branch 'master' into mybranch

diff --git a/eventos/templates/eventos/speaker-details2.html b/eventos/templates/eventos/speaker-details2.html
deleted file mode 100644 (file)
index 9b72a49..0000000
--- a/eventos/templates/eventos/speaker-details2.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-<h2>Palestrante: {{ speaker.nome }}</h2>
-
-<span>Instituição: {{ speaker.instituicao }}</span> <br />
-<span>Mini-Currículo: {{ speaker.minicurriculo }}</span> <br />
-<span>Currículo: {{ speaker.curriculo }}</span> <br />
-
-{% endblock %}

diff --git a/eventos/templates/eventos/speaker-view.html b/eventos/templates/eventos/speaker-view.html
new file mode 100644 (file)
index 0000000..9b72a49
--- /dev/null
+++ b/eventos/templates/eventos/speaker-view.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h2>Palestrante: {{ speaker.nome }}</h2>
+
+<span>Instituição: {{ speaker.instituicao }}</span> <br />
+<span>Mini-Currículo: {{ speaker.minicurriculo }}</span> <br />
+<span>Currículo: {{ speaker.curriculo }}</span> <br />
+
+{% endblock %}

diff --git a/eventos/templates/eventos/talk-improve.html b/eventos/templates/eventos/talk-improve.html
new file mode 100644 (file)
index 0000000..ffdb648
--- /dev/null
+++ b/eventos/templates/eventos/talk-improve.html
@@ -0,0 +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 --git a/eventos/templates/eventos/talk_improve.html b/eventos/templates/eventos/talk_improve.html
deleted file mode 100644 (file)
index ffdb648..0000000
--- a/eventos/templates/eventos/talk_improve.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% 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 --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):