speaker: remove fake data and add related presentation info

Author: Kátia Nakamura

pyconbalkan/core/views.py

@@ -27,7 +27,7 @@ def home(request):
         'partners': partners,
         'count_down': count_down.first() if count_down else None,
         'mission_statement': mission_statement.first() if mission_statement else None,
-        #'meta': conference.first().as_meta(),
+        'meta': conference.first().as_meta(),
     }
     return render(request, 'home.html', context)
 

pyconbalkan/speaker/templates/speaker.html

@@ -11,9 +11,16 @@
 
         <div class="speaker__details">
             <h1>
+                {% if speaker.keynote %}<i class="fas fa-star"></i>{% endif %}
                 {{ speaker.name }}
                 {% if speaker.country %}<i class="flag em em-flag-{{ speaker.country.code|lower }}"></i>{% endif %}
             </h1>
+
+            <h2><i class="fas fa-laptop-code"></i> {{ speaker.job }} - {{ speaker.company }}</h2>
+            <p class="speaker__description title--white">
+                {{ speaker.description|safe }}
+            </p>
+
             <div class="social__links">
                 {% if speaker.personal_website %}
                 <a href="{{ speaker.personal_website }}" class="website" target="_ blank"></a>
@@ -31,26 +38,13 @@ <h1>
                     <a href="{{ speaker.facebook }}" class="facebook" target="_ blank"></a>
                 {% endif %}
             </div>
-            <h2><i class="fas fa-laptop-code"></i> {{ speaker.job }} - {{ speaker.company }}</h2>
-            <p class="speaker__description title--white">
-                {{ speaker.description|safe }}
-            </p>
-
-            <!-- Fake text - Details of the talk needed here from schedule model -->
-            <h2><i class="fas fa-bullhorn"></i> Title of the talk:  "Great benefits of learning Python language in 2018"</h2>
-            <p class="speaker__description title--white">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras porttitor sit amet erat vitae venenatis.
-                Sed pretium leo non enim rhoncus, vel blandit dolor convallis. In non arcu accumsan ligula sagittis pellentesque.
-                In dignissim metus eu efficitur gravida. Vestibulum placerat a quam sed tincidunt.
-                Aliquam vestibulum velit ac lacus iaculis imperdiet. Mauris vel quam dui.
-                Nulla ut scelerisque arcu, sit amet imperdiet nulla.
-            </p>
-            <ul style="margin-left: 20px">
-                <li>Vestibulum placerat a quam sed tincidunt.</li>
-                <li>Nulla ut scelerisque arcu, sit amet imperdiet nulla.</li>
-                <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
-            </ul>
 
+            {% for presentation in speaker.presentation.all %}
+                <h2><i class="fas fa-bullhorn"></i> {{ presentation.title }}</h2>
+                <p class="speaker__description title--white">
+                    {{ presentation.description|safe }}
+                </p>
+            {% endfor %}
         </div>
     </div>
 

pyconbalkan/speaker/templates/speakers.html

@@ -4,7 +4,7 @@
 
 {# Speakers #}
 
-    <h1 class="centered">Speakers at PyCon Balkan, Belgrade 2018</h1>
+    <h1 class="centered">Speakers</h1>
     <hr class="line line__centered">
 
     {% if speakers %}
@@ -18,34 +18,20 @@ <h1 class="centered">Speakers at PyCon Balkan, Belgrade 2018</h1>
                 </div>
                 <div class="speaker__details">
                     <a href="{% url 'speaker_detail' slug=speaker.slug %}"><h1>
+                        {% if speaker.keynote %}<i class="fas fa-star"></i>{% endif %}
                         {{ speaker.name }}
                         {% if speaker.country %}
                             <i class="flag em em-flag-{{ speaker.country.code|lower }}"></i>
                         {% endif %}
                         , <span class="title-white"> {{ speaker.job }} - {{ speaker.company }}</span>
                     </h1></a>
-                    <h2>Tittle of the talk: "Somethin about python programming language"</h2>
-                    <br>
-                    <a class="button button--yellow" href="{% url 'speaker_detail' slug=speaker.slug %}" role="button">
-                        View more
-                    </a>
-                    <!--<div class="social__links">
-                        {% if speaker.personal_website %}
-                        <a href="{{ speaker.personal_website }}" class="website" target="_ blank"></a>
-                        {% endif %}
-                        {% if speaker.github %}
-                            <a href="{{ speaker.github }}" class="github" target="_ blank"></a>
-                        {% endif %}
-                        {% if speaker.linkedin %}
-                            <a href="{{ speaker.linkedin }}" class="linkedin" target="_ blank"></a>
-                        {% endif %}
-                        {% if speaker.twitter %}
-                            <a href="{{ speaker.twitter }}" class="twitter" target="_ blank"></a>
-                        {% endif %}
-                        {% if speaker.facebook %}
-                            <a href="{{ speaker.facebook }}" class="facebook" target="_ blank"></a>
-                        {% endif %}
-                    </div>-->
+                    {% for presentation in speaker.presentation.all %}
+                        <h2>{{ presentation.title }}</h2>
+                        <br>
+                        <a class="button button--yellow" href="{% url 'speaker_detail' slug=speaker.slug %}" role="button">
+                            View more
+                        </a>
+                    {% endfor %}
                 </div>
             </div>
             <hr class="line long">

pyconbalkan/speaker/views.py

@@ -19,7 +19,7 @@ def speaker_detail(request, slug):
 
 
 def speaker_list(request):
-    speakers = Speaker.objects.filter(keynote=False, active=True)
+    speakers = Speaker.objects.filter(active=True).prefetch_related('presentation')
     context = {
         'speakers': speakers,
     }