diff --git a/pyconbalkan/conference/templates/home.html b/pyconbalkan/conference/templates/home.html index a55488f3..40220d0f 100644 --- a/pyconbalkan/conference/templates/home.html +++ b/pyconbalkan/conference/templates/home.html @@ -61,6 +61,9 @@
diff --git a/pyconbalkan/core/models.py b/pyconbalkan/core/models.py index b50b69f3..18d74100 100644 --- a/pyconbalkan/core/models.py +++ b/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: diff --git a/pyconbalkan/core/static/css/components/flag.css b/pyconbalkan/core/static/css/components/flag.css new file mode 100644 index 00000000..3474f9a2 --- /dev/null +++ b/pyconbalkan/core/static/css/components/flag.css @@ -0,0 +1,9 @@ +/* + * Flag + * Usually
diff --git a/pyconbalkan/speaker/migrations/0010_speaker_country.py b/pyconbalkan/speaker/migrations/0010_speaker_country.py new file mode 100644 index 00000000..2162703c --- /dev/null +++ b/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), + ), + ] diff --git a/pyconbalkan/speaker/templates/speaker.html b/pyconbalkan/speaker/templates/speaker.html index 871ac182..82420644 100644 --- a/pyconbalkan/speaker/templates/speaker.html +++ b/pyconbalkan/speaker/templates/speaker.html @@ -7,10 +7,13 @@
{{ speaker.description|safe }}