Skip to content

Commit efb8d4e

Browse files
BojPavKátia Nakamura
authored andcommitted
Bojan p/info page (#118)
* info page - under construction * small design changed; images for info page * Email soical icon svg [fix] * Info added * info page --> travel section * Organizers & CoC update for About us * organizers added to about us page * go to top button on info page * [Speakers info] Icon for workshops * robot.txt updated - allow indexing * robots.txt file updated * about: add joinn as a voluteer button in template
1 parent b3746b6 commit efb8d4e

File tree

26 files changed

+570
-26
lines changed

26 files changed

+570
-26
lines changed
Lines changed: 100 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,117 @@
11
{% extends "base.html" %}
22

3+
{% load static %}
4+
35
{% block main_content %}
46

5-
{# About #}
7+
{# About #}
68

79
{% if about %}
810
<h1 class="title title--yellow mb-xs-20">{{ about.title|safe }}</h1>
9-
<hr class="line line--blue line--short line--spaced">
11+
<hr class="line line--blue line--short line--spaced">
12+
<p>
13+
{{ about.description|safe }}
14+
</p>
15+
{% else %}
16+
<h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
17+
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
18+
</h2>
19+
{% endif %}
20+
21+
{# Organizers #}
22+
23+
<h1 class="title title--yellow mb-xs-20">Organizers</h1>
24+
<hr class="line line--blue line--short line--spaced">
25+
26+
{% if organizers %}
27+
<div class="card">
28+
{% for organizer in organizers %}
29+
<div class="card__item">
30+
<a href="{% url 'organizer_detail' slug=organizer.slug %}">
31+
<div class="card__image">
32+
<img src="{{ organizer.images.first.profile_picture.url }}">
33+
</div>
34+
<h2 class="card__name title--blue">
35+
{{ organizer.name }}
36+
{% if organizer.country %}
37+
<i class="flag em em-flag-{{ organizer.country.code|lower }}"></i>
38+
{% endif %}
39+
</h2>
40+
</a>
41+
{% if organizer.job %}
42+
<p class="card__job">
43+
{{ organizer.job }}
44+
</p>
45+
{% endif %}
46+
</div>
47+
{% endfor %}
48+
</div>
49+
{% else %}
50+
<h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
51+
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
52+
</h2>
53+
{% endif %}
54+
55+
<hr class="line long">
56+
57+
{# Volunteers #}
58+
59+
<h1 class="centered">Volunteers</h1>
60+
<hr class="line line__centered">
61+
62+
<div class="card">
63+
<a class="button button--yellow mb-xs-40 event-button" href="https://docs.google.com/forms/d/e/1FAIpQLSdJO6rP5jtHvpioYWMoimIRaQx-W7TR3uLmeu-hFg-ad4ZpgA/viewform" target="_blank">
64+
Join PyCon Balkan as a Volunteer!
65+
</a>
66+
</div>
67+
68+
{% if volunteers %}
69+
<div class="card">
70+
{% for volunteer in volunteers %}
71+
<div class="card__item">
72+
<div class="card__image">
73+
<img src="{{ volunteer.images.first.profile_picture.url }}">
74+
</div>
75+
<h2 class="card__name title--blue">
76+
{{ volunteer.name }}
77+
{% if volunteer.country %}
78+
<i class="flag em em-flag-{{ volunteer.country.code|lower }}"></i>
79+
{% endif %}
80+
</h2>
81+
{% if volunteer.job %}
82+
<p class="card__job">
83+
{{ volunteer.job }}
84+
</p>
85+
{% endif %}
86+
</div>
87+
{% endfor %}
88+
</div>
89+
{% else %}
90+
<h2 class="title title--white title--medium title--uppercase mt-xs-20">
91+
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
92+
</h2>
93+
{% endif %}
94+
95+
{# Code of Conduct #}
96+
97+
{% if coc %}
98+
<h1 class="title title--yellow mb-xs-20">{{ coc.title|safe }}</h1>
99+
<hr class="line line--blue line--short line--spaced">
10100

11101
<div class="long-text">
12-
{{ about.description|safe }}
102+
{{ coc.description|safe }}
13103
</div>
14104
{% else %}
15105
<h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
16106
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
17107
</h2>
18108
{% endif %}
19109

110+
111+
{% if response_guide %}
112+
<a href="{% url 'response_guide' slug=response_guide.slug %}">
113+
<h1>{{ response_guide.title|safe }}</h1>
114+
</a>
115+
{% endif %}
116+
20117
{% endblock %}

pyconbalkan/about/views.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
from pyconbalkan.about.models import About
55
from pyconbalkan.about.serializers import AboutSerializer
6+
from pyconbalkan.coc.views import coc_list
7+
from pyconbalkan.organizers.views import organizers_list
68

79

810
class AboutViewSet(viewsets.ModelViewSet):
@@ -15,4 +17,10 @@ def about_view(request):
1517
context = {
1618
'about': about.first() if about else None,
1719
}
20+
21+
organizers_context = organizers_list(request)
22+
coc_context = coc_list(request)
23+
context.update(coc_context)
24+
context.update(organizers_context)
25+
1826
return render(request, 'about.html', context)

pyconbalkan/coc/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ class CodeOfConductViewSet(viewsets.ModelViewSet):
1010
serializer_class = CodeOfConductSerializer
1111

1212

13-
def coc_view(request):
13+
def coc_list(request):
1414
coc = CodeOfConduct.objects.filter(active=True)
1515
r_guide = ResponseGuide.objects.filter(active=True)
1616
context = {
1717
'coc': coc.first() if coc else None,
1818
'response_guide': r_guide.first() if r_guide else None,
1919
}
20-
return render(request, 'coc.html', context)
20+
return context
2121

2222

2323
def response_guide(request, slug):

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@
3838
.organizer__image,
3939
.sponsor__image {
4040
margin: 0;
41+
margin-top: 15px;
42+
}
43+
iframe {
44+
width: 100%;
45+
}
46+
.line {
47+
display: none;
48+
}
49+
.hide_on_mobile {
50+
display: none;
4151
}
4252
}
4353

@@ -163,6 +173,6 @@
163173
background-image: url(/static/img/instagram-dark.svg);
164174
}
165175

166-
.email {
167-
background-image: url(/static/img/email.svg)
176+
.email {
177+
background-image: url(/static/img/email.svg)
168178
}
1.16 MB
Loading
928 KB
Loading
1.08 MB
Loading
1.27 MB
Loading
Lines changed: 4 additions & 0 deletions
Loading

pyconbalkan/core/static/img/email.svg

Lines changed: 14 additions & 1 deletion
Loading

0 commit comments

Comments
 (0)