diff --git a/bornhack/settings.py b/bornhack/settings.py index 55432775..7640f228 100644 --- a/bornhack/settings.py +++ b/bornhack/settings.py @@ -43,6 +43,7 @@ INSTALLED_APPS = [ 'villages', 'program', 'info', + 'sponsors', 'allauth', 'allauth.account', diff --git a/bornhack/urls.py b/bornhack/urls.py index 299b14be..68c1b5db 100644 --- a/bornhack/urls.py +++ b/bornhack/urls.py @@ -44,11 +44,6 @@ urlpatterns = [ TemplateView.as_view(template_name='coc.html'), name='conduct' ), - url( - r'^sponsors/', - TemplateView.as_view(template_name='sponsors.html'), - name='call-for-sponsors' - ), url( r'^login/$', LoginView.as_view(), @@ -116,7 +111,7 @@ urlpatterns = [ name='event_index' ), url( - r'^call/$', + r'^call-for-speakers/$', CallForSpeakersView.as_view(), name='call_for_speakers' ), @@ -130,7 +125,7 @@ urlpatterns = [ url( r'^sponsors/$', - SponsorIndexView.as_view(), + SponsorView.as_view(), name='sponsors' ), diff --git a/camps/templates/camp_detail_bornhack-2017.html b/camps/templates/camp_detail_bornhack-2017.html new file mode 100644 index 00000000..0b531aa2 --- /dev/null +++ b/camps/templates/camp_detail_bornhack-2017.html @@ -0,0 +1,61 @@ +{% extends 'base.html' %} +{% load commonmark %} +{% load static from staticfiles %} +{% load imageutils %} +{% block content %} +
+
+ + +
+ +
+
+ Bornhack 2017 will be the second BornHack. It will take place from August 22nd to August 29th 2017 on the Danish island of Bornholm. The tagline of this event will be Make Tradition. +
+
+
+ {% thumbnail 'img/bornhack-2016/esbjerg' '1600x988-B12A2612.jpg' 'A quiet moment in the chillout area by the bar' %} +
+
+
+ +
+ +
+
+ {% thumbnail 'img/bornhack-2016/esbjerg' '1600x988-B12A2631.jpg' 'The BornHack 2016 organiser team' %} +
+
+
+ The BornHack team looks forward to organising another great event for the hacker community. We still need volunteers, so please let us know if you want to help! +
+
+
+ +
+ +
+
+
We want to encourage hackers, makers, politicians, activists, developers, artists, sysadmins, engineers and anyone else with an interest in technology and society to read our call for speakers.
+
+
+ {% thumbnail 'img/bornhack-2016/fonsmark' 'FB1_5149.JPG' 'Danish politicians debating at BornHack 2016' %} +
+
+ +
+ +
+
+ {% thumbnail 'img/bornhack-2016/fonsmark' 'FB1_5265.JPG' 'Organisers thanking the BornHack 2016 sponsors' %} +
+
+
+ BornHack aims to keep ticket prices affordable for everyone and to that end we need sponsors. Please see our call for sponsors if you want to sponsor us, or if you work for a company you think might be able to help. +
+
+
+ +{% endblock content %} + diff --git a/program/models.py b/program/models.py index 1cf91f08..a88521f0 100644 --- a/program/models.py +++ b/program/models.py @@ -38,6 +38,12 @@ class Event(CreatedUpdatedModel): self.slug = slugify(self.title) super(Event, self).save(**kwargs) + @property + def speakers_list(self): + if self.speakers.exists(): + return ", ".join(self.speakers.all().values_list('name', flat=True)) + return False + class EventInstance(CreatedUpdatedModel): """ An instance of an event """ diff --git a/program/templates/program_event_detail.html b/program/templates/program_event_detail.html index 191e56ea..121f62bb 100644 --- a/program/templates/program_event_detail.html +++ b/program/templates/program_event_detail.html @@ -2,35 +2,32 @@ {% load commonmark %} {% block schedule_content %} +
+
{{ event.event_type.name }} {{ event.title }}
+
+

+ {{ event.abstract|commonmark }} + {% if event.speakers.exists %} +

+ {% for speaker in event.speakers.all %} +

{{ speaker }}

+ {{ speaker.biography|commonmark }} + {% endfor %} + {% endif %} +

-

- - {{ event.event_type.name }} - - {{ event.title }} -

- -

-{% if event.start and event.end and event.days.all.exists %} - {{ event.start|date:"H:i" }} - {{ event.end|date:"H:i" }} on - {% for day in event.days.all %}{{ day.date|date:"l" }}{% if not forloop.last %}, {% endif %}{% endfor %}
-{% else %} -Not scheduled yet -{% endif %} -

- -{{ event.abstract|commonmark }} - -
- -{% if event.speakers.exists %} -{% for speaker in event.speakers.all %} - -

{{ speaker }}

- {{ speaker.biography|commonmark }} - -{% endfor %} - -{% endif %} +
+

Instances

+ + +
+
{% endblock schedule_content %} + diff --git a/program/templates/program_overview.html b/program/templates/program_overview.html index c02ed66d..78af268c 100644 --- a/program/templates/program_overview.html +++ b/program/templates/program_overview.html @@ -15,7 +15,7 @@
{{ event }}
- {% if event.speakers.exists %}by {{ event.speakers.all|join:", " }}{% endif %} + {% if event.speakers.exists %}by {{ event.speakers_list }}{% endif %} {% endif %} {% endif %} diff --git a/program/templates/speaker_detail.html b/program/templates/speaker_detail.html index 16a1968f..ae9de00d 100644 --- a/program/templates/speaker_detail.html +++ b/program/templates/speaker_detail.html @@ -9,23 +9,27 @@
{% if speaker.events.exists %} -{% for event in speaker.events.all %} + {% for event in speaker.events.all %} +

+ + {{ event.event_type.name }} + + {{ event.title }} +

+ {{ event.abstract|commonmark }} -

- - {{ event.event_type.name }} -
-{{ event.title }}

- {{ event.abstract|commonmark }} -{% if event.start and event.end and event.days.all.exists %} - At {{ event.start|date:"H:i" }} - {{ event.end|date:"H:i" }} on - {% for day in event.days.all %}{{ day.date|date:"l" }}{% if not forloop.last %}, {% endif %}{% endfor %}
-{% else %} -Not scheduled yet +

Instances

+ + +
+ {% empty %} + No events registered for this speaker yet + {% endfor %} {% endif %} - -{% endfor %} - -{% endif %} - {% endblock schedule_content %} diff --git a/sponsors/templates/bornhack-2016-sponsors.html b/sponsors/templates/bornhack-2016-sponsors.html index 47afb755..a0175b1e 100644 --- a/sponsors/templates/bornhack-2016-sponsors.html +++ b/sponsors/templates/bornhack-2016-sponsors.html @@ -6,11 +6,10 @@ Call for Sponsors | {{ block.super }} {% endblock %} {% block content %} -

Our Sponsors

+

BornHack 2016 Sponsors

- This is an alphabetical list of our current sponsors. We are immensely - grateful for all the help we are getting, and we are looking forward to - adding more names to this list. + This is an alphabetical list of the BornHack 2016 sponsors. An event like BornHack can not be built on hard work and + good intentions alone - it would simply not have been possible without the financial help from these organisations. Thank you, we are immensely grateful!

@@ -116,7 +115,7 @@ Call for Sponsors | {{ block.super }} tyktech logo - Badges, lanyards, wristbands + Badges, wristbands

diff --git a/sponsors/views.py b/sponsors/views.py index 2beef2e5..d8565fe0 100644 --- a/sponsors/views.py +++ b/sponsors/views.py @@ -2,8 +2,8 @@ from django.views.generic import TemplateView from camps.mixins import CampViewMixin -class SponsorIndexView(CampViewMixin, TemplateView): - def get_template_name(self): +class SponsorView(CampViewMixin, TemplateView): + def get_template_names(self): return '%s-sponsors.html' % self.camp.slug