customization: remove all occurences of ludwigsburg and replace with local settings

3 years ago · 8599962caf
parent 49605b77a2
commit 8599962caf
6 changed files with 13 additions and 8 deletions
--- a/jdav_web/jdav_web/settings/local.py
+++ b/jdav_web/jdav_web/settings/local.py
@ -6,6 +6,7 @@ SEKTION_TOWN = "69124 Heidelberg"
 SEKTION_TELEPHONE = "06221 284076"
 SEKTION_TELEFAX = "06221 437338"
 SEKTION_CONTACT_MAIL = "geschaeftsstelle@alpenverein-heidelberg.de"
+SEKTION_BOARD_MAIL = "vorstand@alpenverein-heidelberg.de"

 RESPONSIBLE_MAIL = "jugendreferat@jdav-hd.de"

@ -34,3 +35,7 @@ WAITING_CONFIRMATION_FREQUENCY = 90
 TEST_MAIL = "post@flavigny.de"

 REGISTRATION_FORM_DOWNLOAD_LINK = 'https://cloud.jdav-ludwigsburg.de/index.php/s/NQfRqA9MTKfPBkC'
+
+DOMAIN = 'jdav-hd.merten.dev'
+
+STARTPAGE_REDIRECT_URL = 'https://jdav-hd.de'
--- a/jdav_web/mailer/models.py
+++ b/jdav_web/mailer/models.py
@ -141,7 +141,7 @@ class Message(models.Model):
        # terrible looking underscores in subjects
        self.subject = self.subject.replace('_', ' ')
        # generate message id
-        message_id = "<{}@jdav-ludwigsburg.de>".format(self.pk)
+        message_id = "<{pk}@{domain}>".format(pk=self.pk, domain=settings.DOMAIN)
        # reply to addresses
        reply_to_unfiltered = [jl.association_email for jl in self.reply_to.all()]
        reply_to_unfiltered.extend([ml.email for ml in self.reply_to_email_address.all()])
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@ -26,7 +26,6 @@ def generate_random_key():
 GEMEINSCHAFTS_TOUR = MUSKELKRAFT_ANREISE = 0
 FUEHRUNGS_TOUR = OEFFENTLICHE_ANREISE = 1
 AUSBILDUNGS_TOUR = FAHRGEMEINSCHAFT_ANREISE = 2
-HOST = os.environ.get('DJANGO_ALLOWED_HOST', 'localhost:8000').split(",")[0]

 class ActivityCategory(models.Model):
    """
@ -259,7 +258,7 @@ class Member(Person):
    @property
    def association_email(self):
        """Returning the association email of the member"""
-        raw = "{0}.{1}@{2}".format(self.prename.lower(), self.lastname.lower(), HOST)
+        raw = "{0}.{1}@{2}".format(self.prename.lower(), self.lastname.lower(), settings.DOMAIN)
        return raw.replace('ö', 'oe').replace('ä', 'ae').replace('ü', 'ue')

    def get_group(self):
--- a/jdav_web/members/templates/members/crisis_intervention_list.tex
+++ b/jdav_web/members/templates/members/crisis_intervention_list.tex
@ -93,7 +93,7 @@
 \vspace{1cm}

 \noindent Bitte die ausgefüllte Teilnehmerliste vor Antritt der Aktivität per E-Mail an
-\href{mailto:info@alpenverein-ludwigsburg.de}{info@alpenverein-ludwigsburg.de} und 
-\href{mailto:vorstand@alpenverein-ludwigsburg.de}{vorstand@alpenverein-ludwigsburg.de} senden. 
+\href{mailto:{{ settings.SEKTION_CONTACT_MAIL }} }{ {{ settings.SEKTION_CONTACT_MAIL }} } und
+\href{mailto:{{ settings.SEKTION_BOARD_MAIL }} }{ {{ settings.SEKTION_BOARD_MAIL }} } senden.

 \end{document}
--- a/jdav_web/startpage/views.py
+++ b/jdav_web/startpage/views.py
@ -1,6 +1,7 @@
 from django.shortcuts import redirect
+from django.conf import settings


 # Create your views here.
 def index(request):
-    return redirect('https://www.alpenverein-ludwigsburg.de/gruppen/jugendgruppen')
+    return redirect(settings.STARTPAGE_REDIRECT_URL)
--- a/jdav_web/templates/general/base.html
+++ b/jdav_web/templates/general/base.html
@ -15,7 +15,7 @@
    <script>
    $( function() {
        $( ".datepicker" ).datepicker({
-          dateFormat: "dd.mm.yy" 
+          dateFormat: "dd.mm.yy"
        });
    } );
    </script>
@ -24,7 +24,7 @@
 <body>

 <div class="navbar-header">
-    <a class="navbar-brand" href="http://www.alpenverein-ludwigsburg.de"> 
+    <a class="navbar-brand" href="">
        <img class="navbar-logo" src="{% static "general/img/logo_dav.png" %}">
    </a>
    <ul class="navbar">