Merge pull request #108 from PythonBalkan/katia/add-country-person

core: add country to person model and flag to the templates

Author: Kátia Nakamura

pyconbalkan/conference/templates/home.html

@@ -61,6 +61,9 @@ <h1 class="centered">Keynote Speakers</h1>
                         </div>
                         <h2 class="centered">
                             {{ keynote.name }}
+                            {% if keynote.country %}
+                                <i class="flag em em-flag-{{ keynote.country.code|lower }}"></i>
+                            {% endif %}
                         </h2>
                     </a>
                     <p class="card__job">

pyconbalkan/core/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django_countries.fields import CountryField
 from markdownx.models import MarkdownxField
 from slugify import slugify
 
@@ -18,6 +19,7 @@ class Person(models.Model):
     slug = models.CharField(unique=True, blank=True, max_length=100)
     description = MarkdownxField(blank=True, default='')
     email = models.EmailField(blank=True, null=True)
+    country = CountryField(null=True, blank=True)
 
     def save(self, *args, **kwargs):
         if not self.slug:

pyconbalkan/core/static/css/components/flag.css

@@ -0,0 +1,9 @@
+/*
+ * Flag
+ * Usually <hr> elements representing a line.
+ */
+
+i.flag {
+    height: 1.0em;
+    width: 1.0em;
+}

pyconbalkan/core/templates/base.html

@@ -29,6 +29,7 @@
     <link rel="stylesheet" href="{% static 'css/components/person.css' %}">
     <link rel="stylesheet" href="{% static 'css/components/countdown.css' %}">
     <link rel="stylesheet" href="{% static 'css/components/featured-letter.css' %}">
+    <link rel="stylesheet" href="{% static 'css/components/flag.css' %}">
     <link rel="stylesheet" href="{% static 'css/components/form.css' %}">
     <link rel="stylesheet" href="{% static 'css/components/line.css' %}">
     <link rel="stylesheet" href="{% static 'css/components/long-text.css' %}">
@@ -40,6 +41,7 @@
     <link rel="stylesheet" href="{% static 'css/components/timetable.css' %}">
     <link rel="stylesheet" href="{% static 'css/helpers/spacing.css' %}">
     <link rel="stylesheet" href="{% static 'css/main.css' %}">
+    <link rel="stylesheet" href="https://afeld.github.io/emoji-css/emoji.css">
 
     <!-- Timer JS -->
     <!-- Set the date we're counting down to -->

pyconbalkan/organizers/migrations/0013_volunteer_country.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.0.5 on 2018-08-03 15:06
+
+from django.db import migrations
+import django_countries.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organizers', '0012_auto_20180801_2318'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='volunteer',
+            name='country',
+            field=django_countries.fields.CountryField(blank=True, max_length=2, null=True),
+        ),
+    ]

pyconbalkan/organizers/templates/organizer.html

@@ -7,10 +7,12 @@
     <div class="organizer">
         <div class="organizer__image">
             <img src="{{ organizer.images.first.profile_picture.url }}">
-
         </div>
         <div class="organizer__details">
-            <h1 class="title organizer__title title--yellow">{{ organizer.name }}</h1>
+            <h1 class="title organizer__title title--yellow">
+                {{ organizer.name }}
+                {% if organizer.country %}<i class="flag em em-flag-{{ organizer.country.code|lower }}"></i>{% endif %}
+            </h1>
             <h2 class="organizer__job title--blue">
                 {{ organizer.job }}
             </h2>

pyconbalkan/organizers/templates/organizers.html

@@ -17,6 +17,9 @@ <h1 class="centered">Organizers</h1>
                         </div>
                         <h2 class="card__name title--blue">
                             {{ organizer.name }}
+                            {% if organizer.country %}
+                                <i class="flag em em-flag-{{ organizer.country.code|lower }}"></i>
+                            {% endif %}
                         </h2>
                     </a>
                     {% if organizer.job %}
@@ -49,6 +52,9 @@ <h1 class="centered">Volunteers</h1>
                     </div>
                     <h2 class="card__name title--blue">
                         {{ volunteer.name }}
+                        {% if volunteer.country %}
+                            <i class="flag em em-flag-{{ volunteer.country.code|lower }}"></i>
+                        {% endif %}
                     </h2>
                     {% if volunteer.job %}
                         <p class="card__job">

pyconbalkan/speaker/migrations/0010_speaker_country.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.0.5 on 2018-08-03 15:06
+
+from django.db import migrations
+import django_countries.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('speaker', '0009_auto_20180801_2318'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='speaker',
+            name='country',
+            field=django_countries.fields.CountryField(blank=True, max_length=2, null=True),
+        ),
+    ]

pyconbalkan/speaker/templates/speaker.html

@@ -7,10 +7,13 @@
     <div class="speaker">
         <div class="speaker__image">
             <img src="{{ speaker.images.first.profile_picture.url }}">
-
         </div>
+
         <div class="speaker__details">
-            <h1>{{ speaker.name }}</h1>
+            <h1>
+                {{ speaker.name }}
+                {% if speaker.country %}<i class="flag em em-flag-{{ speaker.country.code|lower }}"></i>{% endif %}
+            </h1>
             <h2>{{ speaker.job }}</h2>
             <p class="speaker__description title--white">
                 {{ speaker.description|safe }}