-
diff --git a/src/camps/templates/bornhack-2018_camp_detail.html b/src/camps/templates/bornhack-2018_camp_detail.html
index e3efbdb0..93242151 100644
--- a/src/camps/templates/bornhack-2018_camp_detail.html
+++ b/src/camps/templates/bornhack-2018_camp_detail.html
@@ -52,7 +52,7 @@
{% thumbnail 'img/bornhack-2016/fonsmark' 'FB1_5149.JPG' 'Danish politicians debating at BornHack 2016' %}
We want to encourage hackers, makers, politicians, activists, developers, artists, sysadmins, engineers with something to say to read our call for speakers.
+ We want to encourage hackers, makers, politicians, activists, developers, artists, sysadmins, engineers with something to say to read our call for participation.
-
diff --git a/src/camps/templates/bornhack-2019_camp_detail.html b/src/camps/templates/bornhack-2019_camp_detail.html
index 774fcd29..3c29099a 100644
--- a/src/camps/templates/bornhack-2019_camp_detail.html
+++ b/src/camps/templates/bornhack-2019_camp_detail.html
@@ -27,7 +27,7 @@
We want to encourage hackers, makers, politicians, activists, developers, artists, sysadmins, engineers with something to say to read our call for speakers.
+ We want to encourage hackers, makers, politicians, activists, developers, artists, sysadmins, engineers with something to say to read our call for participation.
- Bornhack 2019 will be the third BornHack. It will take place from August 16th to August 23rd 2019 on the Danish island of Bornholm.
+ Bornhack 2019 will be the fourth BornHack. It will take place from Thursday the 8th of August to Thursday the 15th of August 2019 at a our new venue on the Danish island of Funen.
-
diff --git a/src/camps/templates/bornhack-2020_camp_detail.html b/src/camps/templates/bornhack-2020_camp_detail.html
new file mode 100644
index 00000000..f13b0311
--- /dev/null
+++ b/src/camps/templates/bornhack-2020_camp_detail.html
@@ -0,0 +1,92 @@
+{% extends 'base.html' %}
+{% load commonmark %}
+{% load static from staticfiles %}
+{% load imageutils %}
+{% block content %}
+We want to encourage hackers, makers, politicians, activists, developers, artists, sysadmins, engineers with something to say to read our call for speakers.
+ We want to encourage hackers, makers, politicians, activists, developers, artists, sysadmins, engineers with something to say to read our call for participation.
+
+
+
+ 
+
+
+
+
+
+
+
+
+ BornHack is a 7 day outdoor tent camp where hackers, makers and people with an interest in technology or security come together to celebrate technology, socialise, learn and have fun.
+
+
+ {% thumbnail 'img/bornhack-2016/esbjerg' '1600x988-B12A2610.jpg' 'The family area at BornHack 2016' %}
+
+
+
+
+
+ {% thumbnail 'img/bornhack-2016/esbjerg' '1600x1000-B12A2398.jpg' 'A random hackers laptop' %}
+
+
+
+
+ Bornhack 2020 will be the fifth BornHack. It will take place from August 11th to August 18th 2020 on the Danish island of Bornholm.
+
+ + +
+
+
+
+
+
+ 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!
+
+
+ {% thumbnail 'img/bornhack-2016/esbjerg' '1600x988-B12A2631.jpg' 'The BornHack 2016 organiser team' %}
+
+ + +
+
+
+
+ {% thumbnail 'img/bornhack-2016/fonsmark' 'FB1_5149.JPG' 'Danish politicians debating at BornHack 2016' %}
+
+
+
+We want to encourage hackers, makers, politicians, activists, developers, artists, sysadmins, engineers with something to say to read our call for participation.
+ + +
+
+
+
+
+
+ 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.
+
+
+ {% thumbnail 'img/bornhack-2016/fonsmark' 'FB1_5265.JPG' 'Organisers thanking the BornHack 2016 sponsors' %}
+
++ +
+
+
+
+You are very welcome to ask questions and show your interest on our different channels:
+{% include 'includes/contact.html' %} ++ {% thumbnail 'img/bornhack-2016/fonsmark' 'FA0_1983.JPG' 'Happy organisers welcoming people at the entrance to BornHack 2016' %} + {% thumbnail 'img/bornhack-2016/fonsmark' 'FA0_1986.JPG' 'A bus full of hackers arrive at BornHack 2016' %} + {% thumbnail 'img/bornhack-2016/fonsmark' 'FB1_5126.JPG' 'Late night hacking at Baconsvin village at BornHack 2016' %} + {% thumbnail 'img/bornhack-2016/fonsmark' 'FB1_5168.JPG' '#irl_bar by night at BornHack 2016' %} + {% thumbnail 'img/bornhack-2016/esbjerg' '1600x900-B12A2452.jpg' 'Soldering the BornHack 2016 badge' %} + {% thumbnail 'img/bornhack-2016/esbjerg' '1600x900-B12A2608.jpg' 'Colored lights at night' %} + {% thumbnail 'img/bornhack-2016/fonsmark' 'FA0_1961.JPG' 'BornHack' %} + {% thumbnail 'img/bornhack-2016/esbjerg' '1600x900-B12A2485.jpg' 'Colored light in the grass' %} + {% thumbnail 'img/bornhack-2016/esbjerg' '1600x988-B12A2624.jpg' 'Working on decorations' %} + {% thumbnail 'img/bornhack-2016/esbjerg' '1600x900-B12A2604.jpg' 'Sitting around the campfire at BornHack 2016' %} +
+{% endblock content %} diff --git a/src/camps/templates/camp_list.html b/src/camps/templates/camp_list.html index 33b25296..abc8537d 100644 --- a/src/camps/templates/camp_list.html +++ b/src/camps/templates/camp_list.html @@ -24,7 +24,7 @@Your {{ camp.title }} Economy Overview
+ +| What | +Description | +Actions | +
|---|---|---|
Expenses |
+ You have {{ expense_count }} expense{{ expense_count|pluralize }} ({{ approved_expense_count }} approved, {{ rejected_expense_count }} rejected, and {{ unapproved_expense_count }} pending approval) for {{ camp.title }}, for a total of {{ expense_total|default:"0" }} DKK. | ++ List Expenses + Create Expense + | +
Reimbursements |
+ You have {{ reimbursement_count }} reimbursement{{ reimbursement_count|pluralize }} ({{ paid_reimbursement_count }} paid, {{ unpaid_reimbursement_count }} pending payment) for {{ camp.title }}, for a total of {{ reimbursement_total }} DKK. | ++ List Reimbursements + | +
Revenue |
+ You have {{ revenue_count }} revenue{{ revenue_count|pluralize }} ({{ approved_revenue_count }} approved, {{ rejected_revenue_count }} rejected, and {{ unapproved_revenue_count }} still pending approval) for {{ camp.title }}, for a total of {{ revenue_total|default:"0" }} DKK. | ++ List Revenues + Create Revenue + | +
Really delete expense {{ expense.uuid }}?
+{% include 'includes/expense_detail_panel.html' %} + +{% endblock %} diff --git a/src/economy/templates/expense_detail.html b/src/economy/templates/expense_detail.html new file mode 100644 index 00000000..ac232641 --- /dev/null +++ b/src/economy/templates/expense_detail.html @@ -0,0 +1,12 @@ +{% extends 'base.html' %} + +{% block title %} +Expense Details | {{ block.super }} +{% endblock %} + +{% block content %} +
+{% include 'includes/expense_detail_panel.html' %}
+
+Back to Expense List
+{% endblock %}
diff --git a/src/economy/templates/expense_form.html b/src/economy/templates/expense_form.html
new file mode 100644
index 00000000..420bd999
--- /dev/null
+++ b/src/economy/templates/expense_form.html
@@ -0,0 +1,16 @@
+{% extends 'base.html' %}
+{% load bootstrap3 %}
+
+{% block title %}
+{% if object %}Update{% else %}Create{% endif %} Expense | {{ block.super }}
+{% endblock %}
+
+{% block content %}
+{% if object %}Update{% else %}Create{% endif %} {{ camp.title }} Expense
+ +{% endblock %} diff --git a/src/economy/templates/expense_list.html b/src/economy/templates/expense_list.html new file mode 100644 index 00000000..15d62c80 --- /dev/null +++ b/src/economy/templates/expense_list.html @@ -0,0 +1,24 @@ +{% extends 'base.html' %} +{% load staticfiles %} + +{% block title %} +Expenses | {{ block.super }} +{% endblock %} + +{% block extra_head %} + + +{% endblock extra_head %} + +<{% block content %} +Your {{ camp.title }} Expenses
+ +{% include 'includes/expense_list_panel.html' %} + +{% if perms.camps.expense_create_permission %} + Create Expense +{% else %} +You don't have permission to add expenses. Please ask someone from the Economy team to add the permission if you need it.
+
+
diff --git a/src/economy/templates/includes/expense_list_panel.html b/src/economy/templates/includes/expense_list_panel.html
new file mode 100644
index 00000000..aca86383
--- /dev/null
+++ b/src/economy/templates/includes/expense_list_panel.html
@@ -0,0 +1,63 @@
+{% if expense_list %}
+Expense Details for {{ expense.pk }}
+
+
+
+
+| Created By | +{{ expense.user }} | +
|---|---|
| Amount | +{{ expense.amount }} DKK | +
| Invoice Date | +{{ expense.invoice_date }} | +
| Description | +{{ expense.description }} | +
| Paid by BornHack? | +This expense was paid by {% if expense.paid_by_bornhack %}BornHack{% else %}{{ expense.user }}, and will be reimbursed when approved.{% endif %} | +
| Filename | +{{ expense.invoice }} | +
| Approved? | +{{ expense.approval_status }} | +
| Reimbursement? | ++ {% if expense.reimbursement %} + {% if request.resolver_match.app_name == "backoffice" %} + {{ expense.reimbursement.pk }} + {% else %} + {{ expense.reimbursement.pk }} + {% endif %} + {% else %} + N/A + {% endif %} + |
| Invoice | +
+ + Filename: {{ expense.invoice_filename }} + |
+
| Economy Team Notes | +{{ expense.notes|default:"N/A" }} | +
| Created By | + {% if not reimbursement %} +Paid by | + {% endif %} +Amount | +Invoice Date | +Description | +Responsible Team | + {% if not reimbursement %} +Approved | +Reimbursement | + {% endif %} +Actions | +
|---|---|---|---|---|---|---|---|---|
| {{ expense.user }} | + {% if not reimbursement %} +{% if expense.paid_by_bornhack %}BornHack{% else %}{{ expense.user }}{% endif %} | + {% endif %} +{{ expense.amount }} DKK | +{{ expense.invoice_date }} | +{{ expense.description }} | +{{ expense.responsible_team.name }} Team | + + {% if not reimbursement %} +{{ expense.approval_status }} | ++ {% if expense.reimbursement and not expense.paid_by_bornhack %} + {% if request.resolver_match.app_name == "backoffice" %} + Details + {% else %} + Details + {% endif %} + {% else %} + N/A + {% endif %} + | + {% endif %} + ++ {% if request.resolver_match.app_name == "backoffice" %} + Details + {% else %} + Details + Update + Delete + {% endif %} + | +
No expenses found.
+{% endif %} + diff --git a/src/economy/templates/includes/reimbursement_detail_panel.html b/src/economy/templates/includes/reimbursement_detail_panel.html new file mode 100644 index 00000000..e242435d --- /dev/null +++ b/src/economy/templates/includes/reimbursement_detail_panel.html @@ -0,0 +1,37 @@ +
+
diff --git a/src/economy/templates/includes/reimbursement_list_panel.html b/src/economy/templates/includes/reimbursement_list_panel.html
new file mode 100644
index 00000000..643f9449
--- /dev/null
+++ b/src/economy/templates/includes/reimbursement_list_panel.html
@@ -0,0 +1,41 @@
+{% if reimbursement_list %}
+ Reimbursement Details for {{ reimbursement.pk }} for {{ reimbursement.reimbursement_user }}
+
+
+
+
+| Reimbursement User | +{{ reimbursement.reimbursement_user }} | +
|---|---|
| Created By Economy Team Member | +{{ reimbursement.user }} | +
| Total Amount | +{{ reimbursement.amount }} DKK | +
| Economy Team Notes | +{{ reimbursement.notes|default:"N/A" }} | +
| Paid | +{{ reimbursement.paid }} | +
| Created | +{{ reimbursement.created }} by {{ reimbursement.user }} | +
| Expenses covered by this Reimbursement | ++ {% include 'includes/expense_list_panel.html' with expense_list=reimbursement.covered_expenses.all %} + | +
| Camp | +Created By | +Created For | +Economy Team Notes | +Amount | +Paid | +Actions | +
|---|---|---|---|---|---|---|
| {{ reim.camp }} | +{{ reim.user }} | +{{ reim.reimbursement_user }} | +{{ reim.notes|default:"N/A" }} | +{{ reim.amount }} DKK | +{{ reim.paid }} | ++ {% if request.resolver_match.app_name == "backoffice" %} + Details + Update + {% if not reim.paid %} + Delete + {% endif %} + {% else %} + Details + {% endif %} + | +
No reimbursements found for {{ camp.title }}
+{% endif %} + diff --git a/src/economy/templates/includes/revenue_detail_panel.html b/src/economy/templates/includes/revenue_detail_panel.html new file mode 100644 index 00000000..88ceb857 --- /dev/null +++ b/src/economy/templates/includes/revenue_detail_panel.html @@ -0,0 +1,43 @@ +
+
+
diff --git a/src/economy/templates/includes/revenue_list_panel.html b/src/economy/templates/includes/revenue_list_panel.html
new file mode 100644
index 00000000..a2165ac1
--- /dev/null
+++ b/src/economy/templates/includes/revenue_list_panel.html
@@ -0,0 +1,39 @@
+{% if revenue_list %}
+Revenue Details for {{ revenue.pk }}
+
+
+
+
+| Created By | +{{ revenue.user }} | +
|---|---|
| Amount | +{{ revenue.amount }} DKK | +
| Invoice Date | +{{ revenue.invoice_date }} | +
| Description | +{{ revenue.description }} | +
| Filename | +{{ revenue.invoice }} | +
| Approved? | +{{ revenue.approval_status }} | +
| Invoice | +
+ + Filename: {{ revenue.invoice_filename }} + |
+
| Economy Team Notes | +{{ revenue.notes|default:"N/A" }} | +
| Created By | +Amount | +Invoice Date | +Description | +Responsible Team | +Approved | +Actions | +
|---|---|---|---|---|---|---|
| {{ revenue.user }} | +{{ revenue.amount }} DKK | +{{ revenue.invoice_date }} | +{{ revenue.description }} | +{{ revenue.responsible_team.name }} Team | +{{ revenue.approval_status }} | ++ {% if request.resolver_match.app_name == "backoffice" %} + Details + {% else %} + Details + Update + Delete + {% endif %} + | +
No revenues found.
+{% endif %} + diff --git a/src/economy/templates/reimbursement_detail.html b/src/economy/templates/reimbursement_detail.html new file mode 100644 index 00000000..d1d7b03e --- /dev/null +++ b/src/economy/templates/reimbursement_detail.html @@ -0,0 +1,16 @@ +{% extends 'base.html' %} +{% load bootstrap3 %} + +{% block title %} +Reimbursement Details | {{ block.super }} +{% endblock %} + +{% block content %} +Reimbursement Details
+ +{% include 'includes/reimbursement_detail_panel.html' %} + +Back to list + +{% endblock content %} + diff --git a/src/economy/templates/reimbursement_list.html b/src/economy/templates/reimbursement_list.html new file mode 100644 index 00000000..823a824e --- /dev/null +++ b/src/economy/templates/reimbursement_list.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} +{% load staticfiles %} + +{% block title %} +Expenses | {{ block.super }} +{% endblock %} + +{% block extra_head %} + + +{% endblock extra_head %} + +<{% block content %} +Your {{ camp.title }} Reimbursements
+ +{% include 'includes/reimbursement_list_panel.html' %} + +{% endblock %} diff --git a/src/economy/templates/revenue_delete.html b/src/economy/templates/revenue_delete.html new file mode 100644 index 00000000..234711aa --- /dev/null +++ b/src/economy/templates/revenue_delete.html @@ -0,0 +1,16 @@ +{% extends 'base.html' %} +{% load bootstrap3 %} + +{% block title %} +Delete Revenue | {{ block.super }} +{% endblock %} + +{% block content %} +Really delete revenue {{ revenue.uuid }}?
+{% include 'includes/revenue_detail_panel.html' %} + +{% endblock %} diff --git a/src/economy/templates/revenue_detail.html b/src/economy/templates/revenue_detail.html new file mode 100644 index 00000000..fc8dd0db --- /dev/null +++ b/src/economy/templates/revenue_detail.html @@ -0,0 +1,12 @@ +{% extends 'base.html' %} + +{% block title %} +Revenue Details | {{ block.super }} +{% endblock %} + +{% block content %} +
+{% include 'includes/revenue_detail_panel.html' %}
+
+Back to Revenue List
+{% endblock %}
diff --git a/src/economy/templates/revenue_form.html b/src/economy/templates/revenue_form.html
new file mode 100644
index 00000000..cf8245d0
--- /dev/null
+++ b/src/economy/templates/revenue_form.html
@@ -0,0 +1,16 @@
+{% extends 'base.html' %}
+{% load bootstrap3 %}
+
+{% block title %}
+{% if object %}Update{% else %}Create{% endif %} Revenue | {{ block.super }}
+{% endblock %}
+
+{% block content %}
+{% if object %}Update{% else %}Create{% endif %} {{ camp.title }} Revenue
+ +{% endblock %} diff --git a/src/economy/templates/revenue_list.html b/src/economy/templates/revenue_list.html new file mode 100644 index 00000000..bfc6737d --- /dev/null +++ b/src/economy/templates/revenue_list.html @@ -0,0 +1,24 @@ +{% extends 'base.html' %} +{% load staticfiles %} + +{% block title %} +Revenues | {{ block.super }} +{% endblock %} + +{% block extra_head %} + + +{% endblock extra_head %} + +<{% block content %} +Your {{ camp.title }} Revenues
+ +{% include 'includes/revenue_list_panel.html' %} + +{% if perms.camps.revenue_create_permission %} + Create Revenue +{% else %} +You don't have permission to add revenue. Please ask someone from the Economy team to add the permission if you need it.
+
+
+Feedback Help us make BornHack even better!
+
+
+
++ BornHack can always improve, but we need your feedback to know how. So write you thoughts on what was good and what wasn't, it's highly appreciated! +
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/news/tests.py b/src/feedback/tests.py
similarity index 100%
rename from src/news/tests.py
rename to src/feedback/tests.py
diff --git a/src/feedback/views.py b/src/feedback/views.py
new file mode 100644
index 00000000..750356b8
--- /dev/null
+++ b/src/feedback/views.py
@@ -0,0 +1,33 @@
+from django.contrib import messages
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+from django.views.generic import CreateView
+
+from camps.mixins import CampViewMixin
+from tokens.models import Token
+from .models import Feedback
+
+
+class FeedbackCreate(LoginRequiredMixin, CampViewMixin, CreateView):
+ model = Feedback
+ fields = ['feedback']
+
+ def form_valid(self, form):
+ feedback = form.save(commit=False)
+ feedback.user = self.request.user
+ feedback.camp = self.camp
+ feedback.save()
+ thanks_message = "Thank you! Your feedback is highly appreciated!"
+ try:
+ token = Token.objects.get(
+ camp=self.camp,
+ description="Feedback thanks"
+ )
+ thanks_message += " And for your efforts, here is a token: {}".format(token.token)
+ except Token.DoesNotExist:
+ pass
+
+ messages.success(self.request, thanks_message)
+
+ return HttpResponseRedirect(reverse("feedback", kwargs={"camp_slug": self.camp.slug}))
diff --git a/src/info/admin.py b/src/info/admin.py
index e8b9235a..b2287b77 100644
--- a/src/info/admin.py
+++ b/src/info/admin.py
@@ -1,6 +1,26 @@
from django.contrib import admin
-from .models import *
+from reversion.admin import VersionAdmin
+from .models import (
+ InfoItem,
+ InfoCategory
+)
-admin.site.register(InfoCategory)
-admin.site.register(InfoItem)
+@admin.register(InfoItem)
+class InfoItemAdmin(VersionAdmin):
+ list_filter = ['category', 'category__team__camp',]
+ list_display = ['headline',]
+
+
+class InfoItemInlineAdmin(admin.StackedInline):
+ model = InfoItem
+ list_filter = ['category', 'category__team__camp',]
+ list_display = ['headline',]
+
+
+@admin.register(InfoCategory)
+class InfoCategorydmin(admin.ModelAdmin):
+ list_filter = ['team__camp',]
+ list_display = ['headline',]
+ search_fields = ['headline', 'body']
+ inlines = [InfoItemInlineAdmin]
diff --git a/src/info/apps.py b/src/info/apps.py
index 7fca4660..3891f47e 100644
--- a/src/info/apps.py
+++ b/src/info/apps.py
@@ -1,5 +1,3 @@
-
-
from django.apps import AppConfig
diff --git a/src/info/migrations/0004_infocategory_team.py b/src/info/migrations/0004_infocategory_team.py
new file mode 100644
index 00000000..d7d2acd2
--- /dev/null
+++ b/src/info/migrations/0004_infocategory_team.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.0.4 on 2018-05-04 21:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('teams', '0042_auto_20180413_1933'),
+ ('info', '0003_auto_20170218_1148'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='infocategory',
+ name='team',
+ field=models.ForeignKey(blank=True, help_text='The team responsible for this info category.', null=True, on_delete=django.db.models.deletion.PROTECT, to='teams.Team'),
+ ),
+ ]
diff --git a/src/info/migrations/0005_add_teams_to_categories.py b/src/info/migrations/0005_add_teams_to_categories.py
new file mode 100644
index 00000000..404cb176
--- /dev/null
+++ b/src/info/migrations/0005_add_teams_to_categories.py
@@ -0,0 +1,78 @@
+# Generated by Django 2.0.4 on 2018-05-08 07:42
+
+from django.db import migrations
+from django.core.exceptions import ObjectDoesNotExist
+
+
+def add_teams_to_categories(apps, schema_editor):
+ InfoCategory = apps.get_model("info", "InfoCategory")
+ Team = apps.get_model("teams", "Team")
+ Camp = apps.get_model("camps", "Camp")
+
+ try:
+ # 2016 - Everything is orga team
+ camp2016 = Camp.objects.get(slug="bornhack-2016")
+ orga2016 = Team.objects.get(camp=camp2016, name="Orga")
+ InfoCategory.objects.filter(camp=camp2016).update(team=orga2016)
+
+ # 2017 - Everything is orga team
+ camp2017 = Camp.objects.get(slug="bornhack-2017")
+ orga2017 = Team.objects.get(camp=camp2017, name="Orga")
+ InfoCategory.objects.filter(camp=camp2017).update(team=orga2017)
+
+ # 2018 - Map categories to teams
+ camp2018 = Camp.objects.get(slug="bornhack-2018")
+ team2018 = Team.objects.filter(camp=camp2018)
+ infocategories2018 = InfoCategory.objects.filter(camp=camp2018)
+
+ # Info team
+ infoteam = team2018.get(name="Info")
+ info_anchors = [
+ "what",
+ "when",
+ "travel",
+ "where",
+ "sleep",
+ "bicycles",
+ "infodesk-and-cert",
+ "shower-and-toilets",
+ "venue-map",
+ "villages",
+ ]
+ infocategories2018.filter(anchor__in=info_anchors).update(team=infoteam)
+
+ # Food team
+ food = team2018.get(name="Food")
+ infocategories2018.filter(anchor__in=["food-and-groceries"]).update(team=food)
+
+ # NOC team
+ noc = team2018.get(name="NOC")
+ infocategories2018.filter(anchor__in=["network"]).update(team=noc)
+
+ # Power team
+ power = team2018.get(name="Power")
+ infocategories2018.filter(anchor__in=["power"]).update(team=power)
+
+ # Shuttle bus
+ shuttle_bus = team2018.get(name="Shuttle Bus")
+ infocategories2018.filter(anchor__in=["shuttle-bus"]).update(team=shuttle_bus)
+
+ # Bar
+ bar = team2018.get(name="Bar")
+ infocategories2018.filter(anchor__in=["bar"]).update(team=bar)
+
+ # Make info team catch all remaining
+ infocategories2018.filter(team__isnull=True).update(team=infoteam)
+ except ObjectDoesNotExist:
+ pass
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('info', '0004_infocategory_team'),
+ ]
+
+ operations = [
+ migrations.RunPython(add_teams_to_categories)
+ ]
diff --git a/src/info/migrations/0006_auto_20180520_1113.py b/src/info/migrations/0006_auto_20180520_1113.py
new file mode 100644
index 00000000..d7cef8ba
--- /dev/null
+++ b/src/info/migrations/0006_auto_20180520_1113.py
@@ -0,0 +1,27 @@
+# Generated by Django 2.0.4 on 2018-05-20 16:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('info', '0005_add_teams_to_categories'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='infocategory',
+ name='team',
+ field=models.ForeignKey(blank=True, help_text='The team responsible for this info category.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='info_categories', to='teams.Team'),
+ ),
+ migrations.AlterUniqueTogether(
+ name='infocategory',
+ unique_together=set(),
+ ),
+ migrations.RemoveField(
+ model_name='infocategory',
+ name='camp',
+ ),
+ ]
diff --git a/src/info/migrations/0007_auto_20180520_1511.py b/src/info/migrations/0007_auto_20180520_1511.py
new file mode 100644
index 00000000..c2511a93
--- /dev/null
+++ b/src/info/migrations/0007_auto_20180520_1511.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.4 on 2018-05-20 20:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('info', '0006_auto_20180520_1113'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='infocategory',
+ name='team',
+ field=models.ForeignKey(help_text='The team responsible for this info category.', on_delete=django.db.models.deletion.PROTECT, related_name='info_categories', to='teams.Team'),
+ ),
+ ]
diff --git a/src/info/models.py b/src/info/models.py
index e166b2d7..3888a53f 100644
--- a/src/info/models.py
+++ b/src/info/models.py
@@ -1,43 +1,55 @@
from django.db import models
-from utils.models import CreatedUpdatedModel, CampRelatedModel
+from utils.models import CampRelatedModel
from django.core.exceptions import ValidationError
+import reversion
+
class InfoCategory(CampRelatedModel):
class Meta:
ordering = ['weight', 'headline']
- unique_together = (('anchor', 'camp'), ('headline', 'camp'))
verbose_name_plural = "Info Categories"
- camp = models.ForeignKey(
- 'camps.Camp',
- related_name = 'infocategories',
- on_delete = models.PROTECT
- )
-
headline = models.CharField(
- max_length = 100,
- help_text = "The headline of this info category"
+ max_length=100,
+ help_text="The headline of this info category"
)
anchor = models.SlugField(
- help_text = "The HTML anchor to use for this info category."
+ help_text="The HTML anchor to use for this info category."
)
weight = models.PositiveIntegerField(
- help_text = 'Determines sorting/ordering. Heavier categories sink to the bottom. Categories with the same weight are ordered alphabetically. Defaults to 100.',
- default = 100,
+ help_text='Determines sorting/ordering. Heavier categories sink to the bottom. Categories with the same weight are ordered alphabetically. Defaults to 100.',
+ default=100,
+ )
+
+ team = models.ForeignKey(
+ 'teams.Team',
+ help_text='The team responsible for this info category.',
+ on_delete=models.PROTECT,
+ related_name='info_categories'
)
def clean(self):
- if InfoItem.objects.filter(category__camp=self.camp, anchor=self.anchor).exists():
+ if InfoItem.objects.filter(category__team__camp=self.camp, anchor=self.anchor).exists():
# this anchor is already in use on an item, so it cannot be used (must be unique on the page)
- raise ValidationError({'anchor': 'Anchor is already in use on an info item for this camp'})
+ raise ValidationError(
+ {'anchor': 'Anchor is already in use on an info item for this camp'}
+ )
+
+ @property
+ def camp(self):
+ return self.team.camp
+
+ camp_filter = 'team__camp'
def __str__(self):
return '%s (%s)' % (self.headline, self.camp)
+# We want to have info items under version control
+@reversion.register()
class InfoItem(CampRelatedModel):
class Meta:
ordering = ['weight', 'headline']
@@ -45,38 +57,38 @@ class InfoItem(CampRelatedModel):
category = models.ForeignKey(
'info.InfoCategory',
- related_name = 'infoitems',
- on_delete = models.PROTECT
+ related_name='infoitems',
+ on_delete=models.PROTECT
)
headline = models.CharField(
- max_length = 100,
- help_text = "Headline of this info item."
+ max_length=100,
+ help_text="Headline of this info item."
)
anchor = models.SlugField(
- help_text = "The HTML anchor to use for this info item."
+ help_text="The HTML anchor to use for this info item."
)
body = models.TextField(
- help_text = 'Body of this info item. Markdown is supported.'
+ help_text='Body of this info item. Markdown is supported.'
)
weight = models.PositiveIntegerField(
- help_text = 'Determines sorting/ordering. Heavier items sink to the bottom. Items with the same weight are ordered alphabetically. Defaults to 100.',
- default = 100,
+ help_text='Determines sorting/ordering. Heavier items sink to the bottom. Items with the same weight are ordered alphabetically. Defaults to 100.',
+ default=100,
)
@property
def camp(self):
return self.category.camp
+ camp_filter = 'category__team__camp'
+
def clean(self):
- if InfoCategory.objects.filter(camp=self.category.camp, anchor=self.anchor).exists():
+ if hasattr(self, 'category') and InfoCategory.objects.filter(team__camp=self.category.team.camp, anchor=self.anchor).exists():
# this anchor is already in use on a category, so it cannot be used here (they must be unique on the entire page)
raise ValidationError({'anchor': 'Anchor is already in use on an info category for this camp'})
def __str__(self):
return '%s (%s)' % (self.headline, self.category)
-
-
diff --git a/src/info/templates/info.html b/src/info/templates/info.html
index 4441db43..cdbc7ecd 100644
--- a/src/info/templates/info.html
+++ b/src/info/templates/info.html
@@ -44,7 +44,7 @@ Info | {{ block.super }}
- \x02.":
- logger.info("Nickserv identify needed, fixing...")
- self.bot.privmsg("NickServ@services.baconsvin.org", "identify %s %s" % (settings.IRCBOT_NICK, settings.IRCBOT_NICKSERV_PASSWORD))
+ # check if this is a message from nickserv
+ if kwargs['mask'] == "NickServ!%s" % settings.IRCBOT_NICKSERV_MASK:
+ self.bot.handle_nickserv_privmsg(**kwargs)
+
+ # check if this is a message from chanserv
+ if kwargs['mask'] == "ChanServ!%s" % settings.IRCBOT_CHANSERV_MASK:
+ self.bot.handle_chanserv_privmsg(**kwargs)
@irc3.event(irc3.rfc.KICK)
@@ -67,7 +95,23 @@ class Plugin(object):
###############################################################################################
- ### custom irc3 methods
+ ### custom irc3 methods below here
+
+ @irc3.extend
+ def do_stuff(self):
+ """
+ Main periodic method called every N seconds.
+ """
+ #logger.debug("inside do_stuff()")
+
+ # call the methods we need to
+ self.bot.check_irc_channels()
+ self.bot.fix_missing_acls()
+ self.bot.get_outgoing_messages()
+
+ # schedule a call of this function again in N seconds
+ self.bot.loop.call_later(settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS, self.bot.do_stuff)
+
@irc3.extend
def get_outgoing_messages(self):
@@ -75,7 +119,6 @@ class Plugin(object):
This method gets unprocessed OutgoingIrcMessage objects and attempts to send them to
the target channel. Messages are skipped if the bot is not in the channel.
"""
- #logger.debug("inside get_outgoing_messages()")
for msg in OutgoingIrcMessage.objects.filter(processed=False).order_by('created'):
logger.info("processing irc message to %s: %s" % (msg.target, msg.message))
# if this message expired mark it as expired and processed without doing anything
@@ -100,7 +143,292 @@ class Plugin(object):
else:
logger.warning("skipping message to %s" % msg.target)
- # call this function again in X seconds
- self.bot.loop.call_later(settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS, self.bot.get_outgoing_messages)
+
+ ###############################################################################################
+ ### irc channel methods
+
+ @irc3.extend
+ def check_irc_channels(self):
+ """
+ Compare the list of IRC channels the bot is currently in with the list of IRC channels the bot is supposed to be in.
+ Join or part channels as needed.
+ """
+ desired_channel_list = self.bot.get_desired_channel_list()
+ #logger.debug("Inside check_irc_channels(), desired_channel_list is: %s and self.bot.channels is: %s" % (desired_channel_list, self.bot.channels.keys()))
+
+ # loop over desired_channel_list, join as needed
+ for channel in desired_channel_list:
+ if channel not in self.bot.channels:
+ logger.debug("I should be in %s but I am not, attempting to join..." % channel)
+ self.bot.join(channel)
+
+ # loop over self.bot.channels, part as needed
+ for channel in self.bot.channels:
+ if channel not in desired_channel_list:
+ logger.debug("I am in %s but I shouldn't be, parting..." % channel)
+ self.bot.part(channel, "I am no longer needed here")
+ @irc3.extend
+ def get_desired_channel_list(self):
+ """
+ Return a list of strings of all the IRC channels the bot is supposed to be in
+ """
+ desired_channel_list = self.get_managed_team_channels()
+ desired_channel_list += self.get_unmanaged_team_channels()
+ desired_channel_list.append(settings.IRCBOT_PUBLIC_CHANNEL)
+ desired_channel_list.append(settings.IRCBOT_VOLUNTEER_CHANNEL)
+ return desired_channel_list
+
+
+ @irc3.extend
+ def get_managed_team_channels(self):
+ """
+ Return a list of team IRC channels which the bot is supposed to be managing.
+ """
+ pubchans = Team.objects.filter(
+ public_irc_channel_name__isnull=False,
+ public_irc_channel_bot=True,
+ public_irc_channel_managed=True
+ ).values_list("public_irc_channel_name", flat=True)
+
+ privchans = Team.objects.filter(
+ private_irc_channel_name__isnull=False,
+ private_irc_channel_bot=True,
+ private_irc_channel_managed=True
+ ).values_list("private_irc_channel_name", flat=True)
+
+ return list(pubchans) + list(privchans)
+
+
+ @irc3.extend
+ def get_unmanaged_team_channels(self):
+ """
+ Return a list of team IRC channels which the bot is supposed to be in, but not managing.
+ """
+ pubchans = Team.objects.filter(
+ public_irc_channel_name__isnull=False,
+ public_irc_channel_bot=True,
+ public_irc_channel_managed=False
+ ).values_list("public_irc_channel_name", flat=True)
+
+ privchans = Team.objects.filter(
+ private_irc_channel_name__isnull=False,
+ private_irc_channel_bot=True,
+ private_irc_channel_managed=False
+ ).values_list("private_irc_channel_name", flat=True)
+
+ return list(pubchans) + list(privchans)
+
+
+ @irc3.extend
+ def setup_private_channel(self, channel):
+ """
+ Configures a private IRC channel by setting modes and adding all members to ACL if it is a team channel
+ """
+ logger.debug("Inside setup_private_channel() for %s" % channel)
+
+ # basic private channel modes
+ self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s mlock +inpst" % channel)
+ self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s SECURE on" % channel)
+ self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s RESTRICTED on" % channel)
+
+ # add the bot to the ACL
+ self.bot.add_user_to_channel_acl(
+ username=settings.IRCBOT_NICK,
+ channel=channel,
+ invite=True
+ )
+
+ team = get_team_from_irc_channel(channel)
+ if team:
+ # this is a team channel, add team members to channel ACL
+ self.bot.add_team_members_to_channel_acl(team)
+ # make sure private_irc_channel_fix_needed is set to False and save
+ team.private_irc_channel_fix_needed=False
+ team.save()
+
+
+ @irc3.extend
+ def setup_public_channel(self, channel):
+ """
+ Configures a public IRC channel by setting modes and giving all team members +oO if it is a team channel
+ """
+ logger.debug("Inside setup_public_channel() for %s" % channel)
+
+ # basic private channel modes
+ self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s mlock +nt-lk" % channel)
+ self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s SECURE off" % channel)
+ self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s RESTRICTED off" % channel)
+
+ team = get_team_from_irc_channel(channel)
+ if team:
+ # add members to ACL
+ self.bot.add_team_members_to_channel_acl(team)
+ # make sure public_irc_channel_fix_needed is set to False and save
+ team.public_irc_channel_fix_needed=False
+ team.save()
+
+
+ @irc3.extend
+ def add_team_members_to_channel_acl(self, team):
+ """
+ Handles initial ACL for team channels.
+ Sets membership.irc_acl_fix_needed=True for each approved teammember with a NickServ username
+ """
+ # add all members to the acl
+ for membership in team.memberships.all():
+ if membership.approved and membership.user.profile.nickserv_username:
+ membership.irc_acl_fix_needed=True
+ membership.save()
+
+
+ @irc3.extend
+ def add_user_to_channel_acl(self, username, channel, invite):
+ """
+ Add user to team IRC channel ACL
+ """
+ # set autoop for this username
+ self.bot.privmsg(
+ settings.IRCBOT_CHANSERV_MASK,
+ "flags %(channel)s %(user)s +oO" % {
+ 'channel': channel,
+ 'user': username,
+ },
+ )
+
+ if invite:
+ # also add autoinvite for this username
+ self.bot.mode(channel, '+I', '$a:%s' % username)
+
+
+ @irc3.extend
+ def fix_missing_acls(self):
+ """
+ Called periodically by do_stuff()
+ Loops over TeamMember objects and adds ACL entries as needed
+ Loops over Team objects and fixes permissions and ACLS as needed
+ """
+ # first find all TeamMember objects which needs a loving hand
+ missing_acls = TeamMember.objects.filter(
+ irc_acl_fix_needed=True
+ ).exclude(
+ user__profile__nickserv_username=''
+ )
+
+ # loop over them and fix what needs to be fixed
+ if missing_acls:
+ logger.debug("Found %s memberships which need IRC ACL fixing.." % missing_acls.count())
+ for membership in missing_acls:
+ # add to team public channel?
+ if membership.team.public_irc_channel_name and membership.team.public_irc_channel_managed:
+ self.bot.add_user_to_channel_acl(
+ username=membership.user.profile.nickserv_username,
+ channel=membership.team.public_irc_channel_name,
+ invite=False
+ )
+
+ # add to team private channel?
+ if membership.team.private_irc_channel_name and membership.team.private_irc_channel_managed:
+ self.bot.add_user_to_channel_acl(
+ username=membership.user.profile.nickserv_username,
+ channel=membership.team.private_irc_channel_name,
+ invite=True
+ )
+
+ # add to volunteer channel
+ self.bot.add_user_to_channel_acl(
+ username=membership.user.profile.nickserv_username,
+ channel=settings.IRCBOT_VOLUNTEER_CHANNEL,
+ invite=True
+ )
+
+ # mark membership as irc_acl_fix_needed=False and save
+ membership.irc_acl_fix_needed=False
+ membership.save()
+
+ # loop over teams where the private channel needs fixing
+ for team in Team.objects.filter(private_irc_channel_fix_needed=True):
+ logger.debug("Team %s private IRC channel %s needs ACL fixing" % (team, team.private_irc_channel_name))
+ self.bot.setup_private_channel(team.private_irc_channel_name)
+
+ # loop over teams where the public channel needs fixing
+ for team in Team.objects.filter(public_irc_channel_fix_needed=True):
+ logger.debug("Team %s public IRC channel %s needs ACL fixing" % (team, team.public_irc_channel_name))
+ self.bot.setup_public_channel(team.public_irc_channel_name)
+
+
+ ###############################################################################################
+ ### services (ChanServ & NickServ) methods
+
+ @irc3.extend
+ def handle_chanserv_privmsg(self, **kwargs):
+ """
+ Handle messages from ChanServ on networks with Services.
+ """
+ logger.debug("Got a message from ChanServ")
+
+ ###############################################
+ # handle "Channel \x02#example\x02 is not registered." message
+ ###############################################
+ match = re.compile("Channel (#[a-zA-Z0-9-]+) is not registered.").match(kwargs['data'].replace("\x02", ""))
+ if match:
+ # the irc channel is not registered
+ channel = match.group(1)
+ # get a list of the channels we are supposed to be managing
+ if channel in self.bot.get_managed_team_channels() or channel == settings.IRCBOT_VOLUNTEER_CHANNEL:
+ # we want to register this channel! though we can only do so if we have a @ in the channel
+ if self.bot.nick in self.bot.channels[channel].modes['@']:
+ logger.debug("ChanServ says channel %s is not registered, bot is supposed to be managing this channel, registering it with chanserv" % channel)
+ self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "register %s" % channel)
+ else:
+ logger.debug("ChanServ says channel %s is not registered, bot is supposed to be managing this channel, but the bot cannot register without @ in the channel" % channel)
+ self.bot.privmsg(channel, "I need @ before I can register this channel with ChanServ")
+ return
+
+ ###############################################
+ # handle "\x02#example\x02 is now registered to \x02tykbhdev\x02" message
+ ###############################################
+ match = re.compile("(#[a-zA-Z0-9-]+) is now registered to ([a-zA-Z0-9-]+)\\.").match(kwargs['data'].replace("\x02", ""))
+ if match:
+ # the irc channel is now registered
+ channel = match.group(1)
+ botnick = match.group(2)
+ logger.debug("Channel %s was registered with ChanServ, looking up Team..." % channel)
+
+ team = get_team_from_irc_channel(channel)
+ if team:
+ if team.private_irc_channel_name == channel:
+ # set private channel modes, +I and ACL
+ self.bot.setup_private_channel(channel)
+ else:
+ # set public channel modes and +oO for all members
+ self.bot.setup_public_channel(channel)
+ return
+ logger.debug("Unable to find Team matching IRC channel %s" % channel)
+
+ # check if this channel is the volunteer channel
+ if channel == settings.IRCBOT_VOLUNTEER_CHANNEL:
+ logger.debug("%s is the volunteer channel, setting up" % channel)
+ self.bot.setup_private_channel(channel)
+ # lets handle the volunteer channels initial ACL manually..
+ return
+
+ logger.debug("Unhandled ChanServ message: %s" % kwargs['data'])
+
+
+ @irc3.extend
+ def handle_nickserv_privmsg(self, **kwargs):
+ """
+ Handles messages from NickServ on networks with Services.
+ """
+ logger.debug("Got a message from NickServ")
+
+ # handle "\x02botnick\x02 is not a registered nickname." message
+ if kwargs['data'] == '\x02%s\x02 is not a registered nickname.' % self.bot.nick:
+ # the bots nickname is not registered, register new account with nickserv
+ self.bot.privmsg(settings.IRCBOT_NICKSERV_MASK, "register %s %s" % (settings.IRCBOT_NICKSERV_PASSWORD, settings.IRCBOT_NICKSERV_EMAIL))
+ return
+
+ logger.debug("Unhandled NickServ message: %s" % kwargs['data'])
+
diff --git a/src/ircbot/ircworker.py b/src/ircbot/ircworker.py
index 3e683057..5e5fb8d2 100644
--- a/src/ircbot/ircworker.py
+++ b/src/ircbot/ircworker.py
@@ -1,6 +1,7 @@
-from .models import OutgoingIrcMessage
from django.conf import settings
-import logging, irc3
+import logging
+import irc3
+from events.models import Routing
logging.basicConfig(level=logging.INFO)
logger = logging.getLogger('bornhack.%s' % __name__)
@@ -9,13 +10,20 @@ def do_work():
"""
Run irc3 module code, wait for events on IRC and wait for messages in OutgoingIrcMessage
"""
+ if hasattr(settings, 'IRCBOT_CHANNELS'):
+ logger.error("settings.IRCBOT_CHANNELS is deprecated. Please define settings.IRCBOT_PUBLIC_CHANNEL and use team channels for the rest.")
+ return False
+
config = {
'nick': settings.IRCBOT_NICK,
- 'autojoins': list(set(settings.IRCBOT_CHANNELS.values())),
+ 'autojoins': [],
'host': settings.IRCBOT_SERVER_HOSTNAME,
'port': settings.IRCBOT_SERVER_PORT,
'ssl': settings.IRCBOT_SERVER_USETLS,
'timeout': 30,
+ 'flood_burst': 2,
+ 'flood_rate': 1,
+ 'flood_rate_delay': 2,
'includes': [
'ircbot.irc3module',
],
@@ -25,5 +33,5 @@ def do_work():
irc3.IrcBot(**config).run(forever=True)
except Exception as E:
logger.exception("Got exception inside do_work for %s" % self.workermodule)
- raise
+ raise E
diff --git a/src/ircbot/models.py b/src/ircbot/models.py
index ae422fc8..05b56ead 100644
--- a/src/ircbot/models.py
+++ b/src/ircbot/models.py
@@ -1,5 +1,5 @@
from django.core.exceptions import ValidationError
-from utils.models import UUIDModel, CreatedUpdatedModel
+from utils.models import CreatedUpdatedModel
from django.db import models
from django.utils import timezone
@@ -12,7 +12,7 @@ class OutgoingIrcMessage(CreatedUpdatedModel):
expired = models.BooleanField(default=False)
def __str__(self):
- return "PRIVMSG %s %s (%s)" % (self.target, self.message, 'processed' if self.processed else 'unprocessed')
+ return "PRIVMSG %s %s (%s)" % (self.target, self.message, 'processed' if self.processed else 'unprocessed')
def clean(self):
if not self.pk:
diff --git a/src/ircbot/utils.py b/src/ircbot/utils.py
new file mode 100644
index 00000000..dfb27b69
--- /dev/null
+++ b/src/ircbot/utils.py
@@ -0,0 +1,21 @@
+from django.conf import settings
+from django.utils import timezone
+from datetime import timedelta
+import logging
+logger = logging.getLogger("bornhack.%s" % __name__)
+
+
+def add_irc_message(target, message, timeout=10):
+ """
+ Convenience function for adding OutgoingIrcMessage objects.
+ Defaults to a message timeout of 10 minutes
+ """
+ from .models import OutgoingIrcMessage
+ OutgoingIrcMessage.objects.create(
+ target=target,
+ message=message,
+ timeout=timezone.now()+timedelta(minutes=timeout),
+ )
+
+
+
diff --git a/src/news/apps.py b/src/news/apps.py
index 0077041d..5a7b92d0 100644
--- a/src/news/apps.py
+++ b/src/news/apps.py
@@ -1,5 +1,3 @@
-
-
from django.apps import AppConfig
diff --git a/src/news/models.py b/src/news/models.py
index ee8a028e..31322fea 100644
--- a/src/news/models.py
+++ b/src/news/models.py
@@ -1,8 +1,7 @@
-
-
from django.db import models
from django.utils import encoding
from django.utils.text import slugify
+from django.urls import reverse
from utils.models import CreatedUpdatedModel
@@ -44,3 +43,5 @@ class NewsItem(CreatedUpdatedModel):
super(NewsItem, self).save(**kwargs)
+ def get_absolute_url(self):
+ return reverse('news:detail', kwargs={"slug": self.slug})
diff --git a/src/news/templates/news_detail.html b/src/news/templates/news_detail.html
index 8cc0c953..676eb89b 100644
--- a/src/news/templates/news_detail.html
+++ b/src/news/templates/news_detail.html
@@ -14,5 +14,5 @@
{% endif %}
- {{ news_item.content|commonmark }}
+ {{ news_item.content|trustedcommonmark|urlize }}
{% endblock %}
diff --git a/src/news/templates/news_index.html b/src/news/templates/news_index.html
index 6b2760bb..98ca8a02 100644
--- a/src/news/templates/news_index.html
+++ b/src/news/templates/news_index.html
@@ -1,5 +1,6 @@
{% extends 'base.html' %}
{% load commonmark %}
+{% load static %}
{% block title %}
News | {{ block.super }}
@@ -8,12 +9,18 @@ News | {{ block.super }}
{% block content %}
{% if request.resolver_match.kwargs.archived %}
Showing archived news items. Show regular news items
+{% else %}
+{{ category.headline }}
+{{ category.headline }} {% if category.team %}Info by the {{ category.team.name }} team{% endif %}
{% for item in category.infoitems.all %}
{% endfor %}
diff --git a/src/info/views.py b/src/info/views.py
index 08e14ea5..a9db1920 100644
--- a/src/info/views.py
+++ b/src/info/views.py
@@ -1,6 +1,4 @@
-from django.shortcuts import render
-from django.views.generic import ListView, DetailView
-from django.utils import timezone
+from django.views.generic import ListView
from .models import *
from camps.mixins import CampViewMixin
diff --git a/src/ircbot/admin.py b/src/ircbot/admin.py
index 91278423..eff2cb89 100644
--- a/src/ircbot/admin.py
+++ b/src/ircbot/admin.py
@@ -1,5 +1,5 @@
from django.contrib import admin
-from .models import *
+from .models import OutgoingIrcMessage
admin.site.register(OutgoingIrcMessage)
diff --git a/src/ircbot/apps.py b/src/ircbot/apps.py
index d057f8c7..54a5147b 100644
--- a/src/ircbot/apps.py
+++ b/src/ircbot/apps.py
@@ -1,5 +1,3 @@
-
-
from django.apps import AppConfig
diff --git a/src/ircbot/irc3module.py b/src/ircbot/irc3module.py
index 2de24b83..d6b2367a 100644
--- a/src/ircbot/irc3module.py
+++ b/src/ircbot/irc3module.py
@@ -1,7 +1,11 @@
-import irc3
+import irc3, re
from ircbot.models import OutgoingIrcMessage
+from teams.models import Team, TeamMember
from django.conf import settings
from django.utils import timezone
+from events.models import Routing
+from teams.utils import get_team_from_irc_channel
+
import logging
logger = logging.getLogger("bornhack.%s" % __name__)
@@ -13,7 +17,6 @@ class Plugin(object):
requires = [
'irc3.plugins.core', # makes the bot able to connect to an irc server and do basic irc stuff
'irc3.plugins.userlist', # maintains a convenient list of the channels the bot is in and their users
- 'irc3.plugins.command', # what does this do?
]
def __init__(self, bot):
@@ -27,6 +30,12 @@ class Plugin(object):
"""triggered after the server sent the MOTD (require core plugin)"""
logger.debug("inside server_ready(), kwargs: %s" % kwargs)
+ logger.info("Identifying with %s" % settings.IRCBOT_NICKSERV_MASK)
+ self.bot.privmsg(settings.IRCBOT_NICKSERV_MASK, "identify %s %s" % (settings.IRCBOT_NICK, settings.IRCBOT_NICKSERV_PASSWORD))
+
+ logger.info("Calling self.bot.do_stuff() in %s seconds.." % settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS)
+ self.bot.loop.call_later(settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS, self.bot.do_stuff)
+
def connection_lost(self, **kwargs):
"""triggered when connection is lost"""
@@ -37,9 +46,6 @@ class Plugin(object):
"""triggered when connection is up"""
logger.debug("inside connection_made(), kwargs: %s" % kwargs)
- # wait 5 secs before starting the loop to check for outgoing messages
- self.bot.loop.call_later(settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS, self.bot.get_outgoing_messages)
-
###############################################################################################
### decorated irc3 event methods
@@ -49,16 +55,38 @@ class Plugin(object):
"""triggered when there is a join part or quit on a channel the bot is in"""
logger.debug("inside on_join_part_quit(), kwargs: %s" % kwargs)
+ # TODO: on part or quit check if the bot is the only remaining member of a channel,
+ # if so, check if the channel should be managed, and if so, part and join the channel
+ # to gain @ and register with ChanServ
+
+
+ @irc3.event(irc3.rfc.JOIN)
+ def on_join(self, mask, channel, **kwargs):
+ """Triggered when a channel is joined by someone, including the bot itself"""
+ if mask.nick == self.bot.nick:
+ # the bot just joined a channel
+ if channel in self.get_managed_team_channels() or channel == settings.IRCBOT_PUBLIC_CHANNEL or channel == settings.IRCBOT_VOLUNTEER_CHANNEL:
+ logger.debug("Just joined a channel I am supposed to be managing, asking ChanServ for info about %s" % channel)
+ self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "info %s" % channel)
+ return
+
@irc3.event(irc3.rfc.PRIVMSG)
def on_privmsg(self, **kwargs):
"""triggered when a privmsg is sent to the bot or to a channel the bot is in"""
+ # we only handle NOTICEs for now
+ if kwargs['event'] != "NOTICE":
+ return
+
logger.debug("inside on_privmsg(), kwargs: %s" % kwargs)
- # nickserv
- if kwargs['mask'] == "NickServ!NickServ@services.baconsvin.org" and kwargs['event'] == "NOTICE" and kwargs['data'] == "This nickname is registered. Please choose a different nickname, or identify via \x02/msg NickServ identify
@@ -54,10 +54,17 @@ Info | {{ block.super }}
+ {% if request.user in category.team.responsible_members.all %}
+
+ Edit
+
+ {% endif %}
+
-
{{ item.body|commonmark }}
+{{ item.body|trustedcommonmark }}
{{ news_item.title }} {{ news_item.published_at|date:"Y-m-d" }}
+ +
Get BornHack news as a RSS feed
+
+{% endif %} {% for item in news_items %}
{{ item.title }} {{ item.published_at|date:"Y-m-d" }}
{% endif %} diff --git a/src/news/urls.py b/src/news/urls.py index 766b4e3c..af6127ad 100644 --- a/src/news/urls.py +++ b/src/news/urls.py @@ -1,10 +1,11 @@ -from django.conf.urls import url +from django.urls import path from . import views - +app_name = 'news' urlpatterns = [ - url(r'^$', views.NewsIndex.as_view(), kwargs={'archived': False}, name='index'), - url(r'^archive/$', views.NewsIndex.as_view(), kwargs={'archived': True}, name='archive'), - url(r'(?P
- {% endif %} + {% for resp in team.responsible_members.all %} + {{ resp.profile.get_public_credit_name }}
{% endfor %} - {% if team.anoncount and team.anoncount != team.approvedmembers.count %} - plus {{ team.anoncount }} anonymous member(s). +
+ {% endif %} + {% empty %} + No team members + {% endfor %} + {% if team.unnamed_members %} + {% if team.unnamed_members.count < team.regular_members.count %}Plus {% endif %}{{ team.unnamed_members.count }} anonymous member(s). {% endif %}
- Note! This Call for Speakers is no longer relevant. It is kept here for historic purposes.
-
-{% endif %}
-
-BornHack 2016: Call for Speakers
- -BornHack 2016 is a 7 days outdoor technology tent camping festival that will take place from the 27th of August to the 3rd of September 2016 on the island of Bornholm in Denmark. It is first time that BornHack will take place and it is our goal to make BornHack a yearly recurring event with 100 to 350 participants.
- -We are looking for gifted, entertaining and technically enlightening speakers to host talks, lightning talks and workshops at BornHack.
- -Please reach out to us on speakers@bornhack.dk with a title, abstract, biography, an optional picture of yourself and whether it is a regular talk, lightning talk, workshop or something entirely different. Please ensure that all information is in English. The submitted information will be published both as a news entry and in the official event program on our website, if the submission is accepted.
- -We are very open to different topics. We expect that the majority of the presentation at BornHack will be on security, networking, programming, distributed systems, privacy, and how these technologies relate to society.
- -The ticket shop for BornHack 2016 is already open and available at https://bornhack.dk/shop/ - please make sure you have also read our Code of Conduct.
- -Regular Talk
- -Regular talks are 45 minutes of presentation, 10 minutes of questions from the audience followed by 5 minutes of preparation for setting up the next speaker.
- -Please bring your own laptop with your presentation on; it should have an HDMI socket and we will provide the cable to the projector. We do not guarantee that audio will work, even if your laptop supports that.
- -We will provide you with a one-day entrance ticket free of charge, but due to our limited funds, you would have to pay for transportation to and from the event yourself. We also encourage you to participate for the entire week, but you would also have to pay for the ticket yourself.
- -Lightning Talk
- -Lightning talks are 10 minutes of presentation. A laptop will be connected to the projector at the location of the presentations.
- -A lightning talk is an excellent opportunity for inexperienced speakers to present a topic that you find interesting.
- -You MUST buy yourself an entrance ticket to host a lightning talk; we are unable to offer free tickets for everyone that gives a lightning talk.
- -Workshop
- -We have two workshop areas that will be able to host workshops for approximately 20 people per room. Workshops can be up to 3 hours per slot and can be extended for daily workshops.
- -You MUST buy yourself an entrance ticket to host a workshop; we are unable to offer free tickets for everyone that hosts a workshop.
- -Contact Information
- -The BornHack speakers team can be contacted via speakers@bornhack.dk - for general information reach out to the info team via info@bornhack.dk
- -We are also reachable via IRC in #BornHack on irc.baconsvin.org or 6nbtgccn5nbcodn3.onion - both listening for TLS connections on port 6697.
- -For more information, please have a look at https://bornhack.dk/ or follow us on Twitter at @bornhax.
-{% endblock %} diff --git a/src/program/templates/bornhack-2017_call_for_speakers.html b/src/program/templates/bornhack-2017_call_for_speakers.html deleted file mode 100644 index 80e03280..00000000 --- a/src/program/templates/bornhack-2017_call_for_speakers.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends 'program_base.html' %} - -{% block title %} -Call for Speakers | {{ block.super }} -{% endblock %} - -{% block program_content %} - -{% if not camp.call_for_speakers_open %} -
- Note! This Call for Speakers is no longer relevant. It is kept here for historic purposes.
-
-{% endif %}
-
-Call for Speakers
-We are looking for gifted, talented, humourous, technically enlightened speakers to host talks, lightning talks, and workshops at BornHack.
- -We are very open to different topics. We expect that the majority of the presentation at BornHack will be on security, networking, programming, distributed systems, privacy, and how these technologies relate to society.
- -BornHack is trying to be an inclusive event so please make sure you have read and understood our Code of Conduct.
- -Regular Talk
-Regular talks are 45 minutes of presentation, 10 minutes of questions from the audience followed by 5 minutes of preparation for setting up the next speaker.
- -Please bring your own laptop with your presentation on; it should have an ordinary HDMI output and we will provide the cable to the projector. We do not guarantee that audio will work, even if your laptop supports it - please reach out to us early if this is a requirement.
- -We will provide speakers with a one-day entrance ticket free of charge, but due to our limited funds, you would have to pay for transportation to and from the event yourself. We also encourage speakers to participate for the entire week, but you will have to pay for the full ticket yourself.
- -Lightning Talk
-Lightning talks are 10 minutes of presentation. A laptop will be connected to the projector at the location of the presentations.
- -A lightning talk is an excellent opportunity for inexperienced speakers to share an interesting idea, presentation, or maybe just a small story.
- -You must buy an entrance ticket to host a lightning talk; we are unable to offer free tickets for lightning talks.
- -Workshops
-We have two workshop areas that will be able to host workshops for approximately 20 people per room. Workshops can be up to 3 hours per slot and can be extended to full day workshops.
- -You must buy an entrance ticket to host a workshop; we are unable to offer free tickets for workshops.
- -Submitting Content
-Please submit content for BornHack 2017 as early as possible. You can submit content via our website:
- --
-
- Create a user account on the BornHack website -
- Visit the proposals page -
- Propose a new speaker -
- Propose a new event -
We will review incoming proposals and notify you as early as possible on whether the proposal was accepted or not. Proposals submitted before 1st of July will be notified by us no later than the 16th of July. Late submissions are welcome, but we might be running low on available slots at that time.
- -Contact Information
-The BornHack content team can be reached at content@bornhack.dk - for general questions regarding the event please reach out to the info team at info@bornhack.dk
- -We are reachable via IRC in #BornHack on irc.baconsvin.org (6nbtgccn5nbcodn3.onion) on port 6697 with TLS, you can also follow us on Twitter at @bornhax.
- -{% endblock %} diff --git a/src/program/templates/bornhack-2019_call_for_speakers.html b/src/program/templates/bornhack-2019_call_for_speakers.html deleted file mode 100644 index 4a5180a5..00000000 --- a/src/program/templates/bornhack-2019_call_for_speakers.html +++ /dev/null @@ -1 +0,0 @@ -program/templates/bornhack-2019_call_for_speakers.html \ No newline at end of file diff --git a/src/program/templates/bornhack-2018_call_for_speakers.html b/src/program/templates/bornhack-2020_call_for_speakers.html similarity index 100% rename from src/program/templates/bornhack-2018_call_for_speakers.html rename to src/program/templates/bornhack-2020_call_for_speakers.html diff --git a/src/program/templates/call_for_participation.html b/src/program/templates/call_for_participation.html new file mode 100644 index 00000000..be660949 --- /dev/null +++ b/src/program/templates/call_for_participation.html @@ -0,0 +1,22 @@ +{% extends 'program_base.html' %} +{% load commonmark %} + +{% block title %} +Call for Participation | {{ block.super }} +{% endblock %} + +{% block program_content %} + +{% if not camp.call_for_participation_open %} +
+ Note! This Call for Particilation is not open.
+
+{% endif %}
+
+{% if not camp.call_for_participation %}
+This CFP has not been written yet.
+{% else %} +{{ camp.call_for_participation|trustedcommonmark }} +{% endif %} + +{% endblock %} diff --git a/src/program/templates/combined_proposal_select_person.html b/src/program/templates/combined_proposal_select_person.html new file mode 100644 index 00000000..a57fd5dd --- /dev/null +++ b/src/program/templates/combined_proposal_select_person.html @@ -0,0 +1,33 @@ +{% extends 'program_base.html' %} + +{% block title %} +Use Existing {{ eventtype.host_title }} or Add New? | {{ block.super }} +{% endblock %} + +{% block program_content %} + +Use Existing {{ eventtype.host_title }}?
+ +Pick a {{ eventtype.host_title }} from the list below, or press the button at the bottom to add a new {{ eventtype.host_title }} for this {{ eventtype.name }}.
+ +
+
+
+ Add New {{ eventtype.host_title }}
+ Cancel
+{% endblock %}
+
diff --git a/src/program/templates/combined_proposal_submit.html b/src/program/templates/combined_proposal_submit.html
new file mode 100644
index 00000000..aed9a73d
--- /dev/null
+++ b/src/program/templates/combined_proposal_submit.html
@@ -0,0 +1,16 @@
+{% extends 'program_base.html' %}
+{% load bootstrap3 %}
+
+{% block program_content %}
+
+
+ Use an Existing {{ eventtype.host_title }}
+
+
+
+ {% for speakerproposal in speakerproposal_list %}
+
+
+ + Use {{ speakerproposal.name }} as {{ eventtype.host_title }} +
+ + {% endfor %} +Submit {{ camp.title }} {{ eventtype.name }}
+ + + +{% endblock program_content %} + diff --git a/src/program/templates/event_list.html b/src/program/templates/event_list.html index e1d53a74..3389fe50 100644 --- a/src/program/templates/event_list.html +++ b/src/program/templates/event_list.html @@ -20,17 +20,17 @@ {% for event in event_list %} {% if event.event_type.include_in_event_list %}+ {{ speaker.name }}
{% empty %} N/A {% endfor %} diff --git a/src/program/templates/event_proposal_add_person.html b/src/program/templates/event_proposal_add_person.html new file mode 100644 index 00000000..ee8a65a5 --- /dev/null +++ b/src/program/templates/event_proposal_add_person.html @@ -0,0 +1,15 @@ +{% extends 'program_base.html' %} +{% load bootstrap3 %} + +{% block program_content %} +
Add {{ eventproposal.event_type.host_title }} {{ speakerproposal.name }} to {{ eventproposal.title }}
+ +Really add {{ speakerproposal.name }} as {{ eventproposal.event_type.host_title }} for {{ eventproposal.title }}? +
+{% endblock program_content %} + diff --git a/src/program/templates/event_proposal_remove_person.html b/src/program/templates/event_proposal_remove_person.html new file mode 100644 index 00000000..dd1ebcae --- /dev/null +++ b/src/program/templates/event_proposal_remove_person.html @@ -0,0 +1,15 @@ +{% extends 'program_base.html' %} +{% load bootstrap3 %} + +{% block program_content %} +Remove "{{ speakerproposal.name }}" from "{{ eventproposal.title }}"?
+Really remove this {{ eventproposal.event_type.host_title }} from this event?
+ + + +{% endblock program_content %} + diff --git a/src/program/templates/event_proposal_select_person.html b/src/program/templates/event_proposal_select_person.html new file mode 100644 index 00000000..3c77bde4 --- /dev/null +++ b/src/program/templates/event_proposal_select_person.html @@ -0,0 +1,33 @@ +{% extends 'program_base.html' %} + +{% block title %} +Add {{ eventproposal.event_type.host_title }} to {{ eventproposal.title }} | {{ block.super }} +{% endblock %} + +{% block program_content %} + +Add New {{ eventproposal.event_type.host_title }} to {{ eventproposal.title }}
+ +You are adding a new {{ eventproposal.event_type.host_title }} to {{ eventproposal.title }}. Either pick an existing {{ eventproposal.event_type.host_title }} from the list below, or press the button to create a new {{ eventproposal.event_type.host_title }}.
+ +
+
+
+ Add New {{ eventproposal.event_type.host_title }}
+ Cancel
+{% endblock %}
+
diff --git a/src/program/templates/event_proposal_type_select.html b/src/program/templates/event_proposal_type_select.html
new file mode 100644
index 00000000..40e730e0
--- /dev/null
+++ b/src/program/templates/event_proposal_type_select.html
@@ -0,0 +1,10 @@
+{% extends 'program_base.html' %}
+
+{% block title %}
+Select Event Type | {{ block.super }}
+{% endblock %}
+
+{% block program_content %}
+{% include 'includes/event_proposal_type_select.html' %}
+{% endblock %}
+
diff --git a/src/program/templates/event_type_select.html b/src/program/templates/event_type_select.html
new file mode 100644
index 00000000..40e730e0
--- /dev/null
+++ b/src/program/templates/event_type_select.html
@@ -0,0 +1,10 @@
+{% extends 'program_base.html' %}
+
+{% block title %}
+Select Event Type | {{ block.super }}
+{% endblock %}
+
+{% block program_content %}
+{% include 'includes/event_proposal_type_select.html' %}
+{% endblock %}
+
diff --git a/src/program/templates/eventproposal_detail.html b/src/program/templates/eventproposal_detail.html
index d1988d18..d24c5e9e 100644
--- a/src/program/templates/eventproposal_detail.html
+++ b/src/program/templates/eventproposal_detail.html
@@ -1,24 +1,22 @@
{% extends 'program_base.html' %}
-{% load commonmark %}
{% block program_content %}
-
+
+ Existing Artists
+
+
+
+ {% for speakerproposal in speakerproposal_list %}
+
+
+ + Add {{ speakerproposal.name }} to {{ eventproposal.title }} +
+ + {% endfor %} +{{ camp.title }} Event Proposal Details
- --
-
- Status: {{ eventproposal.proposal_status }} -
- ID: {{ eventproposal.uuid }} -
-
+
+
diff --git a/src/program/templates/includes/event_proposal_type_select.html b/src/program/templates/includes/event_proposal_type_select.html
new file mode 100644
index 00000000..0a5d3d9d
--- /dev/null
+++ b/src/program/templates/includes/event_proposal_type_select.html
@@ -0,0 +1,30 @@
+
+
+
diff --git a/src/program/templates/includes/program_menu.html b/src/program/templates/includes/program_menu.html
new file mode 100644
index 00000000..d5439a8b
--- /dev/null
+++ b/src/program/templates/includes/program_menu.html
@@ -0,0 +1,12 @@
+ Schedule
+ Events
+ Speakers
+ Call for Participation
+ {% if request.user.is_authenticated %}
+ {% if camp.call_for_participation_open %}
+ Submit Proposal
+ {% else %}
+ View Proposals
+ {% endif %}
+ {% endif %}
+
diff --git a/src/program/templates/includes/speaker_proposal_table.html b/src/program/templates/includes/speaker_proposal_table.html
new file mode 100644
index 00000000..4c6cbbb4
--- /dev/null
+++ b/src/program/templates/includes/speaker_proposal_table.html
@@ -0,0 +1,47 @@
+
+
+
diff --git a/src/program/templates/includes/speakerproposal_detail.html b/src/program/templates/includes/speakerproposal_detail.html
new file mode 100644
index 00000000..f3eba71e
--- /dev/null
+++ b/src/program/templates/includes/speakerproposal_detail.html
@@ -0,0 +1,40 @@
+{% load commonmark %}
+
+
+
diff --git a/src/program/templates/noscript_schedule_view.html b/src/program/templates/noscript_schedule_view.html
index c1dfdda5..af36423b 100644
--- a/src/program/templates/noscript_schedule_view.html
+++ b/src/program/templates/noscript_schedule_view.html
@@ -26,7 +26,7 @@
{{ instance.when.lower|date:"H:i" }}-{{ instance.when.upper|date:"H:i" }}
- {{ instance.event.title }}
+ {{ instance.event.title }}
{{ instance.location.name }}
{% endfor %}
diff --git a/src/program/templates/program_base.html b/src/program/templates/program_base.html
index 64887332..13d6d3e2 100644
--- a/src/program/templates/program_base.html
+++ b/src/program/templates/program_base.html
@@ -6,20 +6,10 @@
-
-
+{% if camp.call_for_participation_open %}
+ {% include 'includes/event_proposal_type_select.html' %}
{% else %}
-
- ICS
+ ICS
@@ -88,7 +88,7 @@
{{ eventproposal.title }}
-
- {{ eventproposal.abstract|commonmark }}
-
+{% if not camp.call_for_participation_open %}
+
+ Note! This Call for Particilation is not open.
+{% endif %}
+
+Details for {{ eventproposal.title }}
+ +{% include 'includes/eventproposal_detail.html' %}- Back to List + Back to List + {% if camp.call_for_participation_open and not camp.read_only %} + Delete + {% endif %}
{% endblock program_content %} diff --git a/src/program/templates/eventproposal_form.html b/src/program/templates/eventproposal_form.html index 26a36643..c806a7ba 100644 --- a/src/program/templates/eventproposal_form.html +++ b/src/program/templates/eventproposal_form.html @@ -2,12 +2,15 @@ {% load bootstrap3 %} {% block program_content %} -{% if object %}Update{% else %}Create{% endif %} {{ camp.title }} Event Proposal
+{% if speaker %} +Submit new {{ event_type.name }} by {{ speaker.name }}
+{% else %} +{% if object %}Update{% else %}Create{% endif %} {{ camp.title }} {{ event_type.name }}
+{% endif %} - {% endblock program_content %} diff --git a/src/program/templates/eventproposal_submit.html b/src/program/templates/eventproposal_submit.html deleted file mode 100644 index 25d4d6ea..00000000 --- a/src/program/templates/eventproposal_submit.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends 'program_base.html' %} -{% load bootstrap3 %} - -{% block program_content %} -Confirm Submission
- - -{% endblock program_content %} - diff --git a/src/program/templates/includes/event_proposal_table.html b/src/program/templates/includes/event_proposal_table.html new file mode 100644 index 00000000..531423fa --- /dev/null +++ b/src/program/templates/includes/event_proposal_table.html @@ -0,0 +1,43 @@ +| Title | +Type | +URLs | +People | +Track | +Status | + {% if request.resolver_match.app_name == "program" %} +Available Actions | + {% endif %} +
|---|---|---|---|---|---|---|
| {{ eventproposal.title }} | +{{ eventproposal.event_type }} | +{% for url in eventproposal.urls.all %} + {% empty %}N/A{% endfor %} | ++ {% for person in eventproposal.speakers.all %} + {% if request.resolver_match.app_name == "program" %} + + {% else %} + + {% endif %} + {% endfor %} + | +{{ eventproposal.track.name }} | +{{ eventproposal.proposal_status }} | + {% if request.resolver_match.app_name == "program" %} ++ + Details + + | + {% endif %} +
+
+
diff --git a/src/program/templates/includes/eventproposal_detail.html b/src/program/templates/includes/eventproposal_detail.html
new file mode 100644
index 00000000..9aeb715e
--- /dev/null
+++ b/src/program/templates/includes/eventproposal_detail.html
@@ -0,0 +1,61 @@
+{% load commonmark %}
+
+
+
+ Submit New Proposal{% if speaker %} for {{ speaker.name }}{% endif %}
+
+
+What would {% if speaker %}{{ speaker.name }}{% else %}you{% endif %} like to host?
+ {% if speaker %} +You are submitting a new proposal for {{ speaker.name }}. Please begin by selecting the type of proposal below:
+ {% else %} +To submit content for {{ camp.title }} please begin by selecting the type of event below:
+ {% endif %} +
+ {% for eventtype in eventtype_list %}
+ {% if speaker %}
+
+ {% else %}
+
+ {% endif %}
+
+ + + {{ eventtype.name }} +
+ {% if eventtype.description %}{{ eventtype.description }}
{% endif %} + + {% endfor %} +If you have questions or experience problems submitting proposals here please let us know on IRC or by mail. You can also send an email with your proposal and the Content team will take care of creating it in the system.
+
+
+
+
+
+ Title: {{ eventproposal.title }}
+ ID: {{ eventproposal.uuid }}
+ Status: {{ eventproposal.proposal_status }}
+ Duration: {{ eventproposal.duration|default:"Not defined" }}
+
++ ID: {{ eventproposal.uuid }}
+ Status: {{ eventproposal.proposal_status }}
+ Duration: {{ eventproposal.duration|default:"Not defined" }}
+
+
+
+Abstract
+
+ {{ eventproposal.abstract|untrustedcommonmark }}
+ {% if camp.call_for_participation_open and not camp.read_only and request.resolver_match.app_name == "program" %}
+ Modify
+ {% endif %}
+
+
+
+
+Notes
+
+ {{ eventproposal.submission_notes|untrustedcommonmark }}
+
+
+
+
+URLs
+
+ {% if eventproposal.urls.exists %}
+ {% include 'includes/eventproposalurl_table.html' %}
+ {% else %}
+ Nothing found.
+ {% endif %}
+ {% if camp.call_for_participation_open and not camp.read_only and request.resolver_match.app_name == "program" %}
+ Add URL
+ {% endif %}
+
+
+
+
diff --git a/src/program/templates/includes/eventproposalurl_table.html b/src/program/templates/includes/eventproposalurl_table.html
new file mode 100644
index 00000000..0208a8ad
--- /dev/null
+++ b/src/program/templates/includes/eventproposalurl_table.html
@@ -0,0 +1,25 @@
+{{ eventproposal.event_type.host_title }} List
+
+ {% if eventproposal.speakers.exists %}
+ {% include 'includes/speaker_proposal_table.html' with speakerproposals=eventproposal.speakers.all %}
+ {% else %}
+ Nothing found.
+ {% endif %}
+ {% if camp.call_for_participation_open and not camp.read_only and request.resolver_match.app_name == "program" %}
+ {% if eventproposal.get_available_speakerproposals.exists %}
+ Add {{ eventproposal.event_type.host_title }}
+ {% else %}
+ Add {{ eventproposal.event_type.host_title }}
+ {% endif %}
+ {% endif %}
+
+| Type | +URL | + {% if not camp.read_only and request.resolver_match.app_name == "program" and eventproposal.user == request.user %} +Available Actions | + {% endif %} +
|---|---|---|
| {{ url.urltype.name }} | +{{ url }} | ++ {% if not camp.read_only and request.resolver_match.app_name == "program" and eventproposal.user == request.user %} + Update + Delete + {% endif %} + | +
| Name | +Events | +URLs | +Status | + {% if request.resolver_match.app_name == "program" %} +Available Actions | + {% endif %} +
|---|---|---|---|---|
| {{ speakerproposal.name }} | ++ {% if speakerproposal.eventproposals.all %} + {% for ep in speakerproposal.eventproposals.all %} + + {% endfor %} + {% else %} + N/A + {% endif %} + | ++ {% for url in speakerproposal.urls.all %} + + {% empty %} + N/A + {% endfor %} + | +{{ speakerproposal.proposal_status }} | + {% if request.resolver_match.app_name == "program" %} ++ + Details + + {% if camp.call_for_participation_open and not camp.read_only and eventproposal and eventproposal.speakers.count > 1 %} + Remove {{ eventproposal.event_type.host_title }} + {% endif %} + | + {% endif %} +
+
+
+{{ speakerproposal.name }}
+
+ {{ speakerproposal.biography|untrustedcommonmark }}
+ {% if camp.call_for_participation_open and not camp.read_only and request.resolver_match.app_name == "program" %}
+ Modify
+ {% endif %}
+
+
+
+
+
+URLs for {{ speakerproposal.name }}
+
+ {% if speakerproposal.urls.exists %}
+ {% include 'includes/speakerproposalurl_table.html' %}
+ {% else %}
+ Nothing found.
+ {% endif %}
+ {% if camp.call_for_participation_open and not camp.read_only and request.resolver_match.app_name == "program" %}
+ Add URL
+ {% endif %}
+
+
+
+
diff --git a/src/program/templates/includes/speakerproposalurl_table.html b/src/program/templates/includes/speakerproposalurl_table.html
new file mode 100644
index 00000000..db01bae9
--- /dev/null
+++ b/src/program/templates/includes/speakerproposalurl_table.html
@@ -0,0 +1,25 @@
+Events for {{ speakerproposal.name }}
+
+ {% if speakerproposal.eventproposals.exists %}
+ {% include 'includes/event_proposal_table.html' with eventproposals=speakerproposal.eventproposals.all %}
+ {% else %}
+ Nothing found.
+ {% endif %}
+ {% if camp.call_for_participation_open and not camp.read_only and request.resolver_match.app_name == "program" %}
+ Add New Event
+ {% endif %}
+
+| Type | +URLs | + {% if camp.call_for_participation_open and not camp.read_only and request.resolver_match.app_name == "program" %} +Available Actions | + {% endif %} +
|---|---|---|
| {{ url.urltype.name }} | +{{ url }} | + {% if camp.call_for_participation_open and not camp.read_only and request.resolver_match.app_name == "program" %} ++ Update + Delete + | + {% endif %} +
- Schedule
- Events
- Speakers
- {% if request.user.is_authenticated %}
- Your Proposals
- {% endif %}
+ {% include 'includes/program_menu.html' %}
diff --git a/src/program/templates/proposal_delete.html b/src/program/templates/proposal_delete.html new file mode 100644 index 00000000..89842635 --- /dev/null +++ b/src/program/templates/proposal_delete.html @@ -0,0 +1,19 @@ +{% extends 'program_base.html' %} +{% load bootstrap3 %} + +{% block program_content %} +{% if object.name %} +
Delete "{{ object.name }}"
+{% else %} +Delete "{{ object.title }}"
+{% endif %} +Really delete this proposal? This action cannot be undone.
+ + + +{% endblock program_content %} + diff --git a/src/program/templates/proposal_list.html b/src/program/templates/proposal_list.html index 35221261..13245d8f 100644 --- a/src/program/templates/proposal_list.html +++ b/src/program/templates/proposal_list.html @@ -5,98 +5,39 @@ Proposals | {{ block.super }} {% endblock %} {% block program_content %} -Submitting
-To submit a talk or other event for {{ camp.title }} you need to to the following:
--
-
- First you propose one or more speakers. Most events just have one speaker, but some events might have two or more. Be sure to create everyone before going on to step 2. -
- Then you propose one or more events. The Propose New Event form will allow you to choose the speaker(s) you proposed. -
If you experience problems submitting proposals here please let us know on IRC or by mail. You can also send an email with your proposal and the Content team will take care of creating it in the system.
- -Your {{ camp.title }} Speaker Proposals
-{% if speakerproposal_list %} -| Name | -Status | -Actions | -
|---|---|---|
| {{ speakerproposal.name }} | -{{ speakerproposal.proposal_status }} | -- Details - {% if not camp.read_only %} - Modify - {% if speakerproposal.proposal_status == "pending" or speakerproposal.proposal_status == "approved" %} - Submit - {% else %} - Submit - {% endif %} - Delete - {% endif %} - | -
No speaker proposals found
+
+ Note! This Call for Particilation is not open.
+
{% endif %}
-{% if not camp.read_only and camp.call_for_speakers_open %}
-Propose New Speaker
-{% endif %}
-
-
-
+
{% endif %}
{% endblock %}
diff --git a/src/program/templates/schedule_base.html b/src/program/templates/schedule_base.html
index a7b3ebd7..063af2ce 100644
--- a/src/program/templates/schedule_base.html
+++ b/src/program/templates/schedule_base.html
@@ -31,8 +31,8 @@
+
+ Existing Proposals
+
+
-
-
-{% else %}
-
-{% if not camp.read_only and camp.call_for_speakers_open %} - Propose New Event +
+People
+ {% if speakerproposal_list %} + {% include 'includes/speaker_proposal_table.html' with speakerproposals=speakerproposal_list %} + {% else %} + Nothing found. + {% endif %} -Your {{ camp.title }} Event Proposals
-{% if eventproposal_list %} -| Title | -Type | -Status | -Actions | -
|---|---|---|---|
| {{ eventproposal.title }} | -{{ eventproposal.event_type }} | -{{ eventproposal.proposal_status }} | -- Details - {% if not camp.read_only %} - Modify - {% if eventproposal.proposal_status == "pending" %} - Submit - {% else %} - Submit - {% endif %} - Delete - {% endif %} - | -
No event proposals found
-{% endif %} +-{% if not camp.read_only and camp.call_for_speakers_open %} - Propose New Event +
Events
+ {% if eventproposal_list %} + {% include 'includes/event_proposal_table.html' with eventproposals=eventproposal_list %} + {% else %} + Nothing found. + {% endif %} +-{% url 'schedule_index' camp_slug=camp.slug as baseurl %} +{% url 'program:schedule_index' camp_slug=camp.slug as baseurl %} diff --git a/src/program/templates/speaker_detail.html b/src/program/templates/speaker_detail.html index 1c53a444..387a814a 100644 --- a/src/program/templates/speaker_detail.html +++ b/src/program/templates/speaker_detail.html @@ -5,19 +5,21 @@
{{ speaker.name }}
-{% if speaker.picture_large and speaker.picture_small %}
-
+ +
@@ -28,11 +30,11 @@ {{ event.event_type.name }} - {{ event.title }} + {{ event.title }} - {{ event.abstract|commonmark }} + {{ event.abstract|untrustedcommonmark }} -
{% empty %} No events registered for this speaker yet diff --git a/src/program/templates/speaker_list.html b/src/program/templates/speaker_list.html index 72f53dec..bfdad26b 100644 --- a/src/program/templates/speaker_list.html +++ b/src/program/templates/speaker_list.html @@ -13,12 +13,11 @@
-{{ speaker.biography|commonmark }}
-
-
-
- 
-
+
+
+
+{{ speaker.biography|untrustedcommonmark }}
+ +
URLs for {{ speaker.name }}
+{% if speaker.urls.exists %} + {% for url in speaker.urls.all %} +{{ url.urltype }}: {{ url.url }}
+ {% endfor %} {% else %} -{{ speaker.biography|commonmark }} +No URLs found.
{% endif %}@@ -28,11 +30,11 @@ {{ event.event_type.name }} - {{ event.title }} + {{ event.title }} - {{ event.abstract|commonmark }} + {{ event.abstract|untrustedcommonmark }} -
Instances
+Scheduled Instances of "{{ event.title }}"
-
{% for ei in event.instances.all %}
- {{ ei.when.lower|date:"l M. d H:i" }} - {{ ei.when.upper|date:"H:i" }} @@ -40,7 +42,6 @@ No instances scheduled yet {% endfor %}
{% empty %} No events registered for this speaker yet diff --git a/src/program/templates/speaker_list.html b/src/program/templates/speaker_list.html index 72f53dec..bfdad26b 100644 --- a/src/program/templates/speaker_list.html +++ b/src/program/templates/speaker_list.html @@ -13,12 +13,11 @@
{% for speaker in speaker_list %}
-
- {{ speaker.name }} ({{ speaker.events.all.count }} event{{ speaker.events.all.count|pluralize }})
-
+
+ {{ speaker.name }} {% for event in speaker.events.all %} {% endfor %}
{% endfor %}
+{% else %}
+No speakers found for {{ camp.title }}
{% endif %} - - {% endblock program_content %} diff --git a/src/program/templates/speakerproposal_delete.html b/src/program/templates/speakerproposal_delete.html new file mode 100644 index 00000000..de47ab2d --- /dev/null +++ b/src/program/templates/speakerproposal_delete.html @@ -0,0 +1,15 @@ +{% extends 'program_base.html' %} +{% load bootstrap3 %} + +{% block program_content %} +Delete {{ object.name }}
+Really delete this proposal? This action cannot be undone.
+ + + +{% endblock program_content %} + diff --git a/src/program/templates/speakerproposal_detail.html b/src/program/templates/speakerproposal_detail.html index cf1ed7fb..451909e4 100644 --- a/src/program/templates/speakerproposal_detail.html +++ b/src/program/templates/speakerproposal_detail.html @@ -1,37 +1,24 @@ {% extends 'program_base.html' %} -{% load commonmark %} {% block program_content %} -{{ camp.title }} Speaker Proposal Details
- --
-
- Status: {{ speakerproposal.proposal_status }} -
- ID: {{ speakerproposal.uuid }} -
- /',
+ CombinedProposalSubmitView.as_view(),
+ name='proposal_combined_submit',
+ ),
+ path(
+ '/select_person/',
+ CombinedProposalPersonSelectView.as_view(),
+ name='proposal_combined_person_select',
+ ),
+ ]),
+ ),
+ path(
+ 'people/', include([
+ path(
+ '/',
+ SpeakerProposalDetailView.as_view(),
+ name='speakerproposal_detail'
+ ),
+ path(
+ '/update/',
+ SpeakerProposalUpdateView.as_view(),
+ name='speakerproposal_update'
+ ),
+ path(
+ '/delete/',
+ SpeakerProposalDeleteView.as_view(),
+ name='speakerproposal_delete'
+ ),
+ path(
+ '/add_event/',
+ EventProposalTypeSelectView.as_view(),
+ name='eventproposal_typeselect'
+ ),
+ path(
+ '/add_event//',
+ EventProposalCreateView.as_view(),
+ name='eventproposal_create'
+ ),
+ path(
+ '/add_url/',
+ UrlCreateView.as_view(),
+ name='speakerproposalurl_create'
+ ),
+ path(
+ '/urls//update/',
+ UrlUpdateView.as_view(),
+ name='speakerproposalurl_update'
+ ),
+ path(
+ '/urls//delete/',
+ UrlDeleteView.as_view(),
+ name='speakerproposalurl_delete'
+ ),
+ ])
+ ),
+ path(
+ 'events/', include([
+ path(
+ '/',
+ EventProposalDetailView.as_view(),
+ name='eventproposal_detail'
+ ),
+ path(
+ '/update/',
+ EventProposalUpdateView.as_view(),
+ name='eventproposal_update'
+ ),
+ path(
+ '/delete/',
+ EventProposalDeleteView.as_view(),
+ name='eventproposal_delete'
+ ),
+ path(
+ '/add_person/',
+ EventProposalSelectPersonView.as_view(),
+ name='eventproposal_selectperson'
+ ),
+ path(
+ '/add_person/new/',
+ SpeakerProposalCreateView.as_view(),
+ name='speakerproposal_create'
+ ),
+ path(
+ '/add_person//',
+ EventProposalAddPersonView.as_view(),
+ name='eventproposal_addperson'
+ ),
+ path(
+ '/remove_person//',
+ EventProposalRemovePersonView.as_view(),
+ name='eventproposal_removeperson'
+ ),
+ path(
+ '/add_url/',
+ UrlCreateView.as_view(),
+ name='eventproposalurl_create'
+ ),
+ path(
+ '/urls//update/',
+ UrlUpdateView.as_view(),
+ name='eventproposalurl_update'
+ ),
+ path(
+ '/urls//delete/',
+ UrlDeleteView.as_view(),
+ name='eventproposalurl_delete'
+ ),
+ ])
+ ),
+ ])
+ ),
+ path(
+ 'speakers/', include([
+ path(
+ '',
+ SpeakerListView.as_view(),
+ name='speaker_index'
+ ),
+ path(
+ '/',
+ SpeakerDetailView.as_view(),
+ name='speaker_detail'
+ ),
+ ]),
+ ),
+ path(
+ 'events/',
+ EventListView.as_view(),
+ name='event_index'
+ ),
+ # legacy CFS url kept on purpose to keep old links functional
+ path(
+ 'call-for-speakers/',
+ CallForParticipationView.as_view(),
+ name='call_for_speakers'
+ ),
+ path(
+ 'call-for-participation/',
+ CallForParticipationView.as_view(),
+ name='call_for_participation'
+ ),
+ path(
+ 'calendar',
+ ICSView.as_view(),
+ name='ics_calendar'
+ ),
+ # this must be the last URL here or the regex will overrule the others
+ path(
+ '/',
+ EventDetailView.as_view(),
+ name='event_detail'
+ ),
+]
+
diff --git a/src/program/views.py b/src/program/views.py
index acb08112..af900b29 100644
--- a/src/program/views.py
+++ b/src/program/views.py
@@ -1,45 +1,51 @@
-import datetime
import logging
-import os
+from collections import OrderedDict
from django.views.generic import ListView, TemplateView, DetailView, View
-from django.views.generic.edit import CreateView, UpdateView
+from django.views.generic.edit import CreateView, UpdateView, DeleteView
from django.conf import settings
-from django.views.decorators.http import require_safe
from django.http import Http404, HttpResponse
from django.utils.decorators import method_decorator
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib import messages
-from django.urls import reverse
-from django.db.models import Q
+from django.urls import reverse, reverse_lazy
from django.template import Engine, Context
-
+from django.shortcuts import redirect
+from django.shortcuts import get_object_or_404
+from betterforms.multiform import MultiModelForm
import icalendar
from camps.mixins import CampViewMixin
+from program.models import Url, UrlType
from .mixins import (
- CreateProposalMixin,
- EnsureUnapprovedProposalMixin,
EnsureUserOwnsProposalMixin,
EnsureWritableCampMixin,
- PictureViewMixin,
- EnsureCFSOpenMixin
+ EnsureCFPOpenMixin,
+ UrlViewMixin,
)
from .email import (
+ add_new_eventproposal_email,
+ add_new_speakerproposal_email,
add_speakerproposal_updated_email,
add_eventproposal_updated_email
)
from . import models
+from .forms import SpeakerProposalForm, EventProposalForm
+
+
logger = logging.getLogger("bornhack.%s" % __name__)
-############## ical calendar ########################################################
+###################################################################################################
+# ical calendar
class ICSView(CampViewMixin, View):
def get(self, request, *args, **kwargs):
- eventinstances = models.EventInstance.objects.filter(event__camp=self.camp)
+ eventinstances = models.EventInstance.objects.filter(
+ event__track__camp=self.camp
+ )
# Type query
type_query = request.GET.get('type', None)
@@ -90,7 +96,8 @@ class ICSView(CampViewMixin, View):
return response
-############## proposals ########################################################
+###################################################################################################
+# proposals list view
class ProposalListView(LoginRequiredMixin, CampViewMixin, ListView):
@@ -105,55 +112,139 @@ class ProposalListView(LoginRequiredMixin, CampViewMixin, ListView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
# also add eventproposals to the context
- context['eventproposal_list'] = models.EventProposal.objects.filter(camp=self.camp, user=self.request.user)
+ context['eventproposal_list'] = models.EventProposal.objects.filter(track__camp=self.camp, user=self.request.user)
+ context['eventtype_list'] = models.EventType.objects.filter(public=True)
return context
-class SpeakerProposalCreateView(LoginRequiredMixin, CampViewMixin, CreateProposalMixin, EnsureWritableCampMixin, EnsureCFSOpenMixin, CreateView):
+###################################################################################################
+# speakerproposal views
+
+
+class SpeakerProposalCreateView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureCFPOpenMixin, CreateView):
+ """ This view allows a user to create a new SpeakerProposal linked to an existing EventProposal """
model = models.SpeakerProposal
- fields = ['name', 'biography', 'picture_small', 'picture_large', 'submission_notes']
template_name = 'speakerproposal_form.html'
+ form_class = SpeakerProposalForm
+
+ def dispatch(self, request, *args, **kwargs):
+ """ Get the eventproposal object """
+ self.eventproposal = get_object_or_404(models.EventProposal, pk=kwargs['event_uuid'])
+ return super().dispatch(request, *args, **kwargs)
def get_success_url(self):
- return reverse('proposal_list', kwargs={'camp_slug': self.camp.slug})
+ return reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug})
+ def get_form_kwargs(self):
+ """
+ Set camp and eventtype for the form
+ """
+ kwargs = super().get_form_kwargs()
+ kwargs.update({
+ 'camp': self.camp,
+ 'eventtype': self.eventproposal.event_type
+ })
+ return kwargs
-class SpeakerProposalUpdateView(LoginRequiredMixin, CampViewMixin, EnsureUserOwnsProposalMixin, EnsureWritableCampMixin, EnsureCFSOpenMixin, UpdateView):
- model = models.SpeakerProposal
- fields = ['name', 'biography', 'picture_small', 'picture_large', 'submission_notes']
- template_name = 'speakerproposal_form.html'
-
- def get_success_url(self):
- return reverse('proposal_list', kwargs={'camp_slug': self.camp.slug})
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context['eventproposal'] = self.eventproposal
+ return context
def form_valid(self, form):
- if form.instance.proposal_status == models.UserSubmittedModel.PROPOSAL_PENDING:
- messages.warning(self.request, "Your speaker proposal has been reverted to status draft. Please submit it again when you are ready.")
- form.instance.proposal_status = models.UserSubmittedModel.PROPOSAL_DRAFT
+ # set user before saving
+ form.instance.user = self.request.user
+ form.instance.camp = self.camp
- if form.instance.proposal_status == models.UserSubmittedModel.PROPOSAL_APPROVED:
- messages.warning(self.request, "Your speaker proposal has been set to modified after approval. Please await approval of the changes.")
- form.instance.proposal_status = models.UserSubmittedModel.PROPOSAL_MODIFIED_AFTER_APPROVAL
- if not add_speakerproposal_updated_email(form.instance):
- logger.error(
- 'Unable to add update email to queue for speaker: {}'.format(form.instance)
- )
+ if not form.instance.email:
+ form.instance.email = self.request.user.email
- return super().form_valid(form)
+ speakerproposal = form.save()
+
+ # add speakerproposal to eventproposal
+ self.eventproposal.speakers.add(speakerproposal)
+
+ # send mail to content team
+ if not add_new_speakerproposal_email(speakerproposal):
+ logger.error("Unable to send email to content team after new speakerproposal")
+
+ return redirect(
+ reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug})
+ )
-class SpeakerProposalSubmitView(LoginRequiredMixin, CampViewMixin, EnsureUserOwnsProposalMixin, EnsureUnapprovedProposalMixin, EnsureWritableCampMixin, EnsureCFSOpenMixin, UpdateView):
+class SpeakerProposalUpdateView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureUserOwnsProposalMixin, EnsureCFPOpenMixin, UpdateView):
+ """
+ This view allows a user to update an existing SpeakerProposal.
+ """
model = models.SpeakerProposal
- fields = []
- template_name = 'speakerproposal_submit.html'
+ template_name = 'speakerproposal_form.html'
+ form_class = SpeakerProposalForm
- def get_success_url(self):
- return reverse('proposal_list', kwargs={'camp_slug': self.camp.slug})
+ def get_form_kwargs(self):
+ """
+ Set camp and eventtype for the form
+ """
+ kwargs = super().get_form_kwargs()
+ if self.get_object().eventproposals.count() == 1:
+ # determine which form to use based on the type of event associated with the proposal
+ eventtype = self.get_object().eventproposals.get().event_type
+ else:
+ # more than one eventproposal. If all events are the same type we can still show a non-generic form here
+ eventtypes = set()
+ for ep in self.get_object().eventproposals.all():
+ eventtypes.add(ep.event_type)
+ if len(eventtypes) == 1:
+ eventtype = self.get_object().eventproposals.get().event_type
+ else:
+ # more than one type of event for this person, return the generic speakerproposal form
+ eventtype = None
+
+ # add camp and eventtype to form kwargs
+ kwargs.update({
+ 'camp': self.camp,
+ 'eventtype': eventtype
+ })
+
+ return kwargs
def form_valid(self, form):
- form.instance.proposal_status = models.UserSubmittedModel.PROPOSAL_PENDING
- messages.info(self.request, "Your proposal has been submitted and is now pending approval")
- return super().form_valid(form)
+ """
+ Change the speakerproposal status to pending
+ """
+ # set proposal status to pending
+ form.instance.proposal_status = models.SpeakerProposal.PROPOSAL_PENDING
+ speakerproposal = form.save()
+
+ # send mail to content team
+ if not add_speakerproposal_updated_email(speakerproposal):
+ logger.error("Unable to send email to content team after speakerproposal update")
+
+ # message user and redirect
+ messages.info(self.request, "Your proposal is now pending approval by the content team.")
+ return redirect(reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug}))
+
+
+class SpeakerProposalDeleteView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureUserOwnsProposalMixin, EnsureCFPOpenMixin, DeleteView):
+ """
+ This view allows a user to delete an existing SpeakerProposal object, as long as it is not linked to any EventProposals
+ """
+ model = models.SpeakerProposal
+ template_name = 'proposal_delete.html'
+
+ def get(self, request, *args, **kwargs):
+ # do not permit deleting if this speakerproposal is linked to any eventproposals
+ if self.get_object().eventproposals.exists():
+ messages.error(request, "Cannot delete a person while it is associated with one or more eventproposals. Delete those first.")
+ return redirect(reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug}))
+
+ # continue with the request
+ return super().get(request, *args, **kwargs)
+
+ def get_success_url(self):
+ messages.success(self.request, "Proposal '%s' has been deleted." % self.object.name)
+ return reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug})
+
class SpeakerProposalDetailView(LoginRequiredMixin, CampViewMixin, EnsureUserOwnsProposalMixin, DetailView):
@@ -161,101 +252,379 @@ class SpeakerProposalDetailView(LoginRequiredMixin, CampViewMixin, EnsureUserOwn
template_name = 'speakerproposal_detail.html'
-@method_decorator(require_safe, name='dispatch')
-class SpeakerProposalPictureView(LoginRequiredMixin, CampViewMixin, EnsureUserOwnsProposalMixin, PictureViewMixin, DetailView):
+###################################################################################################
+# eventproposal views
+
+
+class EventProposalTypeSelectView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureCFPOpenMixin, ListView):
+ """
+ This view is for selecting the type of event to submit (when adding a new eventproposal to an existing speakerproposal)
+ """
+ model = models.EventType
+ template_name = 'event_type_select.html'
+
+ def dispatch(self, request, *args, **kwargs):
+ """ Get the speakerproposal object """
+ self.speaker = get_object_or_404(models.SpeakerProposal, pk=kwargs['speaker_uuid'])
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_queryset(self, **kwargs):
+ """ We only allow submissions of events with EventTypes where public=True """
+ return super().get_queryset().filter(public=True)
+
+ def get_context_data(self, *args, **kwargs):
+ """ Make speakerproposal object available in template """
+ context = super().get_context_data(**kwargs)
+ context['speaker'] = self.speaker
+ return context
+
+
+class EventProposalSelectPersonView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureCFPOpenMixin, ListView):
+ """
+ This view is for selecting an existing speakerproposal to add to an existing eventproposal
+ """
model = models.SpeakerProposal
+ template_name = 'event_proposal_select_person.html'
- def get(self, request, *args, **kwargs):
- # is the proposal owned by current user?
- if self.get_object().user != request.user:
- raise Http404()
+ def dispatch(self, request, *args, **kwargs):
+ """ Get EventProposal from url kwargs """
+ self.eventproposal = get_object_or_404(models.EventProposal, pk=kwargs['event_uuid'], user=request.user)
+ return super().dispatch(request, *args, **kwargs)
- # get and return the response
- response = self.get_picture_response('/public/speakerproposals/%(campslug)s/%(proposaluuid)s/%(filename)s' % {
- 'campslug': self.camp.slug,
- 'proposaluuid': self.get_object().uuid,
- 'filename': os.path.basename(self.picture.name),
+ def get_queryset(self, **kwargs):
+ """ Filter out any speakerproposals already added to this eventproposal """
+ return self.eventproposal.get_available_speakerproposals().all()
+
+ def get_context_data(self, *args, **kwargs):
+ """ Make eventproposal object available in template """
+ context = super().get_context_data(**kwargs)
+ context['eventproposal'] = self.eventproposal
+ return context
+
+
+class EventProposalAddPersonView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureCFPOpenMixin, UpdateView):
+ """
+ This view is for adding an existing speakerproposal to an existing eventproposal
+ """
+ model = models.EventProposal
+ template_name = 'event_proposal_add_person.html'
+ fields = []
+ pk_url_kwarg = 'event_uuid'
+
+ def dispatch(self, request, *args, **kwargs):
+ """ Get the speakerproposal object """
+ self.speakerproposal = get_object_or_404(models.SpeakerProposal, pk=kwargs['speaker_uuid'], user=request.user)
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_context_data(self, *args, **kwargs):
+ """ Make speakerproposal object available in template """
+ context = super().get_context_data(**kwargs)
+ context['speakerproposal'] = self.speakerproposal
+ return context
+
+ def form_valid(self, form):
+ form.instance.speakers.add(self.speakerproposal)
+ messages.success(self.request, "%s has been added as %s for %s" % (
+ self.speakerproposal.name,
+ form.instance.event_type.host_title,
+ form.instance.title
+ ))
+ return redirect(self.get_success_url())
+
+
+class EventProposalRemovePersonView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureCFPOpenMixin, UpdateView):
+ """
+ This view is for removing a speakerproposal from an existing eventproposal
+ """
+ model = models.EventProposal
+ template_name = 'event_proposal_remove_person.html'
+ fields = []
+ pk_url_kwarg = 'event_uuid'
+
+ def dispatch(self, request, *args, **kwargs):
+ """ Get the speakerproposal object and check a few things """
+ # get the speakerproposal object from URL kwargs
+ self.speakerproposal = get_object_or_404(models.SpeakerProposal, pk=kwargs['speaker_uuid'], user=request.user)
+ return super().dispatch(request, *args, **kwargs)
+
+
+ def get_context_data(self, *args, **kwargs):
+ """ Make speakerproposal object available in template """
+ context = super().get_context_data(**kwargs)
+ context['speakerproposal'] = self.speakerproposal
+ return context
+
+ def form_valid(self, form):
+ """ Remove the speaker from the event """
+ if self.speakerproposal not in self.get_object().speakers.all():
+ # this speaker is not associated with this event
+ raise Http404
+
+ if self.get_object().speakers.count() == 1:
+ messages.error(self.request, "Cannot delete the last person associalted with event!")
+ return redirect(self.get_success_url())
+
+ # remove speakerproposal from eventproposal
+ form.instance.speakers.remove(self.speakerproposal)
+ messages.success(self.request, "%s has been removed from %s" % (
+ self.speakerproposal.name,
+ self.get_object().title
+ ))
+ return redirect(self.get_success_url())
+
+ def get_success_url(self):
+ return reverse(
+ 'program:eventproposal_detail', kwargs={
+ 'camp_slug': self.camp.slug,
+ 'pk': self.get_object().uuid
})
- return response
-
-class EventProposalCreateView(LoginRequiredMixin, CampViewMixin, CreateProposalMixin, EnsureWritableCampMixin, EnsureCFSOpenMixin, CreateView):
+class EventProposalCreateView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureCFPOpenMixin, CreateView):
+ """
+ This view allows a user to create a new eventproposal linked to an existing speakerproposal
+ """
model = models.EventProposal
- fields = ['title', 'abstract', 'event_type', 'speakers', 'allow_video_recording', 'submission_notes']
template_name = 'eventproposal_form.html'
+ form_class = EventProposalForm
- def get_context_data(self, **kwargs):
+ def dispatch(self, request, *args, **kwargs):
+ """ Get the speakerproposal object """
+ self.speakerproposal = get_object_or_404(models.SpeakerProposal, pk=self.kwargs['speaker_uuid'])
+ self.event_type = get_object_or_404(models.EventType, slug=self.kwargs['event_type_slug'])
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_context_data(self, *args, **kwargs):
+ """ Make speakerproposal object available in template """
context = super().get_context_data(**kwargs)
- context['form'].fields['speakers'].queryset = models.SpeakerProposal.objects.filter(camp=self.camp, user=self.request.user)
- context['form'].fields['event_type'].queryset = models.EventType.objects.filter(public=True)
+ context['speaker'] = self.speakerproposal
+ context['event_type'] = self.event_type
return context
+ def get_form_kwargs(self):
+ """
+ Set camp and eventtype for the form
+ """
+ kwargs = super().get_form_kwargs()
+ kwargs.update({
+ 'camp': self.camp,
+ 'eventtype': self.event_type
+ })
+ return kwargs
-class EventProposalUpdateView(LoginRequiredMixin, CampViewMixin, EnsureUserOwnsProposalMixin, EnsureWritableCampMixin, EnsureCFSOpenMixin, UpdateView):
- model = models.EventProposal
- fields = ['title', 'abstract', 'event_type', 'speakers', 'allow_video_recording', 'submission_notes']
- template_name = 'eventproposal_form.html'
+ def form_valid(self, form):
+ # set camp and user for this eventproposal
+ eventproposal = form.save(user=self.request.user, event_type=self.event_type)
+
+ # add the speakerproposal to the eventproposal
+ eventproposal.speakers.add(self.speakerproposal)
+
+ # send mail to content team
+ if not add_new_eventproposal_email(eventproposal):
+ logger.error("Unable to send email to content team after new eventproposal")
+
+ # all good
+ return redirect(self.get_success_url())
def get_success_url(self):
- return reverse('proposal_list', kwargs={'camp_slug': self.camp.slug})
+ return reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug})
- def get_context_data(self, **kwargs):
+
+class EventProposalUpdateView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureUserOwnsProposalMixin, EnsureCFPOpenMixin, UpdateView):
+ model = models.EventProposal
+ template_name = 'eventproposal_form.html'
+ form_class = EventProposalForm
+
+ def get_form_kwargs(self):
+ """
+ Set camp and eventtype for the form
+ """
+ kwargs = super().get_form_kwargs()
+ kwargs.update({
+ 'camp': self.camp,
+ 'eventtype': self.get_object().event_type
+ })
+ return kwargs
+
+ def get_context_data(self, *args, **kwargs):
+ """ Make speakerproposal and eventtype objects available in the template """
context = super().get_context_data(**kwargs)
- context['form'].fields['speakers'].queryset = models.SpeakerProposal.objects.filter(camp=self.camp, user=self.request.user)
- context['form'].fields['event_type'].queryset = models.EventType.objects.filter(public=True)
+ context['event_type'] = self.get_object().event_type
return context
def form_valid(self, form):
- if form.instance.proposal_status == models.UserSubmittedModel.PROPOSAL_PENDING:
- messages.warning(self.request, "Your event proposal has been reverted to status draft. Please submit it again when you are ready.")
- form.instance.proposal_status = models.UserSubmittedModel.PROPOSAL_DRAFT
+ # set status to pending and save eventproposal
+ form.instance.proposal_status = models.EventProposal.PROPOSAL_PENDING
+ eventproposal = form.save()
- if form.instance.proposal_status == models.UserSubmittedModel.PROPOSAL_APPROVED:
- messages.warning(self.request, "Your event proposal has been set to status modified after approval. Please await approval of the changes.")
- form.instance.proposal_status = models.UserSubmittedModel.PROPOSAL_MODIFIED_AFTER_APPROVAL
- if not add_eventproposal_updated_email(form.instance):
- logger.error(
- 'Unable to add update email to queue for event: {}'.format(form.instance)
- )
+ # send email to content team
+ if not add_eventproposal_updated_email(eventproposal):
+ logger.error("Unable to send email to content team after eventproposal update")
- return super().form_valid(form)
+ # message for the user and redirect
+ messages.info(self.request, "Your proposal is now pending approval by the content team.")
+ return redirect(reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug}))
-class EventProposalSubmitView(LoginRequiredMixin, CampViewMixin, EnsureUserOwnsProposalMixin, EnsureUnapprovedProposalMixin, EnsureWritableCampMixin, EnsureCFSOpenMixin, UpdateView):
+class EventProposalDeleteView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureUserOwnsProposalMixin, EnsureCFPOpenMixin, DeleteView):
model = models.EventProposal
- fields = []
- template_name = 'eventproposal_submit.html'
+ template_name = 'proposal_delete.html'
def get_success_url(self):
- return reverse('proposal_list', kwargs={'camp_slug': self.camp.slug})
-
- def form_valid(self, form):
- form.instance.proposal_status = models.UserSubmittedModel.PROPOSAL_PENDING
- messages.info(self.request, "Your proposal has been submitted and is now pending approval")
- return super().form_valid(form)
+ messages.success(self.request, "Proposal '%s' has been deleted." % self.object.title)
+ return reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug})
class EventProposalDetailView(LoginRequiredMixin, CampViewMixin, EnsureUserOwnsProposalMixin, DetailView):
model = models.EventProposal
template_name = 'eventproposal_detail.html'
-
-################## speakers ###############################################
+###################################################################################################
+# combined proposal views
-@method_decorator(require_safe, name='dispatch')
-class SpeakerPictureView(CampViewMixin, PictureViewMixin, DetailView):
- model = models.Speaker
+class CombinedProposalTypeSelectView(LoginRequiredMixin, CampViewMixin, ListView):
+ """
+ A view which allows the user to select event type without anything else on the page
+ """
+ model = models.EventType
+ template_name = 'event_type_select.html'
+
+ def get_queryset(self, **kwargs):
+ """ We only allow submissions of events with EventTypes where public=True """
+ return super().get_queryset().filter(public=True)
+
+
+class CombinedProposalPersonSelectView(LoginRequiredMixin, CampViewMixin, ListView):
+ """
+ A view which allows the user to 1) choose between existing SpeakerProposals or
+ 2) pressing a button to create a new SpeakerProposal.
+ Redirect straight to 2) if no existing SpeakerProposals exist.
+ """
+ model = models.SpeakerProposal
+ template_name = 'combined_proposal_select_person.html'
+
+ def dispatch(self, request, *args, **kwargs):
+ """
+ Check that we have a valid EventType
+ """
+ # get EventType from url kwargs
+ self.eventtype = get_object_or_404(models.EventType, slug=self.kwargs['event_type_slug'])
+
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_queryset(self, **kwargs):
+ # only show speaker proposals for the current user
+ return super().get_queryset().filter(user=self.request.user)
+
+ def get_context_data(self, **kwargs):
+ """
+ Add EventType to template context
+ """
+ context = super().get_context_data(**kwargs)
+ context['eventtype'] = self.eventtype
+ return context
def get(self, request, *args, **kwargs):
- # get and return the response
- response = self.get_picture_response(path='/public/speakers/%(campslug)s/%(slug)s/%(filename)s' % {
- 'campslug': self.camp.slug,
- 'slug': self.get_object().slug,
- 'filename': os.path.basename(self.picture.name),
+ """ If we don't have any existing SpeakerProposals just redirect directly to the combined submit view """
+ if not self.get_queryset().exists():
+ return redirect(reverse_lazy('program:proposal_combined_submit', kwargs={'camp_slug': self.camp.slug, 'event_type_slug': self.eventtype.slug}))
+ return super().get(request, *args, **kwargs)
+
+
+class CombinedProposalSubmitView(LoginRequiredMixin, CampViewMixin, CreateView):
+ """
+ This view is used by users to submit CFP proposals.
+ It allows the user to submit an EventProposal and a SpeakerProposal together.
+ It can also be used with a preselected SpeakerProposal uuid in url kwargs
+ """
+ template_name = 'combined_proposal_submit.html'
+
+ def dispatch(self, request, *args, **kwargs):
+ """
+ Check that we have a valid EventType
+ """
+ # get EventType from url kwargs
+ self.eventtype = get_object_or_404(models.EventType, slug=self.kwargs['event_type_slug'])
+
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_context_data(self, **kwargs):
+ """
+ Add EventType to template context
+ """
+ context = super().get_context_data(**kwargs)
+ context['eventtype'] = self.eventtype
+ return context
+
+ def form_valid(self, form):
+ """
+ Save the object(s) here before redirecting
+ """
+ if hasattr(self, 'speakerproposal'):
+ eventproposal = form.save(user=self.request.user, event_type=self.eventtype)
+ eventproposal.speakers.add(self.speakerproposal)
+ else:
+ # first save the SpeakerProposal
+ speakerproposal = form['speakerproposal'].save(commit=False)
+ speakerproposal.camp = self.camp
+ speakerproposal.user = self.request.user
+ if not speakerproposal.email:
+ speakerproposal.email = self.request.user.email
+ speakerproposal.save()
+
+ # then save the eventproposal
+ eventproposal = form['eventproposal'].save(user=self.request.user, event_type=self.eventtype)
+ eventproposal.user = self.request.user
+ eventproposal.event_type = self.eventtype
+ eventproposal.save()
+
+ # add the speakerproposal to the eventproposal
+ eventproposal.speakers.add(speakerproposal)
+
+ # send mail(s) to content team
+ if not add_new_eventproposal_email(eventproposal):
+ logger.error("Unable to send email to content team after new eventproposal")
+ if not hasattr(self, 'speakerproposal'):
+ if not add_new_speakerproposal_email(speakerproposal):
+ logger.error("Unable to send email to content team after new speakerproposal")
+
+ # all good
+ return redirect(reverse_lazy('program:proposal_list', kwargs={'camp_slug': self.camp.slug}))
+
+ def get_form_class(self):
+ """
+ Unless we have an existing SpeakerProposal we must show two forms on the page.
+ We use betterforms.MultiModelForm to combine two forms on the page
+ """
+ if hasattr(self, 'speakerproposal'):
+ # we already have a speakerproposal, just show an eventproposal form
+ return EventProposalForm
+
+ # build our MultiModelForm
+ class CombinedProposalSubmitForm(MultiModelForm):
+ form_classes = OrderedDict((
+ ('speakerproposal', SpeakerProposalForm),
+ ('eventproposal', EventProposalForm),
+ ))
+
+ # return the form class
+ return CombinedProposalSubmitForm
+
+ def get_form_kwargs(self):
+ """
+ Set camp and eventtype for the form
+ """
+ kwargs = super().get_form_kwargs()
+ kwargs.update({
+ 'camp': self.camp,
+ 'eventtype': self.eventtype
})
- return response
+ return kwargs
+
+
+###################################################################################################
+# speaker views
class SpeakerDetailView(CampViewMixin, DetailView):
@@ -268,7 +637,8 @@ class SpeakerListView(CampViewMixin, ListView):
template_name = 'speaker_list.html'
-################## events ##############################################
+###################################################################################################
+# event views
class EventListView(CampViewMixin, ListView):
@@ -281,7 +651,8 @@ class EventDetailView(CampViewMixin, DetailView):
template_name = 'schedule_event_detail.html'
-################## schedule #############################################
+###################################################################################################
+# schedule views
class NoScriptScheduleView(CampViewMixin, TemplateView):
@@ -289,27 +660,37 @@ class NoScriptScheduleView(CampViewMixin, TemplateView):
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(**kwargs)
- context['eventinstances'] = models.EventInstance.objects.filter(event__camp=self.camp).order_by('when')
+ context['eventinstances'] = models.EventInstance.objects.filter(
+ event__track__camp=self.camp
+ ).order_by('when')
return context
-
class ScheduleView(CampViewMixin, TemplateView):
template_name = 'schedule_overview.html'
+ def dispatch(self, request, *args, **kwargs):
+ """
+ If no events are scheduled redirect to the event page
+ """
+ response = super().dispatch(request, *args, **kwargs)
+ if not models.EventInstance.objects.filter(event__track__camp=self.camp).exists():
+ return(redirect(reverse('program:event_index', kwargs={'camp_slug': self.camp.slug})))
+ return response
+
def get_context_data(self, *args, **kwargs):
context = super(ScheduleView, self).get_context_data(**kwargs)
- context['schedule_midnight_offset_hours'] = settings.SCHEDULE_MIDNIGHT_OFFSET_HOURS;
+ context['schedule_midnight_offset_hours'] = settings.SCHEDULE_MIDNIGHT_OFFSET_HOURS
return context
-class CallForSpeakersView(CampViewMixin, TemplateView):
- def get_template_names(self):
- return '%s_call_for_speakers.html' % self.camp.slug
+class CallForParticipationView(CampViewMixin, TemplateView):
+ template_name = 'call_for_participation.html'
+###################################################################################################
+# control center csv
-################## control center #############################################
class ProgramControlCenter(CampViewMixin, TemplateView):
template_name = "control/index.html"
@@ -331,3 +712,100 @@ class ProgramControlCenter(CampViewMixin, TemplateView):
context['csv'] = csv
return context
+
+###################################################################################################
+# URL views
+
+class UrlCreateView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureCFPOpenMixin, UrlViewMixin, CreateView):
+ model = models.Url
+ template_name = 'url_form.html'
+ fields = ['urltype', 'url']
+
+ def form_valid(self, form):
+ """
+ Set the proposal FK before saving
+ Set proposal as pending if it isn't already
+ """
+ if hasattr(self, 'eventproposal') and self.eventproposal:
+ # this URL belongs to an eventproposal
+ form.instance.eventproposal = self.eventproposal
+ url = form.save()
+ if self.eventproposal.proposal_status != models.SpeakerProposal.PROPOSAL_PENDING:
+ self.eventproposal.proposal_status = models.SpeakerProposal.PROPOSAL_PENDING
+ self.eventproposal.save()
+ messages.success(self.request, "%s is now pending review by the Content Team." % self.eventproposal.title)
+ else:
+ # this URL belongs to a speakerproposal
+ form.instance.speakerproposal = self.speakerproposal
+ url = form.save()
+ if self.speakerproposal.proposal_status != models.SpeakerProposal.PROPOSAL_PENDING:
+ self.speakerproposal.proposal_status = models.SpeakerProposal.PROPOSAL_PENDING
+ self.speakerproposal.save()
+ messages.success(self.request, "%s is now pending review by the Content Team." % self.speakerproposal.name)
+
+ messages.success(self.request, "URL saved.")
+
+ # all good
+ return redirect(reverse_lazy('program:proposal_list', kwargs={'camp_slug': self.camp.slug}))
+
+
+class UrlUpdateView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureCFPOpenMixin, UrlViewMixin, UpdateView):
+ model = models.Url
+ template_name = 'url_form.html'
+ fields = ['urltype', 'url']
+ pk_url_kwarg = 'url_uuid'
+
+ def form_valid(self, form):
+ """
+ Set proposal as pending if it isn't already
+ """
+ if hasattr(self, 'eventproposal') and self.eventproposal:
+ # this URL belongs to a speakerproposal
+ url = form.save()
+ if self.eventproposal.proposal_status != models.SpeakerProposal.PROPOSAL_PENDING:
+ self.eventproposal.proposal_status = models.SpeakerProposal.PROPOSAL_PENDING
+ self.eventproposal.save()
+ messages.success(self.request, "%s is now pending review by the Content Team." % self.eventproposal.title)
+ else:
+ # this URL belongs to a speakerproposal
+ url = form.save()
+ if self.speakerproposal.proposal_status != models.SpeakerProposal.PROPOSAL_PENDING:
+ self.speakerproposal.proposal_status = models.SpeakerProposal.PROPOSAL_PENDING
+ self.speakerproposal.save()
+ messages.success(self.request, "%s is now pending review by the Content Team." % self.speakerproposal.name)
+
+ messages.success(self.request, "URL saved.")
+
+ # all good
+ return redirect(reverse_lazy('program:proposal_list', kwargs={'camp_slug': self.camp.slug}))
+
+
+class UrlDeleteView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureCFPOpenMixin, UrlViewMixin, DeleteView):
+ model = models.Url
+ template_name = 'url_delete.html'
+ pk_url_kwarg = 'url_uuid'
+
+ def delete(self, request, *args, **kwargs):
+ """
+ Set proposal as pending if it isn't already
+ """
+ if hasattr(self, 'eventproposal') and self.eventproposal:
+ # this URL belongs to a speakerproposal
+ if self.eventproposal.proposal_status != models.SpeakerProposal.PROPOSAL_PENDING:
+ self.eventproposal.proposal_status = models.SpeakerProposal.PROPOSAL_PENDING
+ self.eventproposal.save()
+ messages.success(self.request, "%s is now pending review by the Content Team." % self.eventproposal.title)
+ else:
+ # this URL belongs to a speakerproposal
+ if self.speakerproposal.proposal_status != models.SpeakerProposal.PROPOSAL_PENDING:
+ self.speakerproposal.proposal_status = models.SpeakerProposal.PROPOSAL_PENDING
+ self.speakerproposal.save()
+ messages.success(self.request, "%s is now pending review by the Content Team." % self.speakerproposal.name)
+
+ self.object = self.get_object()
+ self.object.delete()
+ messages.success(self.request, "URL deleted.")
+
+ # all good
+ return redirect(reverse_lazy('program:proposal_list', kwargs={'camp_slug': self.camp.slug}))
+
diff --git a/src/requirements.txt b/src/requirements.txt
deleted file mode 100644
index 5c860590..00000000
--- a/src/requirements.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-CommonMark==0.7.3
-Django==1.10.5
-Pillow==4.0.0
-PyPDF2==1.26.0
-Unidecode==0.04.20
-argparse==1.2.1
-asgi-redis==1.3.0
-asyncio==3.4.3
-bleach==1.5.0
-
-# fix https://github.com/django/daphne/pull/107
-git+https://github.com/tykling/daphne@ws-x-forwarded-for-bugfix
-
-# fix https://github.com/django/channels/issues/622
-#channels==1.1.3
-git+https://github.com/tykling/channels@master
-
-defusedxml==0.4.1
-django-allauth==0.30.0
-django-bleach==0.3.0
-django-bootstrap3==8.2.2
-django-debug-toolbar==1.6
-django-channels-panel==0.0.5
-django-extensions==1.7.7
-django-wkhtmltopdf==3.1.0
-docopt==0.6.2
-future==0.16.0
-html5lib==0.9999999
-icalendar==3.11.3
-ipython==5.3.0
-irc3==0.9.8
-oauthlib==2.0.1
-olefile==0.44
-psycopg2==2.6.2
-python3-openid==3.0.10
-pytz==2016.10
-qrcode==5.3
-requests==2.12.5
-requests-oauthlib==0.7.0
-six==1.10.0
-sqlparse==0.2.2
-venusian==1.0
-webencodings==0.5
diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt
new file mode 100644
index 00000000..da53e734
--- /dev/null
+++ b/src/requirements/dev.txt
@@ -0,0 +1,3 @@
+-r production.txt
+
+django-debug-toolbar==1.9.1
diff --git a/src/requirements/production.txt b/src/requirements/production.txt
new file mode 100644
index 00000000..31f3a5a9
--- /dev/null
+++ b/src/requirements/production.txt
@@ -0,0 +1,41 @@
+Django==2.1.5
+channels==2.1.6
+channels-redis==2.3.2
+
+commonmark==0.8.1
+Pillow==5.4.1
+PyPDF2==1.26.0
+Unidecode==1.0.23
+asyncio==3.4.3
+bleach==3.1.0
+defusedxml==0.5.0
+django-allauth==0.38.0
+django-bleach==0.4.0
+django-bootstrap3==11.0.0
+django-extensions==2.1.4
+django-wkhtmltopdf==3.2.0
+django-reversion==3.0.2
+django-betterforms==1.2
+docopt==0.6.2
+future==0.17.1
+html5lib==1.0.1
+icalendar==4.0.3
+ipython==7.2.0
+irc3==1.1.1
+oauthlib==3.0.0
+olefile==0.46
+psycopg2-binary==2.7.6.1
+python-magic==0.4.15
+python3-openid==3.1.0
+pytz==2018.9
+qrcode==6.1
+requests==2.21.0
+requests-oauthlib==1.2.0
+six==1.12.0
+sqlparse==0.2.4
+venusian==1.2.0
+webencodings==0.5.1
+wrapt==1.11.1
+graphene-django==2.2.0
+django-filter==2.1.0
+
diff --git a/src/requirements/test.txt b/src/requirements/test.txt
new file mode 100644
index 00000000..a0232901
--- /dev/null
+++ b/src/requirements/test.txt
@@ -0,0 +1,3 @@
+-r dev.txt
+
+factory_boy==2.10.0
diff --git a/src/rideshare/__init__.py b/src/rideshare/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/rideshare/admin.py b/src/rideshare/admin.py
new file mode 100644
index 00000000..6a674531
--- /dev/null
+++ b/src/rideshare/admin.py
@@ -0,0 +1,9 @@
+from django.contrib import admin
+
+from .models import Ride
+
+
+@admin.register(Ride)
+class RideModelAdmin(admin.ModelAdmin):
+ list_display = ('location', 'when', 'seats', 'user')
+ list_filter = ('camp', 'user')
diff --git a/src/rideshare/apps.py b/src/rideshare/apps.py
new file mode 100644
index 00000000..9a8b366f
--- /dev/null
+++ b/src/rideshare/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class RideshareConfig(AppConfig):
+ name = 'rideshare'
diff --git a/src/rideshare/migrations/0001_initial.py b/src/rideshare/migrations/0001_initial.py
new file mode 100644
index 00000000..b1a843f3
--- /dev/null
+++ b/src/rideshare/migrations/0001_initial.py
@@ -0,0 +1,36 @@
+# Generated by Django 2.0.4 on 2018-08-08 20:18
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ('camps', '0028_auto_20180525_1025'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Ride',
+ fields=[
+ ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+ ('created', models.DateTimeField(auto_now_add=True)),
+ ('updated', models.DateTimeField(auto_now=True)),
+ ('seats', models.PositiveIntegerField()),
+ ('location', models.CharField(max_length=100)),
+ ('when', models.DateTimeField()),
+ ('description', models.TextField()),
+ ('camp', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='camps.Camp')),
+ ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'abstract': False,
+ },
+ ),
+ ]
diff --git a/src/rideshare/migrations/0002_auto_20180814_1942.py b/src/rideshare/migrations/0002_auto_20180814_1942.py
new file mode 100644
index 00000000..ffcbeff5
--- /dev/null
+++ b/src/rideshare/migrations/0002_auto_20180814_1942.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1 on 2018-08-14 17:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('rideshare', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='ride',
+ name='when',
+ field=models.DateTimeField(help_text='Format is YYYY-MM-DD HH:mm'),
+ ),
+ ]
diff --git a/src/rideshare/migrations/__init__.py b/src/rideshare/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/rideshare/models.py b/src/rideshare/models.py
new file mode 100644
index 00000000..97ce643a
--- /dev/null
+++ b/src/rideshare/models.py
@@ -0,0 +1,30 @@
+from django.db import models
+from django.urls import reverse
+
+from utils.models import UUIDModel, CampRelatedModel
+
+
+class Ride(UUIDModel, CampRelatedModel):
+ camp = models.ForeignKey('camps.Camp', on_delete=models.PROTECT)
+ user = models.ForeignKey('auth.User', on_delete=models.PROTECT)
+ seats = models.PositiveIntegerField()
+ location = models.CharField(max_length=100)
+ when = models.DateTimeField(help_text="Format is YYYY-MM-DD HH:mm")
+ description = models.TextField()
+
+ def get_absolute_url(self):
+ return reverse(
+ 'rideshare:detail',
+ kwargs={
+ 'pk': self.pk,
+ 'camp_slug': self.camp.slug
+ }
+ )
+
+ def __str__(self):
+ return "{} seats from {} at {} by {}".format(
+ self.seats,
+ self.location,
+ self.when,
+ self.user
+ )
diff --git a/src/rideshare/templates/rideshare/emails/contact_mail.html b/src/rideshare/templates/rideshare/emails/contact_mail.html
new file mode 100644
index 00000000..6855a686
--- /dev/null
+++ b/src/rideshare/templates/rideshare/emails/contact_mail.html
@@ -0,0 +1,13 @@
+Hello!
+
+The following message has been submitted to your rideshare on {{ rideshare_url }}.
+
+<message>
+
+ {{ message }}
+
+</message>
+
+Best regards,
+
+The BornHack Teamp diff --git a/src/rideshare/templates/rideshare/emails/contact_mail.txt b/src/rideshare/templates/rideshare/emails/contact_mail.txt new file mode 100644 index 00000000..8225c0d5 --- /dev/null +++ b/src/rideshare/templates/rideshare/emails/contact_mail.txt @@ -0,0 +1,13 @@ +Hello! + +The following message has been submitted to your rideshare on {{ rideshare_url }}. + +
+
+{{ message }}
+
+
+
+Best regards,
+
+The BornHack Team
diff --git a/src/rideshare/templates/rideshare/ride_confirm_delete.html b/src/rideshare/templates/rideshare/ride_confirm_delete.html
new file mode 100644
index 00000000..73d954b8
--- /dev/null
+++ b/src/rideshare/templates/rideshare/ride_confirm_delete.html
@@ -0,0 +1,10 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/src/rideshare/templates/rideshare/ride_detail.html b/src/rideshare/templates/rideshare/ride_detail.html
new file mode 100644
index 00000000..bb9e90f5
--- /dev/null
+++ b/src/rideshare/templates/rideshare/ride_detail.html
@@ -0,0 +1,60 @@
+{% extends 'base.html' %}
+{% load commonmark %}
+{% load bootstrap3 %}
+
+{% block content %}
+
+
+
+ Back
+
+
+
+ +
+ +
+
+
+
+{% endblock %}
diff --git a/src/people/tests.py b/src/rideshare/tests.py
similarity index 100%
rename from src/people/tests.py
rename to src/rideshare/tests.py
diff --git a/src/rideshare/urls.py b/src/rideshare/urls.py
new file mode 100644
index 00000000..e528e248
--- /dev/null
+++ b/src/rideshare/urls.py
@@ -0,0 +1,43 @@
+from django.urls import path, include
+
+from .views import (
+ RideList,
+ RideCreate,
+ RideDetail,
+ RideUpdate,
+ RideDelete,
+)
+
+app_name = 'rideshare'
+
+urlpatterns = [
+ path(
+ '',
+ RideList.as_view(),
+ name='list'
+ ),
+ path(
+ 'create/',
+ RideCreate.as_view(),
+ name='create'
+ ),
+ path(
+ '/', include([
+ path(
+ '',
+ RideDetail.as_view(),
+ name='detail'
+ ),
+ path(
+ 'update/',
+ RideUpdate.as_view(),
+ name='update'
+ ),
+ path(
+ 'delete/',
+ RideDelete.as_view(),
+ name='delete'
+ ),
+ ])
+ )
+]
diff --git a/src/rideshare/views.py b/src/rideshare/views.py
new file mode 100644
index 00000000..3f5ab9fe
--- /dev/null
+++ b/src/rideshare/views.py
@@ -0,0 +1,89 @@
+from django.contrib import messages
+from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
+from django.urls import reverse
+from django.views.generic import (
+ ListView,
+ DetailView,
+ CreateView,
+ UpdateView,
+ DeleteView,
+)
+from django.http import HttpResponseRedirect
+from django import forms
+
+from camps.mixins import CampViewMixin
+from utils.email import add_outgoing_email
+
+from .models import Ride
+
+
+class ContactRideForm(forms.Form):
+ message = forms.CharField(
+ widget=forms.Textarea(attrs={"placeholder": "Remember to include your contact information!"}),
+ label="Write a message to this rideshare",
+ help_text="ATTENTION!: Pressing send will send an email with the above text. It is up to you to include your contact information so the person receiving the email can contact you.",
+ )
+
+
+class RideList(LoginRequiredMixin, CampViewMixin, ListView):
+ model = Ride
+
+
+class RideDetail(LoginRequiredMixin, CampViewMixin, DetailView):
+ model = Ride
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context['form'] = ContactRideForm()
+ return context
+
+ def post(self, request, **kwargs):
+ form = ContactRideForm(request.POST)
+ if form.is_valid():
+ ride = self.get_object()
+ add_outgoing_email(
+ text_template='rideshare/emails/contact_mail.txt',
+ to_recipients=[ride.user.emailaddress_set.get(primary=True).email],
+ formatdict=dict(
+ rideshare_url="https://bornhack.dk{}".format(
+ reverse(
+ 'rideshare:detail',
+ kwargs={"camp_slug": self.camp.slug, "pk": ride.pk}
+ )
+ ),
+ message=form.cleaned_data['message'],
+ ),
+ subject="BornHack rideshare message!",
+ )
+ messages.info(request, "Your message has been sent.")
+ return HttpResponseRedirect(ride.get_absolute_url())
+
+
+class RideCreate(LoginRequiredMixin, CampViewMixin, CreateView):
+ model = Ride
+ fields = ['location', 'when', 'seats', 'description']
+
+ def form_valid(self, form, **kwargs):
+ ride = form.save(commit=False)
+ ride.camp = self.camp
+ ride.user = self.request.user
+ ride.save()
+ self.object = ride
+ return HttpResponseRedirect(self.get_success_url())
+
+
+class IsRideOwnerMixin(UserPassesTestMixin):
+ def test_func(self):
+ return self.get_object().user == self.request.user
+
+
+class RideUpdate(LoginRequiredMixin, CampViewMixin, IsRideOwnerMixin, UpdateView):
+ model = Ride
+ fields = ['location', 'when', 'seats', 'description']
+
+
+class RideDelete(LoginRequiredMixin, CampViewMixin, IsRideOwnerMixin, DeleteView):
+ model = Ride
+
+ def get_success_url(self):
+ return reverse('rideshare:list', kwargs={'camp_slug': self.camp.slug})
diff --git a/src/shop/admin.py b/src/shop/admin.py
index f264f62a..1605d336 100644
--- a/src/shop/admin.py
+++ b/src/shop/admin.py
@@ -1,17 +1,58 @@
from django.contrib import admin
-from . import models
+from tickets.admin import ShopTicketInline
+from .models import (
+ CoinifyAPICallback,
+ CoinifyAPIInvoice,
+ CoinifyAPIRequest,
+ EpayCallback,
+ EpayPayment,
+ Invoice,
+ CreditNote,
+ CustomOrder,
+ ProductCategory,
+ Product,
+ Order,
+ OrderProductRelation,
+)
-admin.site.register(models.EpayCallback)
-admin.site.register(models.EpayPayment)
-admin.site.register(models.CoinifyAPIInvoice)
-admin.site.register(models.CoinifyAPICallback)
-admin.site.register(models.CoinifyAPIRequest)
-admin.site.register(models.Invoice)
-admin.site.register(models.CreditNote)
+admin.site.register(EpayCallback)
+admin.site.register(EpayPayment)
+admin.site.register(CoinifyAPIInvoice)
+admin.site.register(CoinifyAPICallback)
+admin.site.register(CoinifyAPIRequest)
-@admin.register(models.CustomOrder)
+@admin.register(Invoice)
+class InvoiceAdmin(admin.ModelAdmin):
+ list_display = [
+ 'id',
+ 'order',
+ 'customorder',
+ 'created',
+ 'updated',
+ ]
+
+
+@admin.register(CreditNote)
+class CreditNoteAdmin(admin.ModelAdmin):
+ list_display = [
+ 'id',
+ 'user',
+ 'customer',
+ 'amount',
+ 'vat',
+ 'paid',
+ 'created',
+ 'updated',
+ ]
+
+ list_filter = [
+ 'paid'
+ ]
+
+
+@admin.register(CustomOrder)
class CustomOrderAdmin(admin.ModelAdmin):
list_display = [
'id',
@@ -20,6 +61,8 @@ class CustomOrderAdmin(admin.ModelAdmin):
'amount',
'vat',
'paid',
+ 'created',
+ 'updated',
]
list_filter = [
@@ -27,29 +70,61 @@ class CustomOrderAdmin(admin.ModelAdmin):
]
-@admin.register(models.ProductCategory)
+@admin.register(ProductCategory)
class ProductCategoryAdmin(admin.ModelAdmin):
list_display = [
'name',
]
-@admin.register(models.Product)
+def available_from(product):
+ if product.available_in.lower:
+ return product.available_in.lower.strftime("%c")
+ return "None"
+available_from.short_description = 'Available from'
+
+
+def available_to(product):
+ if product.available_in.upper:
+ return product.available_in.upper.strftime("%c")
+ return "None"
+available_to.short_description = 'Available to'
+
+
+def stock_info(product):
+ if product.stock_amount:
+ return "{} / {}".format(
+ product.left_in_stock,
+ product.stock_amount
+ )
+ return "N/A"
+
+
+@admin.register(Product)
class ProductAdmin(admin.ModelAdmin):
list_display = [
'name',
'category',
'ticket_type',
'price',
- 'available_in',
+ stock_info,
+ available_from,
+ available_to
]
+ list_filter = [
+ 'category',
+ 'ticket_type',
+ ]
+
+ search_fields = ['name']
+
class ProductInline(admin.TabularInline):
- model = models.OrderProductRelation
+ model = OrderProductRelation
-@admin.register(models.Order)
+@admin.register(Order)
class OrderAdmin(admin.ModelAdmin):
change_form_template = 'admin/change_order_form.html'
readonly_fields = (
@@ -86,7 +161,7 @@ class OrderAdmin(admin.ModelAdmin):
exclude = ['products']
- inlines = [ProductInline]
+ inlines = [ProductInline, ShopTicketInline]
actions = ['mark_order_as_paid', 'mark_order_as_refunded']
@@ -103,4 +178,3 @@ class OrderAdmin(admin.ModelAdmin):
def get_user_email(obj):
return obj.order.user.email
-
diff --git a/src/shop/apps.py b/src/shop/apps.py
index 5edbc95c..8e6d60e7 100644
--- a/src/shop/apps.py
+++ b/src/shop/apps.py
@@ -2,6 +2,7 @@ from django.apps import AppConfig
import logging
logger = logging.getLogger("bornhack.%s" % __name__)
+
class ShopConfig(AppConfig):
name = 'shop'
diff --git a/src/shop/coinify.py b/src/shop/coinify.py
index 1077f97b..c5a9e43b 100644
--- a/src/shop/coinify.py
+++ b/src/shop/coinify.py
@@ -1,13 +1,14 @@
from vendor.coinify.coinify_api import CoinifyAPI
-from vendor.coinify.coinify_callback import CoinifyCallback
from .models import CoinifyAPIRequest, CoinifyAPIInvoice, CoinifyAPICallback
from django.conf import settings
-import json, logging
+import json
+import logging
+import requests
logger = logging.getLogger("bornhack.%s" % __name__)
-def process_coinify_invoice_json(invoicejson, order):
+def process_coinify_invoice_json(invoicejson, order, request):
# create or update the invoice object in our database
coinifyinvoice, created = CoinifyAPIInvoice.objects.update_or_create(
coinify_id=invoicejson['id'],
@@ -19,7 +20,7 @@ def process_coinify_invoice_json(invoicejson, order):
# if the order is paid in full call the mark as paid method now
if invoicejson['state'] == 'complete' and not coinifyinvoice.order.paid:
- coinifyinvoice.order.mark_as_paid()
+ coinifyinvoice.order.mark_as_paid(request=request)
return coinifyinvoice
@@ -34,7 +35,7 @@ def save_coinify_callback(request, order):
# now attempt to parse json
try:
parsed = json.loads(request.body.decode('utf-8'))
- except Exception as E:
+ except Exception:
parsed = ''
# save this callback to db
@@ -83,45 +84,46 @@ def coinify_api_request(api_method, order, **kwargs):
return req
-def handle_coinify_api_response(req, order):
- if req.method == 'invoice_create' or req.method == 'invoice_get':
+def handle_coinify_api_response(apireq, order, request):
+ if apireq.method == 'invoice_create' or apireq.method == 'invoice_get':
# Parse api response
- if req.response['success']:
+ if apireq.response['success']:
# save this new coinify invoice to the DB
coinifyinvoice = process_coinify_invoice_json(
- invoicejson = req.response['data'],
- order = order,
+ invoicejson=apireq.response['data'],
+ order=order,
+ request=request,
)
return coinifyinvoice
else:
- api_error = req.response['error']
+ api_error = apireq.response['error']
logger.error("coinify API error: %s (%s)" % (
api_error['message'],
api_error['code']
))
return False
else:
- logger.error("coinify api method not supported" % req.method)
+ logger.error("coinify api method not supported" % apireq.method)
return False
################### API CALLS ################################################
-def get_coinify_invoice(coinify_invoiceid, order):
+def get_coinify_invoice(coinify_invoiceid, order, request):
# put args for API request together
invoicedict = {
'invoice_id': coinify_invoiceid
}
# perform the api request
- req = coinify_api_request(
+ apireq = coinify_api_request(
api_method='invoice_get',
order=order,
**invoicedict
)
- coinifyinvoice = handle_coinify_api_response(req, order)
+ coinifyinvoice = handle_coinify_api_response(apireq, order, request)
return coinifyinvoice
@@ -139,12 +141,12 @@ def create_coinify_invoice(order, request):
}
# perform the API request
- req = coinify_api_request(
+ apireq = coinify_api_request(
api_method='invoice_create',
order=order,
**invoicedict
)
- coinifyinvoice = handle_coinify_api_response(req, order)
+ coinifyinvoice = handle_coinify_api_response(apireq, order, request)
return coinifyinvoice
diff --git a/src/shop/context_processors.py b/src/shop/context_processors.py
index 676e42b5..ec572d80 100644
--- a/src/shop/context_processors.py
+++ b/src/shop/context_processors.py
@@ -1,8 +1,5 @@
-from django.conf import settings
-
-
def current_order(request):
- if request.user.is_authenticated():
+ if request.user.is_authenticated:
order = None
orders = request.user.orders.filter(open__isnull=False)
@@ -11,5 +8,3 @@ def current_order(request):
return {'current_order': order}
return {}
-
-
diff --git a/src/shop/epay.py b/src/shop/epay.py
index dba32ba1..764cec28 100644
--- a/src/shop/epay.py
+++ b/src/shop/epay.py
@@ -1,6 +1,7 @@
import hashlib
from django.conf import settings
+
def calculate_epay_hash(order, request):
hashstring = (
'{merchant_number}{description}11{amount}DKK'
@@ -10,9 +11,9 @@ def calculate_epay_hash(order, request):
description=order.description,
amount=order.total*100,
order_id=order.pk,
- accept_url = order.get_epay_accept_url(request),
- cancel_url = order.get_cancel_url(request),
- callback_url = order.get_epay_callback_url(request),
+ accept_url=order.get_epay_accept_url(request),
+ cancel_url=order.get_cancel_url(request),
+ callback_url=order.get_epay_callback_url(request),
md5_secret=settings.EPAY_MD5_SECRET,
)
epay_hash = hashlib.md5(hashstring.encode('utf-8')).hexdigest()
@@ -24,6 +25,7 @@ def validate_epay_callback(query):
for key, value in query.items():
if key != 'hash':
hashstring += value
- hash = hashlib.md5((hashstring + settings.EPAY_MD5_SECRET).encode('utf-8')).hexdigest()
+ hash = hashlib.md5(
+ (hashstring + settings.EPAY_MD5_SECRET).encode('utf-8')
+ ).hexdigest()
return hash == query['hash']
-
diff --git a/src/shop/factories.py b/src/shop/factories.py
new file mode 100644
index 00000000..9b0c5e0c
--- /dev/null
+++ b/src/shop/factories.py
@@ -0,0 +1,51 @@
+import factory
+
+from factory.django import DjangoModelFactory
+
+from django.utils import timezone
+
+from psycopg2.extras import DateTimeTZRange
+
+from utils.factories import UserFactory
+
+
+class ProductCategoryFactory(DjangoModelFactory):
+ class Meta:
+ model = 'shop.ProductCategory'
+
+ name = factory.Faker('word')
+
+
+class ProductFactory(DjangoModelFactory):
+ class Meta:
+ model = 'shop.Product'
+
+ name = factory.Faker('word')
+ slug = factory.Faker('word')
+ category = factory.SubFactory(ProductCategoryFactory)
+ description = factory.Faker('paragraph')
+ price = factory.Faker('pyint')
+ available_in = factory.LazyFunction(
+ lambda:
+ DateTimeTZRange(
+ lower=timezone.now(),
+ upper=timezone.now() + timezone.timedelta(31)
+ )
+ )
+
+
+class OrderFactory(DjangoModelFactory):
+ class Meta:
+ model = 'shop.Order'
+
+ user = factory.SubFactory(UserFactory)
+
+
+class OrderProductRelationFactory(DjangoModelFactory):
+ class Meta:
+ model = 'shop.OrderProductRelation'
+
+ product = factory.SubFactory(ProductFactory)
+ order = factory.SubFactory(OrderFactory)
+ quantity = 1
+ handed_out = False
diff --git a/src/shop/forms.py b/src/shop/forms.py
index 6d6f41af..3d8dcbcd 100644
--- a/src/shop/forms.py
+++ b/src/shop/forms.py
@@ -1,5 +1,4 @@
from django import forms
-from .models import Order
class AddToOrderForm(forms.Form):
diff --git a/src/shop/invoiceworker.py b/src/shop/invoiceworker.py
index cecd51e3..e3d210bb 100644
--- a/src/shop/invoiceworker.py
+++ b/src/shop/invoiceworker.py
@@ -1,3 +1,4 @@
+from django.conf import settings
from django.core.files import File
from utils.pdf import generate_pdf_letter
from shop.email import add_invoice_email, add_creditnote_email
@@ -39,6 +40,11 @@ def do_work():
template=template,
formatdict={
'invoice': invoice,
+ 'bank': settings.BANKACCOUNT_BANK,
+ 'bank_iban': settings.BANKACCOUNT_IBAN,
+ 'bank_bic': settings.BANKACCOUNT_SWIFTBIC,
+ 'bank_dk_reg': settings.BANKACCOUNT_REG,
+ 'bank_dk_accno': settings.BANKACCOUNT_ACCOUNT,
},
)
logger.info('Generated pdf for invoice %s' % invoice)
diff --git a/src/shop/managers.py b/src/shop/managers.py
index e10d1906..dc01c2e6 100644
--- a/src/shop/managers.py
+++ b/src/shop/managers.py
@@ -1,5 +1,3 @@
-from psycopg2.extras import DateTimeTZRange
-
from django.db.models import QuerySet
from django.utils import timezone
diff --git a/src/shop/migrations/0053_auto_20180318_0906.py b/src/shop/migrations/0053_auto_20180318_0906.py
new file mode 100644
index 00000000..0acbc182
--- /dev/null
+++ b/src/shop/migrations/0053_auto_20180318_0906.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2018-03-18 08:06
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('shop', '0052_auto_20171004_0005'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='creditnote',
+ name='user',
+ field=models.ForeignKey(blank=True, help_text='The user this credit note belongs to, if any.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='creditnotes', to=settings.AUTH_USER_MODEL, verbose_name='User'),
+ ),
+ migrations.AlterField(
+ model_name='epaypayment',
+ name='callback',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='shop.EpayCallback'),
+ ),
+ migrations.AlterField(
+ model_name='order',
+ name='user',
+ field=models.ForeignKey(help_text='The user this shop order belongs to.', on_delete=django.db.models.deletion.PROTECT, related_name='orders', to=settings.AUTH_USER_MODEL, verbose_name='User'),
+ ),
+ migrations.AlterField(
+ model_name='orderproductrelation',
+ name='order',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='shop.Order'),
+ ),
+ migrations.AlterField(
+ model_name='orderproductrelation',
+ name='product',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='shop.Product'),
+ ),
+ migrations.AlterField(
+ model_name='product',
+ name='category',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='products', to='shop.ProductCategory'),
+ ),
+ migrations.AlterField(
+ model_name='product',
+ name='ticket_type',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='tickets.TicketType'),
+ ),
+ ]
diff --git a/src/shop/migrations/0054_auto_20180415_1159.py b/src/shop/migrations/0054_auto_20180415_1159.py
new file mode 100644
index 00000000..51f19464
--- /dev/null
+++ b/src/shop/migrations/0054_auto_20180415_1159.py
@@ -0,0 +1,34 @@
+# Generated by Django 2.0.4 on 2018-04-15 16:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('shop', '0053_auto_20180318_0906'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='product',
+ name='stock_amount',
+ field=models.IntegerField(blank=True, help_text='Initial amount available in stock if there is a limited supply, e.g. fridge space', null=True),
+ ),
+ migrations.AlterField(
+ model_name='epaypayment',
+ name='order',
+ field=models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to='shop.Order'),
+ ),
+ migrations.AlterField(
+ model_name='invoice',
+ name='customorder',
+ field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='shop.CustomOrder'),
+ ),
+ migrations.AlterField(
+ model_name='invoice',
+ name='order',
+ field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='shop.Order'),
+ ),
+ ]
diff --git a/src/shop/migrations/0055_order_customer_address.py b/src/shop/migrations/0055_order_customer_address.py
new file mode 100644
index 00000000..2720cf33
--- /dev/null
+++ b/src/shop/migrations/0055_order_customer_address.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1 on 2018-08-22 13:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('shop', '0054_auto_20180415_1159'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='order',
+ name='customer_address',
+ field=models.TextField(blank=True, help_text='The additional customer address for this order'),
+ ),
+ ]
diff --git a/src/shop/migrations/0056_auto_20180827_1020.py b/src/shop/migrations/0056_auto_20180827_1020.py
new file mode 100644
index 00000000..fa2aa4d0
--- /dev/null
+++ b/src/shop/migrations/0056_auto_20180827_1020.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.0.4 on 2018-08-27 08:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('shop', '0055_order_customer_address'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='order',
+ name='customer_address',
+ ),
+ migrations.AddField(
+ model_name='order',
+ name='invoice_address',
+ field=models.TextField(blank=True, help_text='The invoice address for this order. Leave blank to use the email associated with the logged in user.'),
+ ),
+ ]
diff --git a/src/shop/migrations/0057_order_notes.py b/src/shop/migrations/0057_order_notes.py
new file mode 100644
index 00000000..2e0aee52
--- /dev/null
+++ b/src/shop/migrations/0057_order_notes.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.4 on 2018-08-27 10:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('shop', '0056_auto_20180827_1020'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='order',
+ name='notes',
+ field=models.TextField(blank=True, default='', help_text='Any internal notes about this order can be entered here. They will not be printed on the invoice or shown to the customer in any way.'),
+ ),
+ ]
diff --git a/src/shop/models.py b/src/shop/models.py
index 4ebcc7c8..e4ee2751 100644
--- a/src/shop/models.py
+++ b/src/shop/models.py
@@ -1,8 +1,4 @@
-import io
import logging
-import hashlib
-import base64
-import qrcode
from django.conf import settings
from django.db import models
@@ -12,7 +8,7 @@ from django.contrib.postgres.fields import DateTimeRangeField, JSONField
from django.utils.text import slugify
from django.utils.translation import ugettext_lazy as _
from django.utils import timezone
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
from django.core.exceptions import ValidationError
from decimal import Decimal
from datetime import timedelta
@@ -76,6 +72,7 @@ class Order(CreatedUpdatedModel):
verbose_name=_('User'),
help_text=_('The user this shop order belongs to.'),
related_name='orders',
+ on_delete=models.PROTECT,
)
paid = models.BooleanField(
@@ -131,6 +128,17 @@ class Order(CreatedUpdatedModel):
blank=True,
)
+ invoice_address = models.TextField(
+ help_text=_('The invoice address for this order. Leave blank to use the email associated with the logged in user.'),
+ blank=True
+ )
+
+ notes = models.TextField(
+ help_text='Any internal notes about this order can be entered here. They will not be printed on the invoice or shown to the customer in any way.',
+ default='',
+ blank=True,
+ )
+
objects = OrderQuerySet.as_manager()
def __str__(self):
@@ -199,9 +207,10 @@ class Order(CreatedUpdatedModel):
product=order_product.product,
)
ticket.save()
- messages.success(request, "Created %s tickets of type: %s" % (order_product.quantity, order_product.product.ticket_type.name))
+ if request:
+ messages.success(request, "Created %s tickets of type: %s" % (order_product.quantity, order_product.product.ticket_type.name))
# and mark the OPR as handed_out=True
- order_product.handed_out=True
+ order_product.handed_out = True
order_product.save()
self.save()
@@ -209,8 +218,8 @@ class Order(CreatedUpdatedModel):
if not self.paid:
messages.error(request, "Order %s is not paid, so cannot mark it as refunded!" % self.pk)
else:
- self.refunded=True
- ### delete any tickets related to this order
+ self.refunded = True
+ # delete any tickets related to this order
if self.tickets.all():
messages.success(request, "Order %s marked as refunded, deleting %s tickets..." % (self.pk, self.tickets.count()))
self.tickets.all().delete()
@@ -258,7 +267,6 @@ class Order(CreatedUpdatedModel):
if not self.coinify_api_invoices.exists():
return False
- coinifyinvoice = None
for tempinvoice in self.coinify_api_invoices.all():
# we already have a coinifyinvoice for this order, check if it expired
if not tempinvoice.expired:
@@ -294,7 +302,8 @@ class Product(CreatedUpdatedModel, UUIDModel):
category = models.ForeignKey(
'shop.ProductCategory',
- related_name='products'
+ related_name='products',
+ on_delete=models.PROTECT,
)
name = models.CharField(max_length=150)
@@ -315,6 +324,16 @@ class Product(CreatedUpdatedModel, UUIDModel):
ticket_type = models.ForeignKey(
'tickets.TicketType',
+ on_delete=models.PROTECT,
+ null=True,
+ blank=True
+ )
+
+ stock_amount = models.IntegerField(
+ help_text=(
+ 'Initial amount available in stock if there is a limited '
+ 'supply, e.g. fridge space'
+ ),
null=True,
blank=True
)
@@ -334,8 +353,23 @@ class Product(CreatedUpdatedModel, UUIDModel):
)
def is_available(self):
+ """ Is the product available or not?
+
+ Checks for the following:
+
+ - Whether now is in the self.available_in
+ - If a stock is defined, that there are items left
+ """
+ predicates = [self.is_time_available]
+ if self.stock_amount:
+ predicates.append(self.is_stock_available)
+ return all(predicates)
+
+ @property
+ def is_time_available(self):
now = timezone.now()
- return now in self.available_in
+ time_available = now in self.available_in
+ return time_available
def is_old(self):
now = timezone.now()
@@ -347,10 +381,30 @@ class Product(CreatedUpdatedModel, UUIDModel):
now = timezone.now()
return self.available_in.lower > now
+ @property
+ def left_in_stock(self):
+ if self.stock_amount:
+ sold = OrderProductRelation.objects.filter(
+ product=self,
+ order__paid=True,
+ ).aggregate(Sum('quantity'))['quantity__sum']
+
+ total_left = self.stock_amount - (sold or 0)
+
+ return total_left
+ return None
+
+ @property
+ def is_stock_available(self):
+ if self.stock_amount:
+ stock_available = self.left_in_stock > 0
+ return stock_available
+ # If there is no stock defined the product is generally available.
+ return True
class OrderProductRelation(CreatedUpdatedModel):
- order = models.ForeignKey('shop.Order')
- product = models.ForeignKey('shop.Product')
+ order = models.ForeignKey('shop.Order', on_delete=models.PROTECT)
+ product = models.ForeignKey('shop.Product', on_delete=models.PROTECT)
quantity = models.PositiveIntegerField()
handed_out = models.BooleanField(default=False)
@@ -377,8 +431,8 @@ class EpayPayment(CreatedUpdatedModel, UUIDModel):
verbose_name = 'Epay Payment'
verbose_name_plural = 'Epay Payments'
- order = models.OneToOneField('shop.Order')
- callback = models.ForeignKey('shop.EpayCallback')
+ order = models.OneToOneField('shop.Order', on_delete=models.PROTECT)
+ callback = models.ForeignKey('shop.EpayCallback', on_delete=models.PROTECT)
txnid = models.IntegerField()
@@ -406,6 +460,7 @@ class CreditNote(CreatedUpdatedModel):
verbose_name=_('User'),
help_text=_('The user this credit note belongs to, if any.'),
related_name='creditnotes',
+ on_delete=models.PROTECT,
null=True,
blank=True
)
@@ -469,8 +524,18 @@ class CreditNote(CreatedUpdatedModel):
class Invoice(CreatedUpdatedModel):
- order = models.OneToOneField('shop.Order', null=True, blank=True)
- customorder = models.OneToOneField('shop.CustomOrder', null=True, blank=True)
+ order = models.OneToOneField(
+ 'shop.Order',
+ null=True,
+ blank=True,
+ on_delete=models.PROTECT
+ )
+ customorder = models.OneToOneField(
+ 'shop.CustomOrder',
+ null=True,
+ blank=True,
+ on_delete=models.PROTECT
+ )
pdf = models.FileField(null=True, blank=True, upload_to='invoices/')
sent_to_customer = models.BooleanField(default=False)
@@ -511,7 +576,7 @@ class CoinifyAPIInvoice(CreatedUpdatedModel):
@property
def expired(self):
- return parse_datetime(self.invoicejson['expire_time']) < timezone.now()
+ return parse_datetime(self.invoicejson['expire_time']) < timezone.now()
class CoinifyAPICallback(CreatedUpdatedModel):
diff --git a/src/shop/templates/bank_transfer.html b/src/shop/templates/bank_transfer.html
index 3a475065..c20c8759 100644
--- a/src/shop/templates/bank_transfer.html
+++ b/src/shop/templates/bank_transfer.html
@@ -11,10 +11,11 @@ of the full amount of {{ total|currency }} using the fol
{{ speakerproposal.name }}
-
- {% if speakerproposal.picture_large and speakerproposal.picture_small %}
-
+{% if not camp.call_for_participation_open %}
+
-
- {% else %}
- {{ speakerproposal.biography|commonmark }}
- {% endif %}
-
- {{ speakerproposal.biography|commonmark }}
-
-
-
- 
-
-
-
+ Note! This Call for Particilation is not open.
+{% endif %}
+
+Details for {{ speakerproposal.name }}
+ +{% include 'includes/speakerproposal_detail.html' %}- Back to List + Back to List + {% if camp.call_for_participation_open and not camp.read_only %} + {% if not speakerproposal.eventproposals.all %} + Delete Person + {% endif %} + {% endif %}
{% endblock program_content %} diff --git a/src/program/templates/speakerproposal_form.html b/src/program/templates/speakerproposal_form.html index 87723e7a..7da0bd55 100644 --- a/src/program/templates/speakerproposal_form.html +++ b/src/program/templates/speakerproposal_form.html @@ -2,11 +2,19 @@ {% load bootstrap3 %} {% block program_content %} -{% if object %}Update{% else %}Create{% endif %} {{ camp.title }} Speaker Proposal
+ ++ {% if object %} + Update {{ object.name }} Details + {% else %} + Add {{ eventproposal.event_type.host_title }} to {{ eventproposal.title }} + {% endif %} +
+ {% endblock program_content %} diff --git a/src/program/templates/url_delete.html b/src/program/templates/url_delete.html new file mode 100644 index 00000000..5ebb0b51 --- /dev/null +++ b/src/program/templates/url_delete.html @@ -0,0 +1,21 @@ +{% extends 'program_base.html' %} +{% load bootstrap3 %} + +{% block program_content %} +Delete URL?
+Really delete this URL?
+{{ url.urltype }}: {{ url.url }}
+This action cannot be undone.
+ + +{% endblock program_content %} + diff --git a/src/program/templates/url_form.html b/src/program/templates/url_form.html new file mode 100644 index 00000000..343a77b7 --- /dev/null +++ b/src/program/templates/url_form.html @@ -0,0 +1,21 @@ +{% extends 'program_base.html' %} +{% load bootstrap3 %} + +{% block program_content %} + ++ {% if object %} + Update URL + {% else %} + Add URL to {% if speakerproposal %}{{ speakerproposal.name }}{% else %}{{ eventproposal.title }}{% endif %} + {% endif %} +
+ + + +{% endblock program_content %} + diff --git a/src/program/tests.py b/src/program/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/program/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/program/urls.py b/src/program/urls.py new file mode 100644 index 00000000..ff5cdc6d --- /dev/null +++ b/src/program/urls.py @@ -0,0 +1,191 @@ +from django.urls import path, include +from .views import * + +app_name = 'program' + +urlpatterns = [ + path( + '', + ScheduleView.as_view(), + name='schedule_index' + ), + path( + 'noscript/', + NoScriptScheduleView.as_view(), + name='noscript_schedule_index' + ), + path( + 'ics/', ICSView.as_view(), name="ics_view" + ), + path( + 'control/', ProgramControlCenter.as_view(), name="program_control_center" + ), + path( + 'proposals/', include([ + path( + '', + ProposalListView.as_view(), + name='proposal_list', + ), + path( + 'submit/', include([ + path( + '', + CombinedProposalTypeSelectView.as_view(), + name='proposal_combined_type_select', + ), + path( + '+
+The following message has been submitted to your rideshare on {{ rideshare_url }}.
+
+<message>
+
+ {{ message }}
+
+</message>
+
+Best regards,
+
+The BornHack Teamp diff --git a/src/rideshare/templates/rideshare/emails/contact_mail.txt b/src/rideshare/templates/rideshare/emails/contact_mail.txt new file mode 100644 index 00000000..8225c0d5 --- /dev/null +++ b/src/rideshare/templates/rideshare/emails/contact_mail.txt @@ -0,0 +1,13 @@ +Hello! + +The following message has been submitted to your rideshare on {{ rideshare_url }}. + +
+ +
+
+
+
+
+{% endblock %}
diff --git a/src/rideshare/templates/rideshare/ride_form.html b/src/rideshare/templates/rideshare/ride_form.html
new file mode 100644
index 00000000..c520b609
--- /dev/null
+++ b/src/rideshare/templates/rideshare/ride_form.html
@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+{% load commonmark %}
+{% load bootstrap3 %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/src/rideshare/templates/rideshare/ride_list.html b/src/rideshare/templates/rideshare/ride_list.html
new file mode 100644
index 00000000..7b39ac5e
--- /dev/null
+++ b/src/rideshare/templates/rideshare/ride_list.html
@@ -0,0 +1,54 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+ + {{ object.seats }} + seats free, going from + {{ object.location }} + at + {{ object.when|date:"jS \o\f F \a\t H:i T" }} +
+
+ Description:
+
+ {% if user == object.user %}
+
+ {% else %}
+
+
+ {% endif %}
++ {{ object.description|untrustedcommonmark }} +
+
+
+
+Ridesharing
++On this page participants of {{ camp.title }} can communicate about ridesharing to and from the festival. +
+ + + + Create ride + + + ++ +
| + When + | + Location + | + Seats + | + | + +{% for ride in ride_list %} +
|---|---|---|---|
| + {{ ride.when|date:"c" }} + | + {{ ride.location }} + | + {{ ride.seats }} + | + + Details + + +{% empty %} + + |
| + No rideshares yet! + +{% endfor %} + | |||
- Swift/BIC: {{ swiftbic }} (Danish reg. no. {{ regno }})
- IBAN: {{ iban }} (Danish account no. {{ accountno }}) +
- Danish bank transfer: Reg: {{ regno }} Account: {{ accountno }}
- Reference*: bornhack #{{ orderid }}
+
Remember:
diff --git a/src/shop/templates/creditnote_list.html b/src/shop/templates/creditnote_list.html
index b93497a7..5e9ec593 100644
--- a/src/shop/templates/creditnote_list.html
+++ b/src/shop/templates/creditnote_list.html
@@ -1,6 +1,7 @@
{% extends 'shop_base.html' %}
{% load bootstrap3 %}
{% load shop_tags %}
+{% load bornhack %}
{% block shop_content %}
Credit Notes
diff --git a/src/shop/templates/order_detail.html b/src/shop/templates/order_detail.html
index d242f7a4..94450ef1 100644
--- a/src/shop/templates/order_detail.html
+++ b/src/shop/templates/order_detail.html
@@ -68,9 +68,17 @@
{% if not order.open == None %}
Comment:
-
{{ order.comment }}
+ {{ order.comment|linebreaks }}
+ {% endif %}
+
+ {% if not order.open == None %}
+ Invoice Address:
+ + {% elif order.open == None and order.invoice_address %} +Invoice Address:
+{{ order.invoice_address|linebreaks }}
{% endif %}
{% if order.open %}
@@ -109,6 +117,9 @@
{% bootstrap_button " Cash" button_type="submit" button_class="btn-primary" name="payment_method" value="cash" %}
+
+ {% bootstrap_button " Credit card*" button_type="submit" button_class="btn-primary" name="payment_method" value="credit_card" %}
+
* Please consider the alternatives before choosing credit card. Credit cards are expensive and difficult for us to handle. Thank you!
diff --git a/src/shop/templates/order_list.html b/src/shop/templates/order_list.html
index 8e7b6158..f7b6d24b 100644
--- a/src/shop/templates/order_list.html
+++ b/src/shop/templates/order_list.html
@@ -1,6 +1,7 @@
{% extends 'shop_base.html' %}
{% load bootstrap3 %}
{% load shop_tags %}
+{% load bornhack %}
{% block shop_content %}
Orders
diff --git a/src/shop/templates/pdf/custominvoice.html b/src/shop/templates/pdf/custominvoice.html index f204a16a..2d162011 100644 --- a/src/shop/templates/pdf/custominvoice.html +++ b/src/shop/templates/pdf/custominvoice.html @@ -51,5 +51,12 @@-Payment should be made by bank transfer to our account in Arbejdernes Landsbank reg. 5371 account no. 0244504 within two weeks from {{ invoice.created|date:"b jS, Y" }} please. Thank you! + Payment should be made by bank transfer to our account in {{ bank }}:
+-
+
- Reg. {{ bank_dk_reg }}, account no. {{ bank_dk_accno }} +
- BIC: {{ bank_bic }}, IBAN: {{ bank_iban }} +
- Add invoice number in the transfer notes. +
- Within two weeks from: {{ invoice.created|date:"b jS, Y" }} +
- Thank you! +
CUSTOMER
+{{ invoice.order.invoice_address|linebreaks }}
+{% else %}Customer: {{ invoice.order.user.email }}
+{% endif %}INVOICE
|
diff --git a/src/shop/templatetags/shop_tags.py b/src/shop/templatetags/shop_tags.py
index 530445f5..ea4a083b 100644
--- a/src/shop/templatetags/shop_tags.py
+++ b/src/shop/templatetags/shop_tags.py
@@ -1,10 +1,8 @@
from django import template
-from django.utils.safestring import mark_safe
from decimal import Decimal
register = template.Library()
-
@register.filter
def currency(value):
try:
@@ -12,11 +10,3 @@ def currency(value):
except ValueError:
return False
-
-@register.filter()
-def truefalseicon(value):
- if value:
- return mark_safe("")
- else:
- return mark_safe("")
-
diff --git a/src/shop/tests.py b/src/shop/tests.py
index 7ce503c2..f28ec463 100644
--- a/src/shop/tests.py
+++ b/src/shop/tests.py
@@ -1,3 +1,75 @@
from django.test import TestCase
+from django.utils import timezone
-# Create your tests here.
+from psycopg2.extras import DateTimeTZRange
+
+from .factories import (
+ ProductFactory,
+ OrderProductRelationFactory,
+)
+
+
+class ProductAvailabilityTest(TestCase):
+ """ Test logic about availability of products. """
+
+ def test_product_available_by_stock(self):
+ """ If no orders have been made, the product is still available. """
+ product = ProductFactory(stock_amount=10)
+ self.assertEqual(product.left_in_stock, 10)
+ self.assertTrue(product.is_available())
+
+ def test_product_not_available_by_stock(self):
+ """ If max orders have been made, the product is NOT available. """
+ product = ProductFactory(stock_amount=2)
+
+ for i in range(2):
+ opr = OrderProductRelationFactory(product=product)
+ order = opr.order
+ order.paid = True
+ order.save()
+
+ self.assertEqual(product.left_in_stock, 0)
+ self.assertFalse(product.is_stock_available)
+ self.assertFalse(product.is_available())
+
+ def test_product_available_by_time(self):
+ """ The product is available if now is in the right timeframe. """
+ product = ProductFactory()
+ # The factory defines the timeframe as now and 31 days forward.
+ self.assertTrue(product.is_time_available)
+ self.assertTrue(product.is_available())
+
+ def test_product_not_available_by_time(self):
+ """ The product is not available if now is outside the timeframe. """
+ available_in = DateTimeTZRange(
+ lower=timezone.now() - timezone.timedelta(5),
+ upper=timezone.now() - timezone.timedelta(1)
+ )
+ product = ProductFactory(available_in=available_in)
+ # The factory defines the timeframe as now and 31 days forward.
+ self.assertFalse(product.is_time_available)
+ self.assertFalse(product.is_available())
+
+ def test_product_is_not_available_yet(self):
+ """ The product is not available because we are before lower bound. """
+ available_in = DateTimeTZRange(
+ lower=timezone.now() + timezone.timedelta(5)
+ )
+ product = ProductFactory(available_in=available_in)
+ # Make sure there is no upper - just in case.
+ self.assertEqual(product.available_in.upper, None)
+ # The factory defines the timeframe as now and 31 days forward.
+ self.assertFalse(product.is_time_available)
+ self.assertFalse(product.is_available())
+
+ def test_product_is_available_from_now_on(self):
+ """ The product is available because we are after lower bound. """
+ available_in = DateTimeTZRange(
+ lower=timezone.now() - timezone.timedelta(1)
+ )
+ product = ProductFactory(available_in=available_in)
+ # Make sure there is no upper - just in case.
+ self.assertEqual(product.available_in.upper, None)
+ # The factory defines the timeframe as now and 31 days forward.
+ self.assertTrue(product.is_time_available)
+ self.assertTrue(product.is_available())
diff --git a/src/shop/urls.py b/src/shop/urls.py
index df8f82b9..061b411c 100644
--- a/src/shop/urls.py
+++ b/src/shop/urls.py
@@ -1,29 +1,31 @@
-from django.conf.urls import url
+from django.urls import path, include
from .views import *
-from tickets.views import ShopTicketListView
+
+app_name = 'shop'
urlpatterns = [
- url(r'^$', ShopIndexView.as_view(), name='index'),
+ path('', ShopIndexView.as_view(), name='index'),
- url(r'products/(?P
- Note! This Call for Sponsors is no longer relevant. It is kept here for historic purposes.
-
-{% endif %}
-
-Becoming a BornHack 2016 Sponsor-We are looking for sponsors to help us make BornHack an unforgettable -event and allow it to grow. If you would like to sponsor us do not hesitate -to contact us at sponsors@bornhack.dk. -If you work for a company that you believe might be able and willing to -sponsor BornHack please direct the right people to this page. - -You can read more about the event and possible areas of your -sponsorship below. - -The Concept-The idea and basic concept of BornHack comes from participation -in similar camps in Germany and the Netherlands. These events -have a huge traction (several thousand participants) and we therefore -think the time is right for another one. - -The Organisers-BornHack is a technology festival put together by a group of -people from Denmark and Sweden employed in the local IT industry. -The organiser group have a burning desire to set up a forum where -people with different interests in IT and technology can come together -to share ideas and socialize. Several of the co-organisers have -previously been (or are still) involved in organising conferences such as -Open Source Days. - -Location and Format-The first BornHack will be inviting 350 paying guests for a full -week, the ambition is to grow the number of attendees over the coming -years. It will take place at Jarlsgaard -on Bornholm, Denmark, where we have a gigabit fiber connection -to the outside world. Hopefully the weather will be with us as well. - -Sponsorship-A sponsorship can be in the range of 5000 DKK and up. You get -to have a logo of your choice placed on our website in the sponsors -section, as well as mentions in written material such as programs -where sponsors will be disclosed. - -Sponsors often prefer to sponsor a certain area or event at the -camp, where we will figure out an appropriate display in cooperation -with you. Suggested sponsorships include: - -
If you have other ideas you would be interested -in sponsoring, reach out to us on -sponsors@bornhack.dk -and we can talk about it. -{% endblock %} diff --git a/src/sponsors/templates/bornhack-2017_call_for_sponsors.html b/src/sponsors/templates/bornhack-2017_call_for_sponsors.html deleted file mode 100644 index 9b0c194f..00000000 --- a/src/sponsors/templates/bornhack-2017_call_for_sponsors.html +++ /dev/null @@ -1,72 +0,0 @@ -{% extends 'base.html' %} -{% load static from staticfiles %} - -{% block title %} -Call for Sponsors | {{ block.super }} -{% endblock %} - -{% block content %} - -{% if not camp.call_for_sponsors_open %} -
- Note! This Call for Sponsors is no longer relevant. It is kept here for historic purposes.
-
-{% endif %}
-
-Becoming a {{ camp.title }} Sponsor-We are looking for sponsors to help us make the second BornHack as unforgettable -as the first one. If you would like to sponsor us do not hesitate to contact us at -sponsors@bornhack.dk. If you work for an -organisation or company that you believe might be able and willing to -sponsor {{ camp.title }} please direct the right people to this page. - -The Concept-BornHack is an outdoor tent camping festival with a focus on technology -and society, and how the two interact. The idea and basic concept of BornHack -comes from participation in similar camps in Germany and the Netherlands. These -events have huge traction (thousands of participants, sells out fast) and has -inspired us to make BornHack. - -The Organisers-BornHack is put together by a group of people from Denmark and Sweden employed -primarily in the IT industry. The organiser group share a desire to set up a forum -where people with different interests in IT and technology can come together to -share ideas and socialise. Several of the organisers have previously been (or are -still) involved in organising conferences such as -Open Source Days. - -Location and Format-For {{ camp.title }} we will be inviting up to 500 paying guests for a full -week, the ambition is to grow the number of attendees over the coming -years. It will take place at Jarlsgaard -on Bornholm, Denmark, where we have a great venue with a fiber connection to the -outside world. - -Sponsorship-A sponsorship can be in the range of 5000 DKK and up. You get -to have a logo of your choice placed on our website in the sponsors -section, and we can also display tasteful signs or banners in or -around our speakers tent. - -Sponsors often prefer to sponsor a certain area or event at the -camp, where we will figure out an appropriate display in cooperation -with you. Suggested sponsorships include: - -
If you have other ideas you would be interested in sponsoring, reach out to us on -sponsors@bornhack.dk -and we can talk about it. Cash sponsorships are also very welcome. -{% endblock %} - diff --git a/src/sponsors/templates/bornhack-2018_call_for_sponsors.html b/src/sponsors/templates/bornhack-2018_call_for_sponsors.html deleted file mode 100644 index f420e9d0..00000000 --- a/src/sponsors/templates/bornhack-2018_call_for_sponsors.html +++ /dev/null @@ -1,71 +0,0 @@ -{% extends 'base.html' %} -{% load static from staticfiles %} - -{% block title %} -Call for Sponsors | {{ block.super }} -{% endblock %} - -{% block content %} - -{% if not camp.call_for_sponsors_open %} -
- Note! This Call for Sponsors is no longer relevant. It is kept here for historic purposes.
-
-{% endif %}
-
-Becoming a {{ camp.title }} Sponsor-We are looking for sponsors to help us make the second BornHack as unforgettable -as the first one. If you would like to sponsor us do not hesitate to contact us at -sponsors@bornhack.dk. If you work for an -organisation or company that you believe might be able and willing to -sponsor {{ camp.title }} please direct the right people to this page. - -The Concept-BornHack is an outdoor tent camping festival with a focus on technology -and society, and how the two interact. The idea and basic concept of BornHack -comes from participation in similar camps in Germany and the Netherlands. These -events have huge traction (thousands of participants, sells out fast) and has -inspired us to make BornHack. - -The Organisers-BornHack is put together by a group of people from Denmark and Sweden employed -primarily in the IT industry. The organiser group share a desire to set up a forum -where people with different interests in IT and technology can come together to -share ideas and socialise. Several of the organisers have previously been (or are -still) involved in organising conferences such as -Open Source Days. - -Location and Format-For {{ camp.title }} we will be inviting up to 500 paying guests for a full -week, the ambition is to grow the number of attendees over the coming -years. It will take place at Jarlsgaard -on Bornholm, Denmark, where we have a great venue with a fiber connection to the -outside world. - -Sponsorship-A sponsorship can be in the range of 5000 DKK and up. You get -to have a logo of your choice placed on our website in the sponsors -section, and we can also display tasteful signs or banners in or -around our speakers tent. - -Sponsors often prefer to sponsor a certain area or event at the -camp, where we will figure out an appropriate display in cooperation -with you. Suggested sponsorships include: - -
If you have other ideas you would be interested in sponsoring, reach out to us on -sponsors@bornhack.dk -and we can talk about it. Cash sponsorships are also very welcome. -{% endblock %} diff --git a/src/sponsors/templates/sponsors.html b/src/sponsors/templates/sponsors.html index 21fd8739..fb506c53 100644 --- a/src/sponsors/templates/sponsors.html +++ b/src/sponsors/templates/sponsors.html @@ -1,5 +1,6 @@ {% extends 'base.html' %} {% load static from staticfiles %} +{% load commonmark %} {% block title %} Sponsors | {{ block.super }} @@ -8,6 +9,8 @@ Sponsors | {{ block.super }} {% block content %} +{% if sponsors %} +{{ view.camp.title }} Sponsors@@ -17,6 +20,7 @@ Sponsors | {{ block.super }} you, we are immensely grateful! +{% endif %} {% for sponsor in sponsors %} @@ -35,7 +39,7 @@ Sponsors | {{ block.super }} {% if sponsor.url %} {% endif %} -
+ Note! This Call for Sponsors is not open.
+
+{% endif %}
+
+{% if not camp.call_for_sponsors %}
+This CFS has not been written yet. +{% else %} +{{ camp.call_for_sponsors|trustedcommonmark }} +{% endif %} + {% endblock %} diff --git a/src/sponsors/views.py b/src/sponsors/views.py index 3c1a3644..87ecd49e 100644 --- a/src/sponsors/views.py +++ b/src/sponsors/views.py @@ -18,7 +18,3 @@ class SponsorsView(CampViewMixin, ListView): 'name', ) - -class CallForSponsorsView(CampViewMixin, TemplateView): - def get_template_names(self): - return '%s_call_for_sponsors.html' % self.camp.slug diff --git a/src/static_src/css/bornhack.css b/src/static_src/css/bornhack.css index 08dcb11c..e64e764f 100644 --- a/src/static_src/css/bornhack.css +++ b/src/static_src/css/bornhack.css @@ -1,6 +1,6 @@ body { margin-top: 85px; - margin-bottom: 35px; + margin-bottom: 105px; overflow: scroll; } @@ -12,6 +12,20 @@ a, a:active, a:focus { outline: none; } +/* Z-index */ +/* Bootstrap values +.dropdown-backdrop { z-index: 990; } +.navbar-static-top, .dropdown-menu { z-index: 1000; } +.navbar-fixed-top, .navbar-fixed-bottom { z-index: 1030; } +.modal-backdrop { z-index: 1040; } +.modal { z-index: 1050; } +.popover { z-index: 1060; } +.tooltip { z-index: 1070; } + */ +.sticky { + z-index: 980; +} + @media (max-width: 520px) { #main { width: 100%; @@ -48,7 +62,7 @@ a, a:active, a:focus { margin-top: 6px; } -.nav li a { +#top-navbar > .nav li a { padding: 30px 7px; } @@ -236,7 +250,6 @@ footer { .sticky { position: sticky; background-color: #fff; - z-index: 9999; } #daypicker { diff --git a/src/static_src/css/font-awesome.min.css b/src/static_src/css/font-awesome.min.css deleted file mode 100644 index 540440ce..00000000 --- a/src/static_src/css/font-awesome.min.css +++ /dev/null @@ -1,4 +0,0 @@ -/*! - * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto} diff --git a/src/static_src/css/fontawesome-all.min.css b/src/static_src/css/fontawesome-all.min.css new file mode 100644 index 00000000..8539c00d --- /dev/null +++ b/src/static_src/css/fontawesome-all.min.css @@ -0,0 +1,5 @@ +/*! + * Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com + * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) + */ +.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:a 2s infinite linear}.fa-pulse{animation:a 1s infinite steps(8)}@keyframes a{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-aws:before{content:"\f375"}.fa-backward:before{content:"\f04a"}.fa-balance-scale:before{content:"\f24e"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bicycle:before{content:"\f206"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blind:before{content:"\f29d"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-book:before{content:"\f02d"}.fa-book-open:before{content:"\f518"}.fa-bookmark:before{content:"\f02e"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-btc:before{content:"\f15a"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-certificate:before{content:"\f0a3"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-square:before{content:"\f14a"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-credit-card:before{content:"\f09d"}.fa-crop:before{content:"\f125"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-deviantart:before{content:"\f1bd"}.fa-diagnoses:before{content:"\f470"}.fa-dice:before{content:"\f522"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-excel:before{content:"\f1c3"}.fa-file-image:before{content:"\f1c5"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fire:before{content:"\f06d"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-fulcrum:before{content:"\f50b"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-gift:before{content:"\f06b"}.fa-git:before{content:"\f1d3"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-martini:before{content:"\f000"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hashtag:before{content:"\f292"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-heart:before{content:"\f004"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-houzz:before{content:"\f27c"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-internet-explorer:before{content:"\f26b"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-joget:before{content:"\f3b7"}.fa-joomla:before{content:"\f1aa"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-meh:before{content:"\f11a"}.fa-memory:before{content:"\f538"}.fa-mercury:before{content:"\f223"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-moon:before{content:"\f186"}.fa-motorcycle:before{content:"\f21c"}.fa-mouse-pointer:before{content:"\f245"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nintendo-switch:before{content:"\f418"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-old-republic:before{content:"\f510"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-paint-brush:before{content:"\f1fc"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-people-carry:before{content:"\f4ce"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-volume:before{content:"\f2a0"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-plane:before{content:"\f072"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poo:before{content:"\f2fe"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-r-project:before{content:"\f4f7"}.fa-random:before{content:"\f074"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-rendact:before{content:"\f3e4"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-retweet:before{content:"\f079"}.fa-ribbon:before{content:"\f4d6"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-rupee-sign:before{content:"\f156"}.fa-safari:before{content:"\f267"}.fa-sass:before{content:"\f41e"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-search:before{content:"\f002"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shower:before{content:"\f2cc"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skull:before{content:"\f54c"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowflake:before{content:"\f2dc"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-spinner:before{content:"\f110"}.fa-spotify:before{content:"\f1bc"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-star:before{content:"\f005"}.fa-star-half:before{content:"\f089"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toolbox:before{content:"\f552"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-train:before{content:"\f238"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-moving:before{content:"\f4df"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-glass:before{content:"\f4e3"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:Font Awesome\ 5 Brands;font-style:normal;font-weight:400;src:url(../webfonts/fa-brands-400.eot);src:url(../webfonts/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url(../webfonts/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:Font Awesome\ 5 Brands}@font-face{font-family:Font Awesome\ 5 Free;font-style:normal;font-weight:400;src:url(../webfonts/fa-regular-400.eot);src:url(../webfonts/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url(../webfonts/fa-regular-400.svg#fontawesome) format("svg")}.far{font-weight:400}@font-face{font-family:Font Awesome\ 5 Free;font-style:normal;font-weight:900;src:url(../webfonts/fa-solid-900.eot);src:url(../webfonts/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url(../webfonts/fa-solid-900.svg#fontawesome) format("svg")}.fa,.far,.fas{font-family:Font Awesome\ 5 Free}.fa,.fas{font-weight:900} \ No newline at end of file diff --git a/src/static_src/fonts/FontAwesome.otf b/src/static_src/fonts/FontAwesome.otf deleted file mode 100644 index 401ec0f3..00000000 Binary files a/src/static_src/fonts/FontAwesome.otf and /dev/null differ diff --git a/src/static_src/fonts/fontawesome-webfont.eot b/src/static_src/fonts/fontawesome-webfont.eot deleted file mode 100644 index e9f60ca9..00000000 Binary files a/src/static_src/fonts/fontawesome-webfont.eot and /dev/null differ diff --git a/src/static_src/fonts/fontawesome-webfont.svg b/src/static_src/fonts/fontawesome-webfont.svg deleted file mode 100644 index 855c845e..00000000 --- a/src/static_src/fonts/fontawesome-webfont.svg +++ /dev/null @@ -1,2671 +0,0 @@ - - - diff --git a/src/static_src/fonts/fontawesome-webfont.ttf b/src/static_src/fonts/fontawesome-webfont.ttf deleted file mode 100644 index 35acda2f..00000000 Binary files a/src/static_src/fonts/fontawesome-webfont.ttf and /dev/null differ diff --git a/src/static_src/fonts/fontawesome-webfont.woff b/src/static_src/fonts/fontawesome-webfont.woff deleted file mode 100644 index 400014a4..00000000 Binary files a/src/static_src/fonts/fontawesome-webfont.woff and /dev/null differ diff --git a/src/static_src/fonts/fontawesome-webfont.woff2 b/src/static_src/fonts/fontawesome-webfont.woff2 deleted file mode 100644 index 4d13fc60..00000000 Binary files a/src/static_src/fonts/fontawesome-webfont.woff2 and /dev/null differ diff --git a/src/static_src/images/sort_asc.png b/src/static_src/images/sort_asc.png new file mode 100644 index 00000000..e1ba61a8 Binary files /dev/null and b/src/static_src/images/sort_asc.png differ diff --git a/src/static_src/images/sort_asc_disabled.png b/src/static_src/images/sort_asc_disabled.png new file mode 100644 index 00000000..fb11dfe2 Binary files /dev/null and b/src/static_src/images/sort_asc_disabled.png differ diff --git a/src/static_src/images/sort_both.png b/src/static_src/images/sort_both.png new file mode 100644 index 00000000..af5bc7c5 Binary files /dev/null and b/src/static_src/images/sort_both.png differ diff --git a/src/static_src/images/sort_desc.png b/src/static_src/images/sort_desc.png new file mode 100644 index 00000000..0e156deb Binary files /dev/null and b/src/static_src/images/sort_desc.png differ diff --git a/src/static_src/images/sort_desc_disabled.png b/src/static_src/images/sort_desc_disabled.png new file mode 100644 index 00000000..c9fdd8a1 Binary files /dev/null and b/src/static_src/images/sort_desc_disabled.png differ diff --git a/src/static_src/img/bornhack-2018/logo/bornhack-2018-logo-l.png b/src/static_src/img/bornhack-2018/logo/bornhack-2018-logo-l.png index 4e24b972..3e2e4b7e 100644 Binary files a/src/static_src/img/bornhack-2018/logo/bornhack-2018-logo-l.png and b/src/static_src/img/bornhack-2018/logo/bornhack-2018-logo-l.png differ diff --git a/src/static_src/img/bornhack-2018/logo/bornhack-2018-logo-s.png b/src/static_src/img/bornhack-2018/logo/bornhack-2018-logo-s.png index e14e0fae..192be842 100644 Binary files a/src/static_src/img/bornhack-2018/logo/bornhack-2018-logo-s.png and b/src/static_src/img/bornhack-2018/logo/bornhack-2018-logo-s.png differ diff --git a/src/static_src/img/bornhack-2019/logo/bornhack-2019-logo-l.png b/src/static_src/img/bornhack-2019/logo/bornhack-2019-logo-l.png index 5be0fe94..dc210614 100644 Binary files a/src/static_src/img/bornhack-2019/logo/bornhack-2019-logo-l.png and b/src/static_src/img/bornhack-2019/logo/bornhack-2019-logo-l.png differ diff --git a/src/static_src/img/bornhack-2020/logo/bornhack-2020-logo-l.png b/src/static_src/img/bornhack-2020/logo/bornhack-2020-logo-l.png new file mode 100644 index 00000000..fbd91ac7 Binary files /dev/null and b/src/static_src/img/bornhack-2020/logo/bornhack-2020-logo-l.png differ diff --git a/src/static_src/img/bornhack-2020/logo/bornhack-2020-logo-s.png b/src/static_src/img/bornhack-2020/logo/bornhack-2020-logo-s.png new file mode 100644 index 00000000..e14e0fae Binary files /dev/null and b/src/static_src/img/bornhack-2020/logo/bornhack-2020-logo-s.png differ diff --git a/src/static_src/img/feed-icon-14x14.png b/src/static_src/img/feed-icon-14x14.png new file mode 100755 index 00000000..b3c949d2 Binary files /dev/null and b/src/static_src/img/feed-icon-14x14.png differ diff --git a/src/static_src/img/na.jpg b/src/static_src/img/na.jpg new file mode 100644 index 00000000..95597ba6 Binary files /dev/null and b/src/static_src/img/na.jpg differ diff --git a/src/static_src/img/pdf.png b/src/static_src/img/pdf.png new file mode 100644 index 00000000..0744dd07 Binary files /dev/null and b/src/static_src/img/pdf.png differ diff --git a/src/static_src/img/sponsors/DM_Logo_RGB.png b/src/static_src/img/sponsors/DM_Logo_RGB.png new file mode 100644 index 00000000..648699d0 Binary files /dev/null and b/src/static_src/img/sponsors/DM_Logo_RGB.png differ diff --git a/src/static_src/img/sponsors/bornfiber_logo_2018_300x300px.png b/src/static_src/img/sponsors/bornfiber_logo_2018_300x300px.png new file mode 100644 index 00000000..e000d1ff Binary files /dev/null and b/src/static_src/img/sponsors/bornfiber_logo_2018_300x300px.png differ diff --git a/src/static_src/img/sponsors/epson.png b/src/static_src/img/sponsors/epson.png new file mode 100755 index 00000000..39ecf939 Binary files /dev/null and b/src/static_src/img/sponsors/epson.png differ diff --git a/src/static_src/img/sponsors/letsgo.png b/src/static_src/img/sponsors/letsgo.png new file mode 100644 index 00000000..26f82f9d Binary files /dev/null and b/src/static_src/img/sponsors/letsgo.png differ diff --git a/src/static_src/img/sponsors/pcbway.png b/src/static_src/img/sponsors/pcbway.png new file mode 100644 index 00000000..4a942e1b Binary files /dev/null and b/src/static_src/img/sponsors/pcbway.png differ diff --git a/src/static_src/img/sponsors/saxobank.png b/src/static_src/img/sponsors/saxobank.png new file mode 100644 index 00000000..756a9b02 Binary files /dev/null and b/src/static_src/img/sponsors/saxobank.png differ diff --git a/src/static_src/img/sponsors/zibra-wireless-logo.png b/src/static_src/img/sponsors/zibra-wireless-logo.png new file mode 100644 index 00000000..fad51c49 Binary files /dev/null and b/src/static_src/img/sponsors/zibra-wireless-logo.png differ diff --git a/src/static_src/pdf/bornhack-2018_letterhead.odt b/src/static_src/pdf/bornhack-2018_letterhead.odt new file mode 100644 index 00000000..b34df314 Binary files /dev/null and b/src/static_src/pdf/bornhack-2018_letterhead.odt differ diff --git a/src/static_src/pdf/bornhack-2018_letterhead.pdf b/src/static_src/pdf/bornhack-2018_letterhead.pdf new file mode 100644 index 00000000..8436470b Binary files /dev/null and b/src/static_src/pdf/bornhack-2018_letterhead.pdf differ diff --git a/src/static_src/pdf/bornhack-2018_test_letterhead.odt b/src/static_src/pdf/bornhack-2018_test_letterhead.odt new file mode 100644 index 00000000..12484034 Binary files /dev/null and b/src/static_src/pdf/bornhack-2018_test_letterhead.odt differ diff --git a/src/static_src/pdf/bornhack-2018_test_letterhead.pdf b/src/static_src/pdf/bornhack-2018_test_letterhead.pdf new file mode 100644 index 00000000..683afb1b Binary files /dev/null and b/src/static_src/pdf/bornhack-2018_test_letterhead.pdf differ diff --git a/src/static_src/webfonts/fa-brands-400.eot b/src/static_src/webfonts/fa-brands-400.eot new file mode 100644 index 00000000..f8e48185 Binary files /dev/null and b/src/static_src/webfonts/fa-brands-400.eot differ diff --git a/src/static_src/webfonts/fa-brands-400.svg b/src/static_src/webfonts/fa-brands-400.svg new file mode 100644 index 00000000..68eb65a1 --- /dev/null +++ b/src/static_src/webfonts/fa-brands-400.svg @@ -0,0 +1,1127 @@ + + + diff --git a/src/static_src/webfonts/fa-brands-400.ttf b/src/static_src/webfonts/fa-brands-400.ttf new file mode 100644 index 00000000..2b00dae7 Binary files /dev/null and b/src/static_src/webfonts/fa-brands-400.ttf differ diff --git a/src/static_src/webfonts/fa-brands-400.woff b/src/static_src/webfonts/fa-brands-400.woff new file mode 100644 index 00000000..9e4b7e1c Binary files /dev/null and b/src/static_src/webfonts/fa-brands-400.woff differ diff --git a/src/static_src/webfonts/fa-brands-400.woff2 b/src/static_src/webfonts/fa-brands-400.woff2 new file mode 100644 index 00000000..b9e58c5e Binary files /dev/null and b/src/static_src/webfonts/fa-brands-400.woff2 differ diff --git a/src/static_src/webfonts/fa-regular-400.eot b/src/static_src/webfonts/fa-regular-400.eot new file mode 100644 index 00000000..5217c95f Binary files /dev/null and b/src/static_src/webfonts/fa-regular-400.eot differ diff --git a/src/static_src/webfonts/fa-regular-400.svg b/src/static_src/webfonts/fa-regular-400.svg new file mode 100644 index 00000000..5f495431 --- /dev/null +++ b/src/static_src/webfonts/fa-regular-400.svg @@ -0,0 +1,467 @@ + + + diff --git a/src/static_src/webfonts/fa-regular-400.ttf b/src/static_src/webfonts/fa-regular-400.ttf new file mode 100644 index 00000000..cefbd50f Binary files /dev/null and b/src/static_src/webfonts/fa-regular-400.ttf differ diff --git a/src/static_src/webfonts/fa-regular-400.woff b/src/static_src/webfonts/fa-regular-400.woff new file mode 100644 index 00000000..954b0593 Binary files /dev/null and b/src/static_src/webfonts/fa-regular-400.woff differ diff --git a/src/static_src/webfonts/fa-regular-400.woff2 b/src/static_src/webfonts/fa-regular-400.woff2 new file mode 100644 index 00000000..bd35950e Binary files /dev/null and b/src/static_src/webfonts/fa-regular-400.woff2 differ diff --git a/src/static_src/webfonts/fa-solid-900.eot b/src/static_src/webfonts/fa-solid-900.eot new file mode 100644 index 00000000..cc691d63 Binary files /dev/null and b/src/static_src/webfonts/fa-solid-900.eot differ diff --git a/src/static_src/webfonts/fa-solid-900.svg b/src/static_src/webfonts/fa-solid-900.svg new file mode 100644 index 00000000..1534b64b --- /dev/null +++ b/src/static_src/webfonts/fa-solid-900.svg @@ -0,0 +1,2231 @@ + + + diff --git a/src/static_src/webfonts/fa-solid-900.ttf b/src/static_src/webfonts/fa-solid-900.ttf new file mode 100644 index 00000000..618136ab Binary files /dev/null and b/src/static_src/webfonts/fa-solid-900.ttf differ diff --git a/src/static_src/webfonts/fa-solid-900.woff b/src/static_src/webfonts/fa-solid-900.woff new file mode 100644 index 00000000..af476578 Binary files /dev/null and b/src/static_src/webfonts/fa-solid-900.woff differ diff --git a/src/static_src/webfonts/fa-solid-900.woff2 b/src/static_src/webfonts/fa-solid-900.woff2 new file mode 100644 index 00000000..9ef566a9 Binary files /dev/null and b/src/static_src/webfonts/fa-solid-900.woff2 differ diff --git a/src/teams/admin.py b/src/teams/admin.py index 38e03f0d..9fb3b571 100644 --- a/src/teams/admin.py +++ b/src/teams/admin.py @@ -1,6 +1,7 @@ from django.contrib import admin -from .models import Team, TeamArea, TeamMember, TeamTask +from .models import Team, TeamMember, TeamTask, TeamShift from .email import add_added_membership_email, add_removed_membership_email +from camps.utils import CampPropertyListFilter @admin.register(TeamTask) @@ -20,19 +21,29 @@ class TeamMemberInline(admin.TabularInline): @admin.register(Team) class TeamAdmin(admin.ModelAdmin): def get_responsible(self, obj): - return ", ".join([resp.get_full_name() for resp in obj.responsible]) + return ", ".join([resp.profile.public_credit_name for resp in obj.responsible_members.all()]) get_responsible.short_description = 'Responsible' list_display = [ 'name', - 'area', + 'camp', 'get_responsible', 'needs_members', + 'public_irc_channel_name', + 'public_irc_channel_bot', + 'public_irc_channel_managed', + 'private_irc_channel_name', + 'private_irc_channel_bot', + 'private_irc_channel_managed', ] list_filter = [ - 'camp', + CampPropertyListFilter, 'needs_members', + 'public_irc_channel_bot', + 'public_irc_channel_managed', + 'private_irc_channel_bot', + 'private_irc_channel_managed', ] inlines = [TeamMemberInline] @@ -40,6 +51,7 @@ class TeamAdmin(admin.ModelAdmin): @admin.register(TeamMember) class TeamMemberAdmin(admin.ModelAdmin): list_filter = [ + CampPropertyListFilter, 'team', 'approved', ] @@ -84,8 +96,9 @@ class TeamMemberAdmin(admin.ModelAdmin): remove_member.description = 'Remove a user from the team.' -@admin.register(TeamArea) -class TeamAreaAdmin(admin.ModelAdmin): + +@admin.register(TeamShift) +class TeamShiftAdmin(admin.ModelAdmin): list_filter = [ - 'camp' + 'team', ] diff --git a/src/teams/apps.py b/src/teams/apps.py index 17954d66..3dd023c4 100644 --- a/src/teams/apps.py +++ b/src/teams/apps.py @@ -1,5 +1,13 @@ from django.apps import AppConfig +from django.db.models.signals import post_save, post_delete +from .signal_handlers import teammember_saved, teammember_deleted class TeamsConfig(AppConfig): name = 'teams' + + def ready(self): + # connect the post_save signal, always including a dispatch_uid to prevent it being called multiple times in corner cases + post_save.connect(teammember_saved, sender='teams.TeamMember', dispatch_uid='teammember_save_signal') + post_delete.connect(teammember_deleted, sender='teams.TeamMember', dispatch_uid='teammember_save_signal') + diff --git a/src/teams/email.py b/src/teams/email.py index 62d997db..944f0edb 100644 --- a/src/teams/email.py +++ b/src/teams/email.py @@ -49,10 +49,11 @@ def add_new_membership_email(membership): return add_outgoing_email( text_template='emails/new_membership_email.txt', html_template='emails/new_membership_email.html', - to_recipients=[resp.email for resp in membership.team.responsible], + to_recipients=[resp.email for resp in membership.team.responsible_members.all()], formatdict=formatdict, subject='New membership request for {} at {}'.format( membership.team.name, membership.team.camp.title ) ) + diff --git a/src/teams/forms.py b/src/teams/forms.py deleted file mode 100644 index dab9796c..00000000 --- a/src/teams/forms.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.forms import ModelForm -from .models import Team - - -class ManageTeamForm(ModelForm): - class Meta: - model = Team - fields = ['description', 'needs_members'] diff --git a/src/teams/migrations/0019_auto_20180304_1019.py b/src/teams/migrations/0019_auto_20180304_1019.py new file mode 100644 index 00000000..019b3764 --- /dev/null +++ b/src/teams/migrations/0019_auto_20180304_1019.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-04 09:19 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0018_auto_20171122_2204'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='team', + unique_together=set([]), + ), + migrations.RemoveField( + model_name='team', + name='camp', + ), + ] diff --git a/src/teams/migrations/0020_auto_20180304_1233.py b/src/teams/migrations/0020_auto_20180304_1233.py new file mode 100644 index 00000000..4cfe13a0 --- /dev/null +++ b/src/teams/migrations/0020_auto_20180304_1233.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-04 11:33 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0019_auto_20180304_1019'), + ] + + operations = [ + migrations.AlterField( + model_name='teamarea', + name='camp', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='teamareas', to='camps.Camp'), + ), + ] diff --git a/src/teams/migrations/0021_auto_20180318_0906.py b/src/teams/migrations/0021_auto_20180318_0906.py new file mode 100644 index 00000000..e03f8214 --- /dev/null +++ b/src/teams/migrations/0021_auto_20180318_0906.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 08:06 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0020_auto_20180304_1233'), + ] + + operations = [ + migrations.AlterField( + model_name='teammember', + name='team', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='teams.Team'), + ), + migrations.AlterField( + model_name='teammember', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='teamtask', + name='team', + field=models.ForeignKey(help_text='The team this task belongs to', on_delete=django.db.models.deletion.PROTECT, related_name='tasks', to='teams.Team'), + ), + ] diff --git a/src/teams/migrations/0022_auto_20180318_1135.py b/src/teams/migrations/0022_auto_20180318_1135.py new file mode 100644 index 00000000..d2707376 --- /dev/null +++ b/src/teams/migrations/0022_auto_20180318_1135.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 10:35 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0021_auto_20180318_0906'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='irc_channel', + field=models.BooleanField(default=False, help_text='Check to make the IRC bot join the team IRC channel. Leave unchecked to disable IRC bot functionality for this team entirely.'), + ), + migrations.AddField( + model_name='team', + name='irc_channel_managed', + field=models.BooleanField(default=True, help_text='Check to make the bot manage the team IRC channel. The bot will register the channel with ChanServ if possible, and manage ACLs as needed.'), + ), + migrations.AddField( + model_name='team', + name='irc_channel_name', + field=models.TextField(blank=True, default='', help_text='Team IRC channel. Leave blank to generate channel name automatically, based on camp slug and team slug.'), + ), + migrations.AddField( + model_name='team', + name='irc_channel_private', + field=models.BooleanField(default=True, help_text='Check to make the IRC channel private for team members only, also sets +s. Leave unchecked to make the IRC channel public and open for everyone.'), + ), + ] diff --git a/src/teams/migrations/0023_auto_20180318_1256.py b/src/teams/migrations/0023_auto_20180318_1256.py new file mode 100644 index 00000000..3a8983cd --- /dev/null +++ b/src/teams/migrations/0023_auto_20180318_1256.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 11:56 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0022_auto_20180318_1135'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='shortslug', + field=models.SlugField(blank=True, help_text='Abbreviated version of the slug. Used in places like IRC channel names where space is limited'), + ), + migrations.AlterField( + model_name='team', + name='name', + field=models.CharField(help_text='The team name', max_length=255), + ), + migrations.AlterField( + model_name='team', + name='slug', + field=models.SlugField(blank=True, help_text='Url slug for this team. Leave blank to generate based on team name', max_length=255), + ), + ] diff --git a/src/teams/migrations/0024_populate_shortslugs.py b/src/teams/migrations/0024_populate_shortslugs.py new file mode 100644 index 00000000..4babd51e --- /dev/null +++ b/src/teams/migrations/0024_populate_shortslugs.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 11:45 +from __future__ import unicode_literals + +from django.db import migrations + +def populate_team_shortslugs(apps, schema_editor): + Team = apps.get_model('teams', 'Team') + for team in Team.objects.all(): + if not team.shortslug: + team.shortslug = team.slug + team.save() + +class Migration(migrations.Migration): + dependencies = [ + ('teams', '0023_auto_20180318_1256'), + ] + + operations = [ + migrations.RunPython(populate_team_shortslugs), + ] + diff --git a/src/teams/migrations/0025_auto_20180318_1318.py b/src/teams/migrations/0025_auto_20180318_1318.py new file mode 100644 index 00000000..2ad4a528 --- /dev/null +++ b/src/teams/migrations/0025_auto_20180318_1318.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 12:18 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0024_populate_shortslugs'), + ] + + operations = [ + migrations.AlterField( + model_name='team', + name='shortslug', + field=models.SlugField(help_text='Abbreviated version of the slug. Used in places like IRC channel names where space is limited'), + ), + ] diff --git a/src/teams/migrations/0026_team_camp.py b/src/teams/migrations/0026_team_camp.py new file mode 100644 index 00000000..577bdd71 --- /dev/null +++ b/src/teams/migrations/0026_team_camp.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-25 13:45 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('camps', '0025_auto_20180318_1250'), + ('teams', '0025_auto_20180318_1318'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='camp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='teams', to='camps.Camp'), + ), + ] diff --git a/src/teams/migrations/0027_fixup_teams.py b/src/teams/migrations/0027_fixup_teams.py new file mode 100644 index 00000000..879090e0 --- /dev/null +++ b/src/teams/migrations/0027_fixup_teams.py @@ -0,0 +1,60 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-25 13:45 +from __future__ import unicode_literals + +from django.db import migrations + +def add_team_camp(apps, schema_editor): + Team = apps.get_model('teams', 'Team') + TeamArea = apps.get_model('teams', 'TeamArea') + TeamMember = apps.get_model('teams', 'TeamMember') + + for team in Team.objects.all(): + print("camp processing team %s..." % team.name) + team.camp = team.area.camp + team.save() + print("set camp %s for team %s" % (team.camp.slug, team.name)) + +def add_missing_team_responsibles(apps, schema_editor): + Team = apps.get_model('teams', 'Team') + TeamArea = apps.get_model('teams', 'TeamArea') + TeamMember = apps.get_model('teams', 'TeamMember') + + for team in Team.objects.all(): + print("responsible processing team %s..." % team.name) + responsibles = TeamMember.objects.filter(team=team, responsible=True) + if not responsibles: + # get the area responsibles instead + responsibles = team.area.responsible.all() + for responsible in responsibles: + if isinstance(responsible, TeamMember): + # we need User objects instead of TeamMember objects + responsible = responsible.user + try: + membership = TeamMember.objects.get(team=team, user=responsible) + if not membership.responsible: + # already a member of the team, but not responsible + membership.responsible=True + membership.save() + print("%s is now marked as responsible" % membership.user.username) + except TeamMember.DoesNotExist: + # add the responsible as a member of the team + membership = TeamMember.objects.create( + team=team, + user=responsible, + responsible=True, + approved=True + ) + print("new membership has been created for team %s" % team.name) + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0026_team_camp'), + ] + + operations = [ + migrations.RunPython(add_team_camp), + migrations.RunPython(add_missing_team_responsibles), + ] + diff --git a/src/teams/migrations/0028_auto_20180331_1416.py b/src/teams/migrations/0028_auto_20180331_1416.py new file mode 100644 index 00000000..919fe0cf --- /dev/null +++ b/src/teams/migrations/0028_auto_20180331_1416.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-31 12:16 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0027_fixup_teams'), + ] + + operations = [ + migrations.AlterField( + model_name='team', + name='area', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='teams', to='teams.TeamArea'), + ), + ] diff --git a/src/teams/migrations/0029_remove_team_area.py b/src/teams/migrations/0029_remove_team_area.py new file mode 100644 index 00000000..1d86f49e --- /dev/null +++ b/src/teams/migrations/0029_remove_team_area.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-31 12:31 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0028_auto_20180331_1416'), + ] + + operations = [ + migrations.RemoveField( + model_name='team', + name='area', + ), + ] diff --git a/src/teams/migrations/0030_auto_20180402_1514.py b/src/teams/migrations/0030_auto_20180402_1514.py new file mode 100644 index 00000000..b7abdabd --- /dev/null +++ b/src/teams/migrations/0030_auto_20180402_1514.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 13:14 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0029_remove_team_area'), + ] + + operations = [ + migrations.AlterField( + model_name='team', + name='irc_channel_name', + field=models.TextField(blank=True, default='', help_text='Team IRC channel. Leave blank to generate channel name automatically, based on camp shortslug and team shortslug.'), + ), + migrations.AlterField( + model_name='team', + name='irc_channel_private', + field=models.BooleanField(default=True, help_text='Check to make the IRC channel secret and +i (private for team members only using an ACL). Leave unchecked to make the IRC channel public and open for everyone.'), + ), + migrations.AlterField( + model_name='team', + name='needs_members', + field=models.BooleanField(default=True, help_text='Check to indicate that this team needs more members'), + ), + ] diff --git a/src/teams/migrations/0031_auto_20180402_2146.py b/src/teams/migrations/0031_auto_20180402_2146.py new file mode 100644 index 00000000..22cef6cb --- /dev/null +++ b/src/teams/migrations/0031_auto_20180402_2146.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 19:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0030_auto_20180402_1514'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='mailing_list_archive_public', + field=models.BooleanField(default=False, help_text='Check if the mailing list archive is public'), + ), + migrations.AddField( + model_name='team', + name='mailing_list_nonmember_posts', + field=models.BooleanField(default=False, help_text='Check if the mailinglist allows non-list-members to post'), + ), + ] diff --git a/src/teams/migrations/0032_auto_20180402_2148.py b/src/teams/migrations/0032_auto_20180402_2148.py new file mode 100644 index 00000000..421e6683 --- /dev/null +++ b/src/teams/migrations/0032_auto_20180402_2148.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 19:48 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0031_auto_20180402_2146'), + ] + + operations = [ + migrations.AlterField( + model_name='team', + name='camp', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='teams', to='camps.Camp'), + ), + ] diff --git a/src/teams/migrations/0033_auto_20180402_2204.py b/src/teams/migrations/0033_auto_20180402_2204.py new file mode 100644 index 00000000..338cc17c --- /dev/null +++ b/src/teams/migrations/0033_auto_20180402_2204.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 20:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0032_auto_20180402_2148'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='teamarea', + unique_together=set([]), + ), + migrations.RemoveField( + model_name='teamarea', + name='camp', + ), + migrations.RemoveField( + model_name='teamarea', + name='responsible', + ), + migrations.DeleteModel( + name='TeamArea', + ), + ] diff --git a/src/teams/migrations/0034_auto_20180402_2334.py b/src/teams/migrations/0034_auto_20180402_2334.py new file mode 100644 index 00000000..eb4a7718 --- /dev/null +++ b/src/teams/migrations/0034_auto_20180402_2334.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 21:34 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0033_auto_20180402_2204'), + ] + + operations = [ + migrations.AlterModelOptions( + name='teammember', + options={'ordering': ['-responsible', 'approved']}, + ), + ] diff --git a/src/teams/migrations/0035_auto_20180402_2344.py b/src/teams/migrations/0035_auto_20180402_2344.py new file mode 100644 index 00000000..78ea2a64 --- /dev/null +++ b/src/teams/migrations/0035_auto_20180402_2344.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 21:44 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0034_auto_20180402_2334'), + ] + + operations = [ + migrations.AlterModelOptions( + name='teammember', + options={'ordering': ['-responsible', '-approved']}, + ), + ] diff --git a/src/teams/migrations/0036_auto_20180403_0201.py b/src/teams/migrations/0036_auto_20180403_0201.py new file mode 100644 index 00000000..ad6bede4 --- /dev/null +++ b/src/teams/migrations/0036_auto_20180403_0201.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-03 00:01 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('camps', '0025_auto_20180318_1250'), + ('teams', '0035_auto_20180402_2344'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='team', + unique_together=set([('slug', 'camp'), ('name', 'camp')]), + ), + ] diff --git a/src/teams/migrations/0037_auto_20180408_1416.py b/src/teams/migrations/0037_auto_20180408_1416.py new file mode 100644 index 00000000..6f7f30c9 --- /dev/null +++ b/src/teams/migrations/0037_auto_20180408_1416.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-08 12:16 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0036_auto_20180403_0201'), + ] + + operations = [ + migrations.AddField( + model_name='teammember', + name='irc_channel_acl_ok', + field=models.BooleanField(default=False, help_text='Maintained by the IRC bot, do not edit manually. True if the teammembers NickServ username has been added to the Team IRC channels ACL.'), + ), + migrations.AlterField( + model_name='teammember', + name='approved', + field=models.BooleanField(default=False, help_text='True if this membership is approved. False if not.'), + ), + migrations.AlterField( + model_name='teammember', + name='responsible', + field=models.BooleanField(default=False, help_text='True if this teammember is responsible for this Team. False if not.'), + ), + migrations.AlterField( + model_name='teammember', + name='team', + field=models.ForeignKey(help_text='The Team this membership relates to', on_delete=django.db.models.deletion.PROTECT, to='teams.Team'), + ), + migrations.AlterField( + model_name='teammember', + name='user', + field=models.ForeignKey(help_text='The User object this team membership relates to', on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/src/teams/migrations/0038_auto_20180412_1844.py b/src/teams/migrations/0038_auto_20180412_1844.py new file mode 100644 index 00000000..31a4c9ea --- /dev/null +++ b/src/teams/migrations/0038_auto_20180412_1844.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-12 16:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0037_auto_20180408_1416'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='private_irc_channel_bot', + field=models.BooleanField(default=False, help_text='Check to make the bot join the teams private IRC channel. Leave unchecked to disable the IRC bot for this channel.'), + ), + migrations.AddField( + model_name='team', + name='private_irc_channel_managed', + field=models.BooleanField(default=False, help_text='Check to make the bot manage the private IRC channel by registering it with NickServ, setting +I and maintaining the ACL.'), + ), + migrations.AddField( + model_name='team', + name='private_irc_channel_name', + field=models.CharField(blank=True, help_text='The private IRC channel for this team. Will be shown to team members on the team page. Leave empty if the team has no private IRC channel.', max_length=50, null=True, unique=True), + ), + migrations.AddField( + model_name='team', + name='public_irc_channel_bot', + field=models.BooleanField(default=False, help_text='Check to make the bot join the teams public IRC channel. Leave unchecked to disable the IRC bot for this channel.'), + ), + migrations.AddField( + model_name='team', + name='public_irc_channel_managed', + field=models.BooleanField(default=False, help_text='Check to make the bot manage the teams public IRC channel by registering it with NickServ.'), + ), + migrations.AddField( + model_name='team', + name='public_irc_channel_name', + field=models.CharField(blank=True, help_text='The public IRC channel for this team. Will be shown on the team page so people know how to reach the team. Leave empty if the team has no public IRC channel.', max_length=50, null=True, unique=True), + ), + ] diff --git a/src/teams/migrations/0039_fix_irc_channels.py b/src/teams/migrations/0039_fix_irc_channels.py new file mode 100644 index 00000000..cff67d54 --- /dev/null +++ b/src/teams/migrations/0039_fix_irc_channels.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-12 15:46 +from __future__ import unicode_literals + +from django.db import migrations + +def fix_irc_channels(apps, schema_editor): + Team = apps.get_model('teams', 'Team') + for team in Team.objects.filter(irc_channel=True): + print("fixing irc channel for team %s" % team.name) + if team.irc_channel_private: + team.private_irc_channel_name=team.irc_channel_name + if team.irc_channel_managed: + team.private_irc_channel_managed=True + team.private_irc_channel_bot=True + else: + team.public_irc_channel_name=team.irc_channel_name + if team.irc_channel_managed: + team.public_irc_channel_managed=True + team.public_irc_channel_bot=True + team.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0038_auto_20180412_1844'), + ] + + operations = [ + migrations.RunPython(fix_irc_channels), + ] + diff --git a/src/teams/migrations/0040_auto_20180412_2109.py b/src/teams/migrations/0040_auto_20180412_2109.py new file mode 100644 index 00000000..dc0db141 --- /dev/null +++ b/src/teams/migrations/0040_auto_20180412_2109.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-12 19:09 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0039_fix_irc_channels'), + ] + + operations = [ + migrations.RemoveField( + model_name='team', + name='irc_channel', + ), + migrations.RemoveField( + model_name='team', + name='irc_channel_managed', + ), + migrations.RemoveField( + model_name='team', + name='irc_channel_name', + ), + migrations.RemoveField( + model_name='team', + name='irc_channel_private', + ), + ] diff --git a/src/teams/migrations/0041_auto_20180412_2231.py b/src/teams/migrations/0041_auto_20180412_2231.py new file mode 100644 index 00000000..933f4868 --- /dev/null +++ b/src/teams/migrations/0041_auto_20180412_2231.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-12 20:31 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0040_auto_20180412_2109'), + ] + + operations = [ + migrations.RemoveField( + model_name='teammember', + name='irc_channel_acl_ok', + ), + migrations.AddField( + model_name='teammember', + name='irc_acl_fix_needed', + field=models.BooleanField(default=False, help_text='Maintained by the IRC bot, manual editing should not be needed. Will be set to true when a teammember sets or changes NickServ username, and back to false after the ACL has been fixed by the bot.'), + ), + ] diff --git a/src/teams/migrations/0042_auto_20180413_1933.py b/src/teams/migrations/0042_auto_20180413_1933.py new file mode 100644 index 00000000..279fda50 --- /dev/null +++ b/src/teams/migrations/0042_auto_20180413_1933.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-13 17:33 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0041_auto_20180412_2231'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='private_irc_channel_fix_needed', + field=models.BooleanField(default=False, help_text='Used to indicate to the IRC bot that this teams private IRC channel is in need of a permissions and ACL fix.'), + ), + migrations.AddField( + model_name='team', + name='public_irc_channel_fix_needed', + field=models.BooleanField(default=False, help_text='Used to indicate to the IRC bot that this teams public IRC channel is in need of a permissions and ACL fix.'), + ), + migrations.AlterField( + model_name='team', + name='public_irc_channel_managed', + field=models.BooleanField(default=False, help_text='Check to make the bot manage the teams public IRC channel by registering it with NickServ and setting +Oo for all teammembers.'), + ), + ] diff --git a/src/teams/migrations/0043_auto_20180702_1338.py b/src/teams/migrations/0043_auto_20180702_1338.py new file mode 100644 index 00000000..ad64e0dc --- /dev/null +++ b/src/teams/migrations/0043_auto_20180702_1338.py @@ -0,0 +1,43 @@ +# Generated by Django 2.0.4 on 2018-07-02 18:38 + +import django.contrib.postgres.fields.ranges +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0042_auto_20180413_1933'), + ] + + operations = [ + migrations.CreateModel( + name='TeamShift', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(auto_now_add=True)), + ('updated', models.DateTimeField(auto_now=True)), + ('shift_range', django.contrib.postgres.fields.ranges.DateTimeRangeField()), + ('people_required', models.IntegerField(default=1)), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='team', + name='shifts_enabled', + field=models.BooleanField(default=False, help_text='Does this team have shifts? This enables defining shifts for this team.'), + ), + migrations.AddField( + model_name='teamshift', + name='team', + field=models.ForeignKey(help_text='The team this shift belongs to', on_delete=django.db.models.deletion.PROTECT, related_name='shifts', to='teams.Team'), + ), + migrations.AddField( + model_name='teamshift', + name='team_members', + field=models.ManyToManyField(to='teams.TeamMember'), + ), + ] diff --git a/src/teams/migrations/0043_auto_20180804_1641.py b/src/teams/migrations/0043_auto_20180804_1641.py new file mode 100644 index 00000000..e2460dc1 --- /dev/null +++ b/src/teams/migrations/0043_auto_20180804_1641.py @@ -0,0 +1,24 @@ +# Generated by Django 2.0.4 on 2018-08-04 14:41 + +import django.contrib.postgres.fields.ranges +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0042_auto_20180413_1933'), + ] + + operations = [ + migrations.AddField( + model_name='teamtask', + name='completed', + field=models.BooleanField(default=False, help_text='Check to mark this task as completed.'), + ), + migrations.AddField( + model_name='teamtask', + name='when', + field=django.contrib.postgres.fields.ranges.DateTimeRangeField(blank=True, help_text='When does this task need to be started and/or finished?', null=True), + ), + ] diff --git a/src/teams/migrations/0044_auto_20180702_1507.py b/src/teams/migrations/0044_auto_20180702_1507.py new file mode 100644 index 00000000..cb19b4ac --- /dev/null +++ b/src/teams/migrations/0044_auto_20180702_1507.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.4 on 2018-07-02 20:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0043_auto_20180702_1338'), + ] + + operations = [ + migrations.AlterField( + model_name='teamshift', + name='team_members', + field=models.ManyToManyField(blank=True, to='teams.TeamMember'), + ), + ] diff --git a/src/teams/migrations/0045_merge_20180805_1131.py b/src/teams/migrations/0045_merge_20180805_1131.py new file mode 100644 index 00000000..5eb121ee --- /dev/null +++ b/src/teams/migrations/0045_merge_20180805_1131.py @@ -0,0 +1,14 @@ +# Generated by Django 2.0.4 on 2018-08-05 09:31 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0044_auto_20180702_1507'), + ('teams', '0043_auto_20180804_1641'), + ] + + operations = [ + ] diff --git a/src/teams/migrations/0046_auto_20180808_2154.py b/src/teams/migrations/0046_auto_20180808_2154.py new file mode 100644 index 00000000..513ca22d --- /dev/null +++ b/src/teams/migrations/0046_auto_20180808_2154.py @@ -0,0 +1,17 @@ +# Generated by Django 2.0.4 on 2018-08-08 19:54 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0045_merge_20180805_1131'), + ] + + operations = [ + migrations.AlterModelOptions( + name='teamshift', + options={'ordering': ('shift_range',)}, + ), + ] diff --git a/src/teams/migrations/0047_taskcomment.py b/src/teams/migrations/0047_taskcomment.py new file mode 100644 index 00000000..3dc0eada --- /dev/null +++ b/src/teams/migrations/0047_taskcomment.py @@ -0,0 +1,29 @@ +# Generated by Django 2.1 on 2018-08-14 17:42 + +from django.db import migrations, models +import django.db.models.deletion +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0046_auto_20180808_2154'), + ] + + operations = [ + migrations.CreateModel( + name='TaskComment', + fields=[ + ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('created', models.DateTimeField(auto_now_add=True)), + ('updated', models.DateTimeField(auto_now=True)), + ('content', models.TextField()), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='teams.TeamMember')), + ('task', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='comments', to='teams.TeamTask')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/src/teams/migrations/0048_auto_20180814_1950.py b/src/teams/migrations/0048_auto_20180814_1950.py new file mode 100644 index 00000000..c59f9f8c --- /dev/null +++ b/src/teams/migrations/0048_auto_20180814_1950.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1 on 2018-08-14 17:50 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0047_taskcomment'), + ] + + operations = [ + migrations.RenameField( + model_name='taskcomment', + old_name='content', + new_name='comment', + ), + ] diff --git a/src/teams/migrations/0049_auto_20180815_1119.py b/src/teams/migrations/0049_auto_20180815_1119.py new file mode 100644 index 00000000..07325294 --- /dev/null +++ b/src/teams/migrations/0049_auto_20180815_1119.py @@ -0,0 +1,17 @@ +# Generated by Django 2.1 on 2018-08-15 09:19 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0048_auto_20180814_1950'), + ] + + operations = [ + migrations.AlterModelOptions( + name='teamtask', + options={'ordering': ['completed', 'when', 'name']}, + ), + ] diff --git a/src/teams/models.py b/src/teams/models.py index ed708fd3..99b6451e 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -1,13 +1,16 @@ -from django.db import models -from django.db.models.signals import post_save -from django.dispatch import receiver -from django.utils.text import slugify -from utils.models import CampRelatedModel -from .email import add_new_membership_email -from django.core.exceptions import ValidationError -from django.contrib.auth.models import User -from django.core.urlresolvers import reverse_lazy import logging + +from django.db import models +from django.utils.text import slugify +from django.core.exceptions import ValidationError +from django.contrib.postgres.fields import DateTimeRangeField +from django.contrib.auth.models import User +from django.urls import reverse_lazy +from django.conf import settings +from django.contrib.postgres.fields import DateTimeRangeField + +from utils.models import CampRelatedModel, CreatedUpdatedModel, UUIDModel + logger = logging.getLogger("bornhack.%s" % __name__) @@ -35,44 +38,105 @@ TEAM_GUIDE_TEMPLATE=""" """ -class TeamArea(CampRelatedModel): - class Meta: - ordering = ['name'] - unique_together = ('name', 'camp') - - name = models.CharField(max_length=255) - description = models.TextField(default='') - camp = models.ForeignKey('camps.Camp') - responsible = models.ManyToManyField( - 'auth.User', - related_name='responsible_team_areas' - ) - - def __str__(self): - return '{} ({})'.format(self.name, self.camp) - - class Team(CampRelatedModel): - class Meta: - ordering = ['name'] - unique_together = (('name', 'camp'), ('slug', 'camp')) - - name = models.CharField(max_length=255) - slug = models.SlugField(max_length=255, blank=True) - camp = models.ForeignKey('camps.Camp', related_name="teams") - area = models.ForeignKey( - 'teams.TeamArea', - related_name='teams', - on_delete=models.PROTECT + camp = models.ForeignKey( + 'camps.Camp', + related_name="teams", + on_delete=models.PROTECT, ) + + name = models.CharField( + max_length=255, + help_text='The team name', + ) + + slug = models.SlugField( + max_length=255, + blank=True, + help_text='Url slug for this team. Leave blank to generate based on team name', + ) + + shortslug = models.SlugField( + help_text='Abbreviated version of the slug. Used in places like IRC channel names where space is limited', + ) + description = models.TextField() - needs_members = models.BooleanField(default=True) + + needs_members = models.BooleanField( + default=True, + help_text='Check to indicate that this team needs more members', + ) + members = models.ManyToManyField( 'auth.User', related_name='teams', through='teams.TeamMember' ) - mailing_list = models.EmailField(blank=True) + + # mailing list related fields + mailing_list = models.EmailField( + blank=True + ) + + mailing_list_archive_public = models.BooleanField( + default=False, + help_text='Check if the mailing list archive is public' + ) + + mailing_list_nonmember_posts = models.BooleanField( + default=False, + help_text='Check if the mailinglist allows non-list-members to post' + ) + + # IRC related fields + public_irc_channel_name = models.CharField( + blank=True, + null=True, + unique=True, + max_length=50, + help_text='The public IRC channel for this team. Will be shown on the team page so people know how to reach the team. Leave empty if the team has no public IRC channel.' + ) + public_irc_channel_bot = models.BooleanField( + default=False, + help_text='Check to make the bot join the teams public IRC channel. Leave unchecked to disable the IRC bot for this channel.' + ) + public_irc_channel_managed = models.BooleanField( + default=False, + help_text='Check to make the bot manage the teams public IRC channel by registering it with NickServ and setting +Oo for all teammembers.' + ) + public_irc_channel_fix_needed = models.BooleanField( + default=False, + help_text='Used to indicate to the IRC bot that this teams public IRC channel is in need of a permissions and ACL fix.' + ) + + private_irc_channel_name = models.CharField( + blank=True, + null=True, + unique=True, + max_length=50, + help_text='The private IRC channel for this team. Will be shown to team members on the team page. Leave empty if the team has no private IRC channel.' + ) + private_irc_channel_bot = models.BooleanField( + default=False, + help_text='Check to make the bot join the teams private IRC channel. Leave unchecked to disable the IRC bot for this channel.' + ) + private_irc_channel_managed = models.BooleanField( + default=False, + help_text='Check to make the bot manage the private IRC channel by registering it with NickServ, setting +I and maintaining the ACL.' + ) + private_irc_channel_fix_needed = models.BooleanField( + default=False, + help_text='Used to indicate to the IRC bot that this teams private IRC channel is in need of a permissions and ACL fix.' + ) + + shifts_enabled = models.BooleanField( + default=False, + help_text="Does this team have shifts? This enables defining shifts for this team." + ) + + class Meta: + ordering = ['name'] + unique_together = (('name', 'camp'), ('slug', 'camp')) guide = models.TextField( blank=True, @@ -84,75 +148,164 @@ class Team(CampRelatedModel): def __str__(self): return '{} ({})'.format(self.name, self.camp) + def get_absolute_url(self): + return reverse_lazy('teams:general', kwargs={'camp_slug': self.camp.slug, 'team_slug': self.slug}) + def save(self, **kwargs): - if ( - not self.pk or - not self.slug - ): + # generate slug if needed + if not self.pk or not self.slug: slug = slugify(self.name) self.slug = slug + # set shortslug if needed + if not self.shortslug: + self.shortslug = self.slug + super().save(**kwargs) def clean(self): - if self.camp != self.area.camp: - raise ValidationError({'camp': 'camp is different from area.camp'}) + # make sure the public irc channel name is prefixed with a # if it is set + if self.public_irc_channel_name and self.public_irc_channel_name[0] != "#": + self.public_irc_channel_name = "#%s" % self.public_irc_channel_name - def memberstatus(self, member): - if member not in self.members.all(): - return "Not member" - else: - if TeamMember.objects.get(team=self, user=member).approved: - return "Member" - else: - return "Membership Pending" + # make sure the private irc channel name is prefixed with a # if it is set + if self.private_irc_channel_name and self.private_irc_channel_name[0] != "#": + self.private_irc_channel_name = "#%s" % self.private_irc_channel_name + + # make sure the channel names are not reserved + if self.public_irc_channel_name == settings.IRCBOT_PUBLIC_CHANNEL or self.public_irc_channel_name == settings.IRCBOT_VOLUNTEER_CHANNEL: + raise ValidationError('The public IRC channel name is reserved') + if self.private_irc_channel_name == settings.IRCBOT_PUBLIC_CHANNEL or self.private_irc_channel_name == settings.IRCBOT_VOLUNTEER_CHANNEL: + raise ValidationError('The private IRC channel name is reserved') + + # make sure public_irc_channel_name is not in use as public or private irc channel for another team, case insensitive + if self.public_irc_channel_name: + if Team.objects.filter(private_irc_channel_name__iexact=self.public_irc_channel_name).exclude(pk=self.pk).exists() or Team.objects.filter(public_irc_channel_name__iexact=self.public_irc_channel_name).exclude(pk=self.pk).exists(): + raise ValidationError('The public IRC channel name is already in use on another team!') + + # make sure private_irc_channel_name is not in use as public or private irc channel for another team, case insensitive + if self.private_irc_channel_name: + if Team.objects.filter(private_irc_channel_name__iexact=self.private_irc_channel_name).exclude(pk=self.pk).exists() or Team.objects.filter(public_irc_channel_name__iexact=self.private_irc_channel_name).exclude(pk=self.pk).exists(): + raise ValidationError('The private IRC channel name is already in use on another team!') @property - def responsible(self): - if TeamMember.objects.filter(team=self, responsible=True).exists(): - return User.objects.filter( - teammember__team=self, - teammember__responsible=True - ) - else: - return self.area.responsible.all() + def memberships(self): + """ + Returns all TeamMember objects for this team. + Use self.members.all() to get User objects for all members, + or use self.memberships.all() to get TeamMember objects for all members. + """ + return TeamMember.objects.filter( + team=self + ) @property - def anoncount(self): - return self.approvedmembers.filter(user__profile__public_credit_name_approved=False).count() + def approved_members(self): + """ + Returns only approved members (returns User objects, not TeamMember objects) + """ + return self.members.filter( + teammember__approved=True + ) @property - def approvedmembers(self): - return TeamMember.objects.filter(team=self, approved=True) + def unapproved_members(self): + """ + Returns only unapproved members (returns User objects, not TeamMember objects) + """ + return self.members.filter( + teammember__approved=False + ) + + @property + def responsible_members(self): + """ + Return only approved and responsible members + Used to handle permissions for team management + """ + return self.members.filter( + teammember__approved=True, + teammember__responsible=True + ) + + @property + def regular_members(self): + """ + Return only approved and not responsible members with + an approved public_credit_name. + Used on the people pages. + """ + return self.members.filter( + teammember__approved=True, + teammember__responsible=False, + ) + + @property + def unnamed_members(self): + """ + Returns only approved and not responsible members, + without an approved public_credit_name. + """ + return self.members.filter( + teammember__approved=True, + teammember__responsible=False, + profile__public_credit_name_approved=False + ) class TeamMember(CampRelatedModel): - user = models.ForeignKey('auth.User') - team = models.ForeignKey('teams.Team') - approved = models.BooleanField(default=False) - responsible = models.BooleanField(default=False) + + user = models.ForeignKey( + 'auth.User', + on_delete=models.PROTECT, + help_text="The User object this team membership relates to", + ) + + team = models.ForeignKey( + 'teams.Team', + on_delete=models.PROTECT, + help_text="The Team this membership relates to" + ) + + approved = models.BooleanField( + default=False, + help_text="True if this membership is approved. False if not." + ) + + responsible = models.BooleanField( + default=False, + help_text="True if this teammember is responsible for this Team. False if not." + ) + + irc_acl_fix_needed = models.BooleanField( + default=False, + help_text='Maintained by the IRC bot, manual editing should not be needed. Will be set to true when a teammember sets or changes NickServ username, and back to false after the ACL has been fixed by the bot.', + ) + + class Meta: + ordering = ['-responsible', '-approved'] def __str__(self): - return '{} is {} member of team {}'.format( - self.user, '' if self.approved else 'an unapproved', self.team + return '{} is {} {} member of team {}'.format( + self.user, + '' if self.approved else 'an unapproved', + '' if not self.responsible else 'a responsible', + self.team ) @property def camp(self): + """ All CampRelatedModels must have a camp FK or a camp property """ return self.team.camp - -@receiver(post_save, sender=TeamMember) -def add_responsible_email(sender, instance, created, **kwargs): - if created: - if not add_new_membership_email(instance): - logger.error('Error adding email to outgoing queue') + camp_filter = 'team__camp' class TeamTask(CampRelatedModel): team = models.ForeignKey( 'teams.Team', related_name='tasks', + on_delete=models.PROTECT, help_text='The team this task belongs to', ) name = models.CharField( @@ -167,9 +320,18 @@ class TeamTask(CampRelatedModel): description = models.TextField( help_text='Description of the task. Markdown is supported.' ) + when = DateTimeRangeField( + blank=True, + null=True, + help_text='When does this task need to be started and/or finished?' + ) + completed = models.BooleanField( + help_text='Check to mark this task as completed.', + default=False + ) class Meta: - ordering = ['name'] + ordering = ['completed', 'when', 'name'] unique_together = (('name', 'team'), ('slug', 'team')) def get_absolute_url(self): @@ -177,14 +339,61 @@ class TeamTask(CampRelatedModel): @property def camp(self): + """ All CampRelatedModels must have a camp FK or a camp property """ return self.team.camp + camp_filter = 'team__camp' + def save(self, **kwargs): + # generate slug if needed if not self.slug: self.slug = slugify(self.name) super().save(**kwargs) - @property - def responsible(self): - return team.responsible.all() +class TaskComment(UUIDModel, CreatedUpdatedModel): + task = models.ForeignKey('teams.TeamTask', on_delete=models.PROTECT, related_name="comments") + author = models.ForeignKey('teams.TeamMember', on_delete=models.PROTECT) + comment = models.TextField() + + +class TeamShift(CampRelatedModel): + + class Meta: + ordering = ("shift_range",) + + team = models.ForeignKey( + 'teams.Team', + related_name='shifts', + on_delete=models.PROTECT, + help_text='The team this shift belongs to', + ) + + shift_range = DateTimeRangeField() + + team_members = models.ManyToManyField( + TeamMember, + blank=True, + ) + + people_required = models.IntegerField( + default=1 + ) + + @property + def camp(self): + """ All CampRelatedModels must have a camp FK or a camp property """ + return self.team.camp + + camp_filter = 'team__camp' + + def __str__(self): + return "{} team shift from {} to {}".format( + self.team.name, + self.shift_range.lower, + self.shift_range.upper + ) + + @property + def users(self): + return [member.user for member in self.team_members.all()] diff --git a/src/teams/signal_handlers.py b/src/teams/signal_handlers.py new file mode 100644 index 00000000..1a0fa6a6 --- /dev/null +++ b/src/teams/signal_handlers.py @@ -0,0 +1,30 @@ +from .email import add_new_membership_email +from ircbot.utils import add_irc_message +from django.conf import settings +import logging +logger = logging.getLogger("bornhack.%s" % __name__) + + +def teammember_saved(sender, instance, created, **kwargs): + """ + This signal handler is called whenever a TeamMember instance is saved + """ + # if this is a new unapproved teammember send a mail to team responsibles + if created and not instance.approved: + # call the mail sending function + if not add_new_membership_email(instance): + logger.error('Error adding email to outgoing queue') + + +def teammember_deleted(sender, instance, **kwargs): + """ + This signal handler is called whenever a TeamMember instance is deleted + """ + if instance.team.private_irc_channel_name and instance.team.private_irc_channel_managed: + # TODO: remove user from private channel ACL + pass + + if instance.team.public_irc_channel_name and instance.team.public_irc_channel_managed: + # TODO: remove user from public channel ACL + pass + diff --git a/src/teams/templates/fix_irc_acl.html b/src/teams/templates/fix_irc_acl.html new file mode 100644 index 00000000..8a8887e6 --- /dev/null +++ b/src/teams/templates/fix_irc_acl.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} +{% load commonmark %} + +{% block title %} +Fix IRC permissions for NickServ user {{ request.user.profile.nickserv_username }} for IRC channel {{ team.irc_channel_name }} +{% endblock %} + +{% block content %} + +Fix IRC permissions+This will make the bot re-add IRC ACL for your NickServ user {{ request.user.profile.nickserv_username }} for IRC channel {{ team.irc_channel_name }}. Use this in cases where you are unable to join the team IRC channel after entering your NickServ username in your profile. + +{% endblock %} diff --git a/src/teams/templates/task_detail.html b/src/teams/templates/task_detail.html index 5ac2b2b7..c650ebb3 100644 --- a/src/teams/templates/task_detail.html +++ b/src/teams/templates/task_detail.html @@ -1,15 +1,47 @@ -{% extends 'base.html' %} +{% extends 'team_base.html' %} {% load commonmark %} +{% load bootstrap3 %} {% block title %} {{ task.name }} {% endblock %} -{% block content %} +{% block team_content %}
-
diff --git a/src/teams/templates/task_form.html b/src/teams/templates/task_form.html
index c03e64c6..69d7e603 100644
--- a/src/teams/templates/task_form.html
+++ b/src/teams/templates/task_form.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'team_base.html' %}
{% load commonmark %}
{% load bootstrap3 %}
@@ -11,7 +11,7 @@ Create Task
for {{ team.name }} Team
{% endblock %}
-{% block content %}
+{% block team_content %}
Task: {{ task.name }}{{ task.description|commonmark }}
-
+ Task: {{ task.name }} ({% if not task.completed %}Not {% endif %}Completed)
+ {{ task.description|untrustedcommonmark }}
+
+ {% if user in task.team.members.all %}
+
+ +
+
+ {% endif %}
+ + @@ -30,7 +30,7 @@ for {{ team.name }} Team
+
+
+{{ team.name }} Team+
+
+
+{% endblock %}
diff --git a/src/teams/templates/team_detail.html b/src/teams/templates/team_detail.html
deleted file mode 100644
index d6e86830..00000000
--- a/src/teams/templates/team_detail.html
+++ /dev/null
@@ -1,102 +0,0 @@
-{% extends 'base.html' %}
-{% load commonmark %}
-{% load teams_tags %}
-{% load bootstrap3 %}
-
-{% block title %}
-Team: {{ team.name }} | {{ block.super }}
-{% endblock %}
-
-{% block content %}
-
-
+
+
+
+
++ + {% if request.user.is_authenticated %} + + {% if request.user in team.members.all %} + Your membership status: {% membershipstatus user team %} + + {% if request.user in team.responsible_members.all %} + Manage Team + {% endif %} + + {% else %} + {% if team.needs_members %} + This team is looking for members! Join Team + {% endif %} + {% endif %} + + {% endif %} +
+
+ {% block team_content %}{% endblock %}
+
+
+
-
-
-{% endblock %}
diff --git a/src/teams/templates/team_general.html b/src/teams/templates/team_general.html
new file mode 100644
index 00000000..2c5bfc91
--- /dev/null
+++ b/src/teams/templates/team_general.html
@@ -0,0 +1,48 @@
+{% extends 'team_base.html' %}
+{% load commonmark %}
+{% load bootstrap3 %}
+{% load teams_tags %}
+
+
+{% block team_content %}
+
+{{ team.name }} Team
-
-
- {{ team.description|unsafecommonmark }}
-
- {% if request.user|is_team_member:team %}
- Team guide
- {% endif %}
- {% if request.user in team.responsible.all %}
- Manage team
- {% endif %}
-
-
-- - Members-The following {{ team.approvedmembers.count }} people are members of the {{ team.name }} team: -
Your membership status: {% membershipstatus request.user team %} - {% endif %} - - {% if request.user in team.members.all %} - Leave Team - {% else %} - {% if team.needs_members %} - This team is looking for members! Join Team - {% endif %} - {% endif %} - -- - Tasks-This team is responsible for the following tasks -
+
+
+{# Team communications #}
+
+
+ Description+
+ {{ team.description|untrustedcommonmark }}
+
+
+
+{% endblock %}
diff --git a/src/teams/templates/team_info_categories.html b/src/teams/templates/team_info_categories.html
new file mode 100644
index 00000000..15f0900c
--- /dev/null
+++ b/src/teams/templates/team_info_categories.html
@@ -0,0 +1,48 @@
+{% extends 'team_base.html' %}
+{% load commonmark %}
+{% load bootstrap3 %}
+{% load teams_tags %}
+
+
+{% block team_content %}
+
+
+
+ Communication Channels+
+ {{ team.camp.title }} teams primarily use mailing lists and IRC to communicate. The {{ team.name }} team can be contacted in the following ways:
+
+
+Mailing List+ {% if team.mailing_list and request.user in team.approved_members.all %} +The {{ team.name }} Team mailinglist is {{ team.mailing_list }}{% if team.mailing_list_archive_public %}, and the archives are publicly available{% endif %}. You should sign up for the list if you haven't already. + {% elif team.mailing_list and team.mailinglist_nonmember_posts %} +The {{ team.name }} Team mailinglist is {{ team.mailing_list }}{% if team.mailing_list_archive_public %}, and the archives are publicly available{% endif %}. You do not need to be a member of the list to post to it. + {% else %} +The {{ team.name }} Team does not have a public mailing list, but it can be contacted through our main email info@bornhack.dk. + {% endif %} + + IRC Channel+ {% if team.public_irc_channel_name %} +The {{ team.name }} Team public IRC channel is {{ team.public_irc_channel_name }} on {{ IRCBOT_SERVER_HOSTNAME }}. + {% else %} + The {{ team.name }} Team does not have a public IRC channel, but it can be reached through our main IRC channel {{ IRCBOT_PUBLIC_CHANNEL }} on {{ IRCBOT_SERVER_HOSTNAME }}. + {% endif %} + + {% if request.user in team.approved_members.all and team.private_irc_channel_name %} +The {{ team.name }} Team private IRC channel is {{ team.private_irc_channel_name }} on {{ IRCBOT_SERVER_HOSTNAME }}. + {% endif %} + +
+
+
+{% endblock %}
diff --git a/src/teams/templates/team_info_item_delete_confirm.html b/src/teams/templates/team_info_item_delete_confirm.html
new file mode 100644
index 00000000..18e6e28b
--- /dev/null
+++ b/src/teams/templates/team_info_item_delete_confirm.html
@@ -0,0 +1,30 @@
+{% extends 'team_base.html' %}
+{% load commonmark %}
+{% load bootstrap3 %}
+
+{% block title %}
+{% if form.instance.id %}
+Edit Info Item: {{ form.instance.headline }}
+{% else %}
+Create Info item
+{% endif %}
+in {{ form.instance.category.headline }}
+{% endblock %}
+
+{% block team_content %}
+
+
+ Info Categories+
+
+ {% for info_category in team.info_categories.all %}
+
+
+{{ info_category.headline }}+
+ + {% endfor %} +
+
+{% endblock %}
diff --git a/src/teams/templates/team_info_item_form.html b/src/teams/templates/team_info_item_form.html
new file mode 100644
index 00000000..e062ae9d
--- /dev/null
+++ b/src/teams/templates/team_info_item_form.html
@@ -0,0 +1,43 @@
+{% extends 'team_base.html' %}
+{% load commonmark %}
+{% load bootstrap3 %}
+
+{% block title %}
+{% if object %}
+Editing "{{ object.headline }}"
+in "{{ form.instance.category.headline }}"
+{% else %}
+Create Info item
+in "{{ category.headline }}"
+{% endif %}
+{% endblock %}
+
+{% block team_content %}
+
+
+ + Delete info item {{ object.name }} + in {{ form.instance.category.headline }} ++
+
+
+
+
+{% endblock %}
diff --git a/src/teams/templates/team_join.html b/src/teams/templates/team_join.html
index ac4e8fd0..f231b7a3 100644
--- a/src/teams/templates/team_join.html
+++ b/src/teams/templates/team_join.html
@@ -1,18 +1,23 @@
-{% extends 'base.html' %}
+{% extends 'team_base.html' %}
{% load commonmark %}
{% block title %}
Join Team: {{ team.name }} | {{ block.super }}
{% endblock %}
-{% block content %}
+{% block team_content %}
-
+
+ + {% if object %} + Editing "{{ object.headline }}" + in "{{ object.category.headline }}" + {% else %} + Create Info Item + in "{{ category.headline }}" + {% endif %} ++
+
+
+
+{{ team.name }} Team-Really join the {{ team.name }} team? You will receive a message when your membership has been approved. + Really join the {{ team.name }} Team for {{ team.camp.title }}? + +Your membership will need to be approved by a team responsible. You will receive an email when your membership request has been processed. + + + + {% endblock %} diff --git a/src/teams/templates/team_leave.html b/src/teams/templates/team_leave.html index 9d904f54..7e345e3d 100644 --- a/src/teams/templates/team_leave.html +++ b/src/teams/templates/team_leave.html @@ -1,18 +1,18 @@ -{% extends 'base.html' %} +{% extends 'team_base.html' %} {% load commonmark %} {% block title %} Leave Team: {{ team.name }} | {{ block.super }} {% endblock %} -{% block content %} +{% block team_content %} Leave {{ team.name }} TeamReally leave the {{ team.name }} team? {% endblock %} diff --git a/src/teams/templates/team_list.html b/src/teams/templates/team_list.html index c72df85d..99733c13 100644 --- a/src/teams/templates/team_list.html +++ b/src/teams/templates/team_list.html @@ -7,13 +7,47 @@ Teams | {{ block.super }} {% endblock %} {% block content %} - {{ camp.title }} Teams-This is a list of the teams for {{ camp.title }}. To join a team just press the Join button, but please put some info in your profile first, so the team responsible has some idea who you are. -You can also leave a team of course, but please let the team responsible know why :) -Team memberships need to be approved by a team responsible. You will receive a message when your membership has been approved. -At {{ camp.title }} all organisers and volunteers buy full tickets like everyone else. In the future our budget may allow for discounts or free tickets for volunteers, but not this year. However: Please let us know if you can't afford a ticket - we will figure something out! -We currently have {{ teams.count }} teams for {{ camp.title }}: + +
+
+
{% if teams %}
+
+
+ {% if user.is_authenticated %}
+ About teams+This is a list of the teams for {{ camp.title }}. To join a team just press the Join button, but please put some info in your profile first, so the team responsible has some idea who you are. +You can also leave a team of course, but please let the team responsible know why :) +Team memberships need to be approved by a team responsible. You will receive a message when your membership has been approved. +At {{ camp.title }} all organisers and volunteers buy full tickets like everyone else. At future events our budget may allow for discounts or free tickets for volunteers, but currently it does not. +We currently have {{ teams.count }} teams for {{ camp.title }}. +
+
+ {% endif %}
+
+
+
+ {% if user_teams %}
+ Your teams+
No members found! -{% endif %} {% endblock %} - diff --git a/src/teams/templates/team_members.html b/src/teams/templates/team_members.html new file mode 100644 index 00000000..3873993d --- /dev/null +++ b/src/teams/templates/team_members.html @@ -0,0 +1,98 @@ +{% extends 'team_base.html' %} +{% load commonmark %} +{% load bootstrap3 %} +{% load teams_tags %} + + +{% block team_content %} + +
+
+
+{% endblock %}
diff --git a/src/teams/templates/team_shift_confirm_delete.html b/src/teams/templates/team_shift_confirm_delete.html
new file mode 100644
index 00000000..16a9ece2
--- /dev/null
+++ b/src/teams/templates/team_shift_confirm_delete.html
@@ -0,0 +1,10 @@
+{% extends 'team_base.html' %}
+
+{% block team_content %}
+
+
+
+{% endblock %}
diff --git a/src/teams/templates/team_shift_form.html b/src/teams/templates/team_shift_form.html
new file mode 100644
index 00000000..a8f9da76
--- /dev/null
+++ b/src/teams/templates/team_shift_form.html
@@ -0,0 +1,16 @@
+{% extends 'team_base.html' %}
+{% load commonmark %}
+{% load bootstrap3 %}
+
+
+{% block team_content %}
+
+
+
+{% endblock %}
diff --git a/src/teams/templates/team_shift_list.html b/src/teams/templates/team_shift_list.html
new file mode 100644
index 00000000..9d02d80c
--- /dev/null
+++ b/src/teams/templates/team_shift_list.html
@@ -0,0 +1,79 @@
+{% extends 'team_base.html' %}
+{% load commonmark %}
+{% load bootstrap3 %}
+
+
+{% block team_content %}
+
+{% if request.user in team.responsible_members.all %}
+
+ Create a single shift
+
+
+ Create multiple shifts
+
+{% endif %}
+
+
+
+ Members+
+
+The following {{ team.approved_members.count }} people {% if team.unapproved_members.count %}(and {{ team.unapproved_members.count }} pending){% endif %} are members of the {{ team.name }} Team: +
Your membership status: {% membershipstatus user team %} + + {% if request.user in team.members.all %} + {% if team.irc_channel and team.irc_channel_managed and request.user.profile.nickserv_username %} + Fix IRC ACL + {% endif %} + Leave Team + {% else %} + {% if team.needs_members %} + This team is looking for members! Join Team + {% endif %} + {% endif %} + {% endif %} + ++
+
+{% endblock %}
diff --git a/src/teams/templates/team_user_shifts.html b/src/teams/templates/team_user_shifts.html
new file mode 100644
index 00000000..fe370b1d
--- /dev/null
+++ b/src/teams/templates/team_user_shifts.html
@@ -0,0 +1,44 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+ Tasks+
+
+The {{ team.name }} Team is responsible for the following tasks +
Your shifts+ +
Approve member {{ teammember.user.profile.name }} for the {{ teammember.team.name }} teamReally approve the user {{ teammember.user.profile.name }} for the {{ teammember.team.name }} team? The user will receive an email with a message. + {% endblock %} diff --git a/src/teams/templates/teammember_remove.html b/src/teams/templates/teammember_remove.html index 82b7dd4c..222c9083 100644 --- a/src/teams/templates/teammember_remove.html +++ b/src/teams/templates/teammember_remove.html @@ -1,18 +1,18 @@ -{% extends 'base.html' %} +{% extends 'team_base.html' %} {% load commonmark %} {% block title %} Remove member {{ teammember.user.profile.name }} from the {{ teammember.team.name }} team {% endblock %} -{% block content %} +{% block team_content %} Remove member {{ teammember.user.profile.name }} from the {{ teammember.team.name }} teamReally remove the user {{ teammember.user.profile.name }} from the {{ teammember.team.name }} team? The user will receive an email with a message. {% endblock %} diff --git a/src/teams/templatetags/teams_tags.py b/src/teams/templatetags/teams_tags.py index 04b07d57..78ba078b 100644 --- a/src/teams/templatetags/teams_tags.py +++ b/src/teams/templatetags/teams_tags.py @@ -1,13 +1,32 @@ from django import template from teams.models import TeamMember - +from django.utils.safestring import mark_safe register = template.Library() -@register.simple_tag -def membershipstatus(user, team): - return team.memberstatus(user) - @register.filter def is_team_member(user, team): - return TeamMember.objects.filter(team=team, user=user, approved=True).exists() + return TeamMember.objects.filter( + team=team, user=user, approved=True + ).exists() + + +@register.simple_tag +def membershipstatus(user, team, showicon=False): + if user in team.responsible_members.all(): + text = "Responsible" + icon = "fa-star" + elif user in team.approved_members.all(): + text = "Member" + icon = "fa-thumbs-o-up" + elif user in team.unapproved_members.all(): + text = "Membership pending approval" + icon = "fa-clock-o" + else: + text = "Not member" + icon = "fa-times" + + if showicon: + return mark_safe("" % (icon, text)) + else: + return text diff --git a/src/teams/tests.py b/src/teams/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/teams/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/teams/urls.py b/src/teams/urls.py index e0e68822..cf40e0c3 100644 --- a/src/teams/urls.py +++ b/src/teams/urls.py @@ -1,74 +1,135 @@ -from django.conf.urls import url, include -from .views import * +from django.urls import path, include + +from teams.views.base import ( + TeamListView, + TeamGeneralView, + TeamManageView, + FixIrcAclView, +) + +from teams.views.members import ( + TeamMembersView, + TeamMemberRemoveView, + TeamMemberApproveView, + TeamJoinView, + TeamLeaveView, +) + +from teams.views.info import ( + InfoCategoriesListView, + InfoItemUpdateView, + InfoItemCreateView, + InfoItemDeleteView, +) + +from teams.views.tasks import ( + TeamTasksView, + TaskCreateView, + TaskDetailView, + TaskUpdateView, +) + +from teams.views.shifts import ( + ShiftListView, + ShiftCreateView, + ShiftCreateMultipleView, + ShiftUpdateView, + ShiftDeleteView, + MemberTakesShift, + MemberDropsShift, + UserShifts, +) + +app_name = 'teams' urlpatterns = [ - url( - r'^$', + path( + '', TeamListView.as_view(), name='list' ), - url( - r'^members/', include([ - url( - r'^(?P
| ||||||