diff options
| -rw-r--r-- | templates/contact.html | 9 | ||||
| -rw-r--r-- | templates/flatpages/default.html | 2 | ||||
| -rw-r--r-- | templatetags/email.py | 24 | ||||
| -rw-r--r-- | urls.py | 1 | ||||
| -rw-r--r-- | views.py | 4 |
5 files changed, 1 insertions, 39 deletions
diff --git a/templates/contact.html b/templates/contact.html deleted file mode 100644 index 1359a16..0000000 --- a/templates/contact.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "index.html" %} -{% load email %} - -{% block title %}Contacter – {% endblock %} - -{% block body %} - <h3>Contacter</h3> - <p>Pour contacter l’administrateur du service, envoyez un mail à l’adresse suivante :<br/>{{ email|format_email }}.</p> -{% endblock %} diff --git a/templates/flatpages/default.html b/templates/flatpages/default.html index 42f67db..913cda9 100644 --- a/templates/flatpages/default.html +++ b/templates/flatpages/default.html @@ -4,5 +4,5 @@ {% block body %} <h3>{{ flatpage.title }}</h3> - <p>{{ flatpage.content }}</p> + {{ flatpage.content }} {% endblock %} diff --git a/templatetags/email.py b/templatetags/email.py deleted file mode 100644 index 68dbd84..0000000 --- a/templatetags/email.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2017 Alban Gruin -# -# celcatsanitizer is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# celcatsanitizer is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with celcatsanitizer. If not, see <http://www.gnu.org/licenses/>. - -from django import template - -register = template.Library() - -@register.filter -def format_email(address): - return address.replace("+", " [plus] ") \ - .replace("@", " [arobase] ") \ - .replace(".", " [point] ") @@ -19,7 +19,6 @@ from . import feeds, views urlpatterns = [ url(r"^$", views.index, name="index"), url(r"^pages/", include("django.contrib.flatpages.urls")), - url(r"^contact$", views.contact, name="contact"), url(r"^(?P<year_slug>[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P<year_slug>[-\w]+)/(?P<timetable_slug>[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P<year_slug>[-\w]+)/(?P<timetable_slug>[-\w]+)/(?P<group_slug>[-\w]+)/$", views.timetable, name="timetable"), @@ -15,7 +15,6 @@ import datetime -from django.conf import settings from django.db.models import Max from django.db.models.functions import Length from django.http import Http404 @@ -103,6 +102,3 @@ def calendars(request, year_slug, timetable_slug, group_slug): .order_by("length") return render(request, "calendars.html", {"group": group, "groups": groups}) - -def contact(request): - return render(request, "contact.html", {"email": settings.ADMINS[0][1]}) |