diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index a48b9eac..784aef0c 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -46,7 +46,6 @@ INSTALLED_APPS = [ "ckeditor_uploader", "easy_thumbnails", "rest_framework", - "softhyphen", "django_crontab", "django_filters", "django_static_jquery_ui", diff --git a/fet2020/requirements.txt b/fet2020/requirements.txt index 78277341..e102e254 100644 Binary files a/fet2020/requirements.txt and b/fet2020/requirements.txt differ diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html index ec758048..0cf34c78 100644 --- a/fet2020/templates/members/index.html +++ b/fet2020/templates/members/index.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% load flatpages job_groups softhyphen_tags static %} +{% load flatpages job_groups static %} {% block content %} @@ -55,9 +55,9 @@ {% if request.user.is_authenticated %} {% if active_job_group %} -
  • +
  • - {{ active_job_group.name|softhyphen|safe }} bearbeiten + {{ active_job_group.name|safe }} bearbeiten
  • {% endif %} diff --git a/fet2020/templates/members/member.html b/fet2020/templates/members/member.html index d24c461a..e419525e 100644 --- a/fet2020/templates/members/member.html +++ b/fet2020/templates/members/member.html @@ -1,7 +1,5 @@ {% extends 'members/index.html' %} -{% load softhyphen_tags %} - {% block title %}{{ member.firstname }} {{ member.surname }}{% endblock %} {% block extraheader %} @@ -24,7 +22,7 @@ {% if member.description %}
    - {{ member.description|softhyphen|safe }} + {{ member.description|safe }}
    {% endif %}