mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LIL-374. Update social urls in email base template

Browse Source
remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent 675aa601ce
commit fbbf5ca61a
2 changed files with 13 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      apps/auth/views.py
  2. 8
      apps/notification/templates/notification/email/_base.html

11
apps/auth/views.py
Unescape View File

@ -16,6 +16,8 @@ from django.views.generic.edit import BaseFormView
from django.shortcuts import redirect
from apps.notification.utils import send_email
from apps.config.models import Config
from .forms import LearnerRegistrationForm
from .tokens import verification_email_token
@ -49,11 +51,12 @@ class LearnerRegistrationView(FormView):
# fixme: change email text
# fixme: async send email
config = Config.load()
refferer = urlsplit(self.request.META.get('HTTP_REFERER'))
refferer = refferer[0] + '://' + refferer[1]
token = verification_email_token.make_token(user)
url = refferer + str(reverse_lazy('lilcity:verification-email', args=[token]))
send_email('Verification Email', email, "notification/email/verification_email.html", url=url)
send_email('Verification Email', email, "notification/email/verification_email.html", url=url, config=config)
return JsonResponse({"success": True}, status=201)
@ -111,6 +114,10 @@ class PasswordResetView(views.PasswordContextMixin, BaseFormView):
def form_valid(self, form):
refferer = urlsplit(self.request.META.get('HTTP_REFERER'))
refferer = refferer[0] + '://' + refferer[1]
config = Config.load()
extra_email_context = {'config': config}
if self.extra_email_context and isinstance(self.extra_email_context, dict):
extra_email_context.update(self.extra_email_context)
opts = {
'domain_override': refferer,
'use_https': self.request.is_secure(),
@ -120,7 +127,7 @@ class PasswordResetView(views.PasswordContextMixin, BaseFormView):
'subject_template_name': self.subject_template_name,
'request': self.request,
'html_email_template_name': self.html_email_template_name,
'extra_email_context': self.extra_email_context,
'extra_email_context': extra_email_context,
}
form.save(**opts)
return JsonResponse({"success": True})

8
apps/notification/templates/notification/email/_base.html
Unescape View File

@ -47,16 +47,16 @@
<tr>
<td style="width:33.33%;padding:35px 0;vertical-align:middle;font-size:12px;color:#888888">{% now "Y" %} © Lil City, UAB. </td>
<td style="width:33.33%;padding:35px 0;vertical-align:middle;text-align:center">
<a href="#" style="display:inline-block;margin:0 5px;vertical-align:middle;font-size:0">
<a href="{{ config.SERVICE_INSTAGRAM_URL }}" style="display:inline-block;margin:0 5px;vertical-align:middle;font-size:0">
<img width="16" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAAEzo7pQAAABL1BMVEUAAAD///9VVVVAQEAzM2YrK1UkSUkuLkYnJzsiM0QgMEAeLTwmJkAkMT0hLDcdJzskLjciKzwgKDgeLTweKzceKjUcKDkgKzUdJjogKjggKTcfKDYeJjUeKTgdKDYcKTYfKDgeJzcdJjgdKTcdKDYeJzceKDcdJzUdJjccKDYcKDYeJzUeJzcdKDceJzYdJzYdJzUdJzYdJjcdKDYdJzUcJzcdJjYdKDUcJjUcJjceJzYdJjcdJzYcJzUdJzYdJzYdJjUdJjUcJzYdJzUdJjYdJzYcJjYdJzUcJjUdJzUdJjYdJjYcJzUcJzYdJjUcJzYdJzUdJzYdJjYcJjYcJzUcJzYdJzYdJjUcJzYcJzYcJzUdJjYdJjYdJjUdJzUdJzUcJzYcJjYcJjUcJjUcJjWqhzSBAAAAZHRSTlMAAQMEBQYHCw0PEBEUFRcaHB4gIiorLTA1Nzg5Q0RHUVJUV1hZXGZpamxtbm90d3t8hIyNj5GTlJmam5+qrLC4uru8wMHDyM3O0tTV19nd4Obn6Onr7O3w8vP09vf4+fr7/P3+8ZYTQAAAAZRJREFUOMt1k1dj00AQhD8TK4gOCQIEoofeQdgodAOGWJQkkGDR0c3//w08nM9eKXhfpJsZbZk9gTRG/AEJqAASCTiPjcQ/MsQVuAmIznH+ehBgA0pJysF5cQ2w/QAEfIYvyBNCgNh1FhFbDOjBwKWhbryqLmXa6GUi3fx6aOGpTL5owgbgzVWAaAawV5IueVVetJIS1ZpFDyAfh+MoAboq4qBP3QDqzKZwSZghaEoPdJ7pw5JpfVnXOalHpvX9AIoDsO8bANceB+BoCcCZ58Y9gPLcFHg1Am4bP3giaatpbnB13AJWc/rr5pwJ6Bs76i5A1LcWWbrXBehrveGISbihHuQqmBuFcirFFlrsNLrW2N9SAI4MJf100q87syVqKlhY0+vD/vXid13eKXirlel3naG/FVZwTGum9mm9bAvi+sfumeCW32ejxIqqpcDf06fFHQIOvNfv+6cOLl8YSnf/MwXAiYfvNj++uLEHO2apdL6TqUYktcvm8ZmrE4gGckUat8k4LZwG0eS3z8uqveuqzBOAf9XIdaH2KUvyAAAAAElFTkSuQmCC">
</a>
<a href="#" style="display:inline-block;margin:0 5px;vertical-align:middle;font-size:0">
<a href="{{ config.SERVICE_TWITTER_URL }}" style="display:inline-block;margin:0 5px;vertical-align:middle;font-size:0">
<img width="20" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAiCAMAAAFtvFuvAAAB71BMVEUAAAD///+AgIBVVVVAQEAzM2YrK1UkSUkgQEAcOTkzM00nJzskNzciM0QeLTwcKzkoKDYkMT0jLjogKzUfKT0dJzscLzkkLjcjLD4iKzwhKTogKDgfJzYeLTwdLDocKzkhJzsgJjkfLDgeKzcdKTocKDkhJzchKzYgKzUeKDcdJzYdJjocKzkgKTcfKDYfKDkeJjcdKjYgKDgfJzcfJzYeJjUeKTgdKDYcJzUfJjgfKTceKDYeKDgdJzgfKDgfKDceJzYeJzUdKDYcJzUeJzceJjceKTYdKDUdJzccJzYcJjYeKDUeKDceKDYeJzUeJzcdKDccJzYeJzYdJzUdJzUcJjceKDUdJzcdJzcdJzYdJjYdJjUdKDYdJzUcJzUdJjYdJzUcJjUeJzYdJzYdJzYdJjYcJzYcJzUdJzYdJjYdJzYdJzYcJzYcJzUdJzYdJzYdJzUdJzUcJjYcJjYcJjYcJzUdJzYdJjUcJzYcJzYcJzYcJzUdJjYdJzUcJjYdJzYdJzUcJjUcJjYdJzUdJzUdJjYdJjYdJjYdJjUdJzYcJzYcJzUcJjUcJjYdJjYdJzUdJzYdJjYcJjYcJzUcJzYdJzYdJzYdJjUdJjYcJzYcJzYcJzUcJzUdJjYdJjUdJzUcJzYcJjYcJjUcJjUcJjUsbQ+FAAAApHRSTlMAAQIDBAUGBwgJCg0ODxESExUWGBkaGxwdHh8gISIjJCcoKSosLS4vMDM0NTY4OTo8PUBBQkNER0hJSkxNTlJTVVZZW1xdXmBhY2RlZmducHR1d3x9foGCg4SFho6PkJOVmZucnaCio6WmqaqrrK+wsbKztLW2t7q8vb6/wcTHzM3O0NLT1NXW3d7g4eLj5Obn6Onr7O3u8PHy8/T19vj6+/z9/u3zopgAAAI9SURBVDjLjZTrV0xhGMV/MyOKLkNoKHRDKHShkDAuUUluuZVLIaFSyiWiQS6hmhpRDU1m/6E+nHOmMzNmrZ4vz9773c/z7vWusw4YJbNzG74D8CIiIecUsixe3gFyW1O77x7zXwTBy/uGY3lkZZJk321VGaAt6m3BkTGJF6gHoCTG3ReheQCEAb4A0k3IGwNgl9QTewHOAU3tt9Kr2ujZAHXX1QXJgnaFW3oemJ4VxAX1GPT9LbuoLKMPjS5q4SoLJf8wV4z8NZVG6Uomrh1tUjlLrJNzMmPRPmeCmXBV/jP5WjuA4T9BANpmAXIaHgmYL+6SF5DLDHoJUAHpIb2uN1P5ngBMlwPcCJhioBLgzYWoCFoNcHQiWoz5VAC2mmy82SYu1Bh9mXIiWmVkrFCdbgOtVEbkvE59AGTLawh+STMbAehVkelKmtLQQRdrj0zKZ49x7ZekQO2SnjctJVYp6t4ToxR8kFn9bpvcLwXLbDzTr8+lBjwza/gXkgHGdNondViz6SE1RO2/qvlCgDRpM9RMSF+bs4HLemq3NUqPHQYMqRiANU2fjIsG7cYRnbLgNx22n6RscNlYUljbLNyq7sSPdEBBh4XXS7kJjaM6u0hqNZeewHdPb+20SfPF//U9jPaBJ6DxkjjbpmkNxIlZg5JG7Urqc/3ebuOr8j25pfWdASl4zrko75vU7CH7nGtYkgLtx9MWfyl774SkvnVxt6ae/yhJCv/0LxifwKsTjsQv6/QUVVRX7HQnOP4HPx23D5XxAnwAAAAASUVORK5CYII=">
</a>
<a href="#" style="display:inline-block;margin:0 5px;vertical-align:middle;font-size:0">
<a href="{{ config.SERVICE_FB_URL }}" style="display:inline-block;margin:0 5px;vertical-align:middle;font-size:0">
<img width="8" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAkCAMAAAHAwXp+AAAAQlBMVEUAAAAcOTkrK0AgMEAeLTwkLjchJzsdKTUdJzccJjYdKDYdJzYdJjUdJzUdJzUcJzYdJzUdJjUdJjYcJzYcJjUcJjVrqGAPAAAAFXRSTlMACQwQERwnPmFkeq+7wM3Z5fDx8/1ddfMtAAAAcUlEQVQoz82QSw6AIAxEKyj4BX9z/6tqQKToQsLKF1I6DVOaEr1oiRCOD3fig6PRZxgph2rF7szSa6vcBQclbXMSRn/5Z3tp+2Uv/bRowrod7BI3ZoCxUyJsxWCS/PEKnbgHdGm7DSIKMFjxMcFvC5wDGjkH6Si4YCcAAAAASUVORK5CYII=">
</a>
<a href="#" style="display:inline-block;margin:0 5px;vertical-align:middle;font-size:0">
<a href="{{ config.SERVICE_YOUTUBE_URL }}" style="display:inline-block;margin:0 5px;vertical-align:middle;font-size:0">
<img width="18" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAeCAMAAAEEOHz3AAABxVBMVEUAAAD///+AgIBVVVVAQEAzM2YrK1UkSUkgQEAcOTkzM00uLkYnJzsiM0QeLTwcKzkoKDYmJkAjLjohLDcgKzUfKT0dJzscLzkkLjcjLD4dLDocKzkiKTchJzsgJjkfLDgeKzccKDkfKjkeKDcdJzYgKjggKTcfKDYeJzgeJjUdKDYcJzUfJjgeKDYeKDgdJzgcKTYfKDceJzUdJjgdKDYeJzceJjcdKDUeKDUeKDceKDYdJzUdJjccKDYeJzcdKDUcJzYcJzYeJzYeKDcdJzYdJzUcJjceKDUdJzcdJzcdJzYdJjYdJjUcKDceJzYeJzYdJzUdJjccJzcdKDUdJzYdJzYcJjUcJjceJzYdJzYdJzUdJjYcJzYcJzUeJzYdJjUdJzYdJzYcJzYcJzUdJjYdJzYdJzYcJjYcJjYdJzYdJzYdJzYdJjUcJzYcJjYdJjUdJzYdJzUcJjYcJzYdJzUdJjYdJjYcJzUcJzUcJzYdJjUdJzYcJzYcJjUcJjYdJjYdJzUdJzUdJjYcJjYcJzUcJzYdJzYdJzYdJjUdJjUdJjYcJzYcJzUcJzUdJjYdJjYdJjUdJzUcJzYcJjYcJjUcJjUcJjW/BG2JAAAAlnRSTlMAAQIDBAUGBwgJCgsNDxESExQWFxgZGhscHSMkJScoKSotMTM0Nzg5O0NHSElMTU5RU1ZXWVxdYGVmZ2lqbG9zdXZ3eXt8foGCg4SFhoeJiouMkZSWl5mam5yeoKKjpKepqqusrq+ws7S3uLm6vcfJzM3Q0dPU1tfY2t3f4OLj5OXm6Onr7O3u7/Dx8vT19vf4+fv8/f45PFJXAAABsklEQVQ4y4WS5VcCURDFx8XAFjvBQmyxFbs7QezAFhUbu0EMFFGYv9e3shx5oM/7Yfaeu7+dN2/OAow5NmWA8AFAKji/K1H58VMnwDFvTSDo3m14xgStg4JDIRQEfq0bzw7jRDVAzA8PYI1wOwn/ENyFyOVyd91vhS+OhHZZIEXdYF2hLJzjwtPza7qnL2xuMMmDd0UmSQYe0pFZwteDLoqCfqynqCJb1E+vxTmg5E+YDNXAvOHWjvYbg26kUUnS9zNtW4UiPhACE3LKmkZXMM3jAi7F3AtRNPiMijjqE8E25nlHEPRiD/OKALLRO1Kiho5C7BaO7rWFcq8TX7Q+cwE1agCdzCxBJtIyklhxhkydknNXcFIEDImmcJksBf4RITyhagfqZf9BJpRqPtFcL2JD/I+iJDdZTf4TMn9DRLFTTjxPYnXiFdzzjnVMKFWPuKdgzVR6ic5JCWPwffzEBxXHXgEEiH9f5h3GsRceh3eQ8oo363PqvhZVeYEiPTEyVCwOjUiQyvPLapt71bNrV/iWyrPJxZUN7UPaBb3BeGWx2mzWx+uTnU3d+HBHQ1UJT3wB/BS4G0pVFF4AAAAASUVORK5CYII=">
</a>
</td>

Write Preview
Loading…
Cancel
Save