Merge pull request #114 from PythonBalkan/bojan_p/speakers_page

Speaker list page

Author: Kátia Nakamura

pyconbalkan/core/static/css/components/person.css

@@ -23,10 +23,10 @@
     .speaker__image,
     .organizer__image,
     .sponsor__image {
-        flex: 0 0 300px;
-        width: 300px;
-        height: 300px;
-        margin: 40px 40px 20px 0;
+        flex: 0 0 200px;
+        width: 200px;
+        height: 200px;
+        margin: 20px 40px 20px 0;
         border-radius: 50%;
         background-color: #28aae1;
         overflow: hidden;

pyconbalkan/core/templates/base.html

@@ -16,8 +16,7 @@
     <link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon-32x32.png' %}">
     <link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon-16x16.png' %}">
     <link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.9/css/all.css" integrity="sha384-5SOiIsAziJl6AWe0HWRKTXlfcSHKmYV4RBF18PPJ173Kzn7jzMyFuTtk8JA7QQG1" crossorigin="anonymous">
-
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
     <!-- Styles -->
     <link rel="stylesheet" href="{% static 'css/_fonts.css' %}">
     <link rel="stylesheet" href="{% static 'css/components/event-sidebar.css' %}">

pyconbalkan/core/templates/includes/header.html

@@ -7,6 +7,9 @@
             <li class="menu__list__item">
                 <a class="menu__list__link {% if request.path == '/' %}active{% endif %}" href="/#" role="button">Home</a>
             </li>
+            <li class="menu__list__item">
+                <a class="menu__list__link {% if request.path == '/speakers' %}active{% endif %}" href="/speakers" role="button">Speakers</a>
+            </li>
             <li class="menu__list__item">
                 <a class="menu__list__link {% if request.path == '/organizers' %}active{% endif %}" href="/organizers" role="button">Organizers</a>
             </li>

pyconbalkan/speaker/templates/speaker.html

@@ -11,13 +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>{{ speaker.job }}</h2>
+
+            <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>
@@ -35,6 +38,13 @@ <h2>{{ speaker.job }}</h2>
                     <a href="{{ speaker.facebook }}" class="facebook" target="_ blank"></a>
                 {% endif %}
             </div>
+
+            {% 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

@@ -0,0 +1,45 @@
+{% extends "base.html" %}
+
+{% block main_content %}
+
+{# Speakers #}
+
+    <h1 class="centered">Speakers</h1>
+    <hr class="line line__centered">
+
+    {% if speakers %}
+        <div class="card">
+            {% for speaker in speakers %}
+            <div class="speaker">
+                <div class="speaker__image">
+                    <a href="{% url 'speaker_detail' slug=speaker.slug %}">
+                        <img src="{{ speaker.images.first.profile_picture.url }}">
+                    </a>
+                </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>
+                    {% 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">
+            {% endfor %}
+        </div>
+    {% else %}
+        <h2>
+            <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
+        </h2>
+    {% endif %}
+{% endblock %}

pyconbalkan/speaker/views.py

@@ -15,4 +15,12 @@ def speaker_detail(request, slug):
     context = {
         'speaker': speaker,
     }
-    return render(request, 'speaker.html', context)
+    return render(request, 'speaker.html', context)
+
+
+def speaker_list(request):
+    speakers = Speaker.objects.filter(active=True).prefetch_related('presentation')
+    context = {
+        'speakers': speakers,
+    }
+    return render(request, 'speakers.html', context)

pyconbalkan/urls.py

@@ -43,6 +43,7 @@
     path('', views.home, name='index'),
     path('speaker/<slug:slug>/', speaker_detail, name='speaker_detail'),
     path('sponsors', sponsors_view, name='sponsor_list'),
+    path('speakers', speaker_list, name='speakers'),
     path('sponsors/<int:id>/', sponsor_view, name='sponsor_detail'),
     path('sponsoring', sponsoring_view, name='sponsoring'),
     path('info', serve, {'path': 'pycon_brochure.pdf', 'document_root': PDF_ROOT}),