Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pyconbalkan/conference/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 2 additions & 0 deletions pyconbalkan/core/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.db import models
from django_countries.fields import CountryField
from markdownx.models import MarkdownxField
from slugify import slugify

Expand All @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions pyconbalkan/core/static/css/components/flag.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
* Flag
* Usually <hr> elements representing a line.
*/

i.flag {
height: 1.0em;
width: 1.0em;
}
2 changes: 2 additions & 0 deletions pyconbalkan/core/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}">
Expand All @@ -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 -->
Expand Down
19 changes: 19 additions & 0 deletions pyconbalkan/organizers/migrations/0013_volunteer_country.py
Original file line number Diff line number Diff line change
@@ -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),
),
]
6 changes: 4 additions & 2 deletions pyconbalkan/organizers/templates/organizer.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions pyconbalkan/organizers/templates/organizers.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down Expand Up @@ -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">
Expand Down
19 changes: 19 additions & 0 deletions pyconbalkan/speaker/migrations/0010_speaker_country.py
Original file line number Diff line number Diff line change
@@ -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),
),
]
7 changes: 5 additions & 2 deletions pyconbalkan/speaker/templates/speaker.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down