diff --git a/proj/settings.py b/proj/settings.py index 6c59c3b0..90a54445 100644 --- a/proj/settings.py +++ b/proj/settings.py @@ -223,21 +223,21 @@ LOGIN_URL='/' #registration info ACCOUNT_ACTIVATION_DAYS=2 # mail settings -EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -EMAIL_HOST = 'localhost' -EMAIL_HOST_USER = '' -EMAIL_HOST_PASSWORD = '' -EMAIL_USE_TLS = False -EMAIL_PORT = 25 +#EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +#EMAIL_HOST = 'localhost' +#EMAIL_HOST_USER = '' +#EMAIL_HOST_PASSWORD = '' +#EMAIL_USE_TLS = False +#EMAIL_PORT = 25 #test -#EMAIL_USE_TLS = True -#EMAIL_HOST = 'smtp.gmail.com' -#EMAIL_HOST_USER = 'kotzilla' -#EMAIL_HOST_USER = 'kotzillla@gmail.com' -#EMAIL_HOST_PASSWORD = 'fitteR2006!' - -#EMAIL_PORT = 587 -#DEFAULT_FROM_EMAIL = 'kotzillla@gmail.com' +EMAIL_USE_TLS = True +EMAIL_HOST = 'smtp.gmail.com' +EMAIL_HOST_USER = 'kotzilla' +EMAIL_HOST_USER = 'kotzillla@gmail.com' +EMAIL_HOST_PASSWORD = 'fitteR2006!' + +EMAIL_PORT = 587 +DEFAULT_FROM_EMAIL = 'kotzillla@gmail.com' AUTHENTICATION_BACKENDS = ( diff --git a/registration/backends/default/views.py b/registration/backends/default/views.py index 06e3ac06..c267363a 100644 --- a/registration/backends/default/views.py +++ b/registration/backends/default/views.py @@ -34,7 +34,7 @@ class RegistrationView(BaseRegistrationView): * The creation of the templates ``registration/activation_email_subject.txt`` and - ``registration/activation_email.txt``, which will be used for + ``registration/activation_email.html``, which will be used for the activation email. See the notes for this backends ``register`` method for details regarding these templates. diff --git a/registration/models.py b/registration/models.py index 4ecdf033..7f0f1509 100644 --- a/registration/models.py +++ b/registration/models.py @@ -2,13 +2,15 @@ import datetime import hashlib import random import re - +from django.core.mail import EmailMessage from django.conf import settings from django.contrib.auth.models import User from django.db import models from django.db import transaction -from django.template.loader import render_to_string +from django.template.loader import render_to_string, get_template +from django.template import Context from django.utils.translation import ugettext_lazy as _ +from email.MIMEImage import MIMEImage try: from django.contrib.auth import get_user_model @@ -232,7 +234,7 @@ class RegistrationProfile(models.Model): text; output longer than one line will be forcibly joined into only a single line. - ``registration/activation_email.txt`` + ``registration/activation_email.html`` This template will be used for the body of the email. These templates will each receive the following context @@ -256,15 +258,33 @@ class RegistrationProfile(models.Model): framework for details regarding these objects' interfaces. """ + user = self.user ctx_dict = {'activation_key': self.activation_key, 'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS, - 'site': site} + 'site': site, + 'user': user} subject = render_to_string('registration/activation_email_subject.txt', ctx_dict) # Email subject *must not* contain newlines subject = ''.join(subject.splitlines()) + + message = get_template('registration/activation_email.html').render(Context(ctx_dict)) + msg = EmailMessage(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email]) + msg.content_subtype = "html" + images =(('/img/logo_reg.png', 'logo'), + ('/img/soc-medias/sm-icon-rss.png', 'rss'), + ('/img/soc-medias/sm-icon-fb.png', 'fb'), + ('/img/soc-medias/sm-icon-lin.png', 'linkedin'), + ('/img/soc-medias/sm-icon-vk.png', 'vk'), + ('/img/soc-medias/sm-icon-twit.png', 'twit'), + ('/img/mail-logo-2.jpg','logo2')) + for img in images: + fp = open(settings.STATIC_ROOT+img[0], 'rb') + msg_img = MIMEImage(fp.read()) + fp.close() + msg_img.add_header('Content-ID', '<'+img[1]+'>') + msg.attach(msg_img) + + msg.send() - message = render_to_string('registration/activation_email.txt', - ctx_dict) - - self.user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) + #self.user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) \ No newline at end of file diff --git a/static/img/1.png b/static/img/1.png new file mode 100644 index 00000000..b4d8164f Binary files /dev/null and b/static/img/1.png differ diff --git a/static/img/2.png b/static/img/2.png new file mode 100644 index 00000000..42786c85 Binary files /dev/null and b/static/img/2.png differ diff --git a/static/img/about_pic.png b/static/img/about_pic.png new file mode 100644 index 00000000..913bd16f Binary files /dev/null and b/static/img/about_pic.png differ diff --git a/static/img/add_link_text.png b/static/img/add_link_text.png new file mode 100644 index 00000000..74974dd2 Binary files /dev/null and b/static/img/add_link_text.png differ diff --git a/static/img/add_pic_block_bg.png b/static/img/add_pic_block_bg.png new file mode 100644 index 00000000..64a30668 Binary files /dev/null and b/static/img/add_pic_block_bg.png differ diff --git a/static/img/add_pic_block_bg1.png b/static/img/add_pic_block_bg1.png new file mode 100644 index 00000000..74debc37 Binary files /dev/null and b/static/img/add_pic_block_bg1.png differ diff --git a/static/img/add_pic_block_bg2.png b/static/img/add_pic_block_bg2.png new file mode 100644 index 00000000..e515e3b1 Binary files /dev/null and b/static/img/add_pic_block_bg2.png differ diff --git a/static/img/ag-bg.png b/static/img/ag-bg.png new file mode 100644 index 00000000..c64dc99e Binary files /dev/null and b/static/img/ag-bg.png differ diff --git a/static/img/ajax-loader.gif b/static/img/ajax-loader.gif new file mode 100644 index 00000000..67d23f3c Binary files /dev/null and b/static/img/ajax-loader.gif differ diff --git a/static/img/approved-logo.png b/static/img/approved-logo.png new file mode 100644 index 00000000..6f28d68d Binary files /dev/null and b/static/img/approved-logo.png differ diff --git a/static/img/blog_pic.jpg b/static/img/blog_pic.jpg new file mode 100644 index 00000000..3368faaa Binary files /dev/null and b/static/img/blog_pic.jpg differ diff --git a/static/img/blog_pic1.jpg b/static/img/blog_pic1.jpg new file mode 100644 index 00000000..c29c191c Binary files /dev/null and b/static/img/blog_pic1.jpg differ diff --git a/static/img/blog_pic2.jpg b/static/img/blog_pic2.jpg new file mode 100644 index 00000000..edbc04b7 Binary files /dev/null and b/static/img/blog_pic2.jpg differ diff --git a/static/img/clock.png b/static/img/clock.png new file mode 100644 index 00000000..5620e403 Binary files /dev/null and b/static/img/clock.png differ diff --git a/static/img/female.png b/static/img/female.png new file mode 100644 index 00000000..2ae0db82 Binary files /dev/null and b/static/img/female.png differ diff --git a/static/img/libk_bg.png b/static/img/libk_bg.png new file mode 100644 index 00000000..15b34716 Binary files /dev/null and b/static/img/libk_bg.png differ diff --git a/static/img/logo_reg.png b/static/img/logo_reg.png new file mode 100644 index 00000000..fce2e4a8 Binary files /dev/null and b/static/img/logo_reg.png differ diff --git a/static/img/mail-logo-2.jpg b/static/img/mail-logo-2.jpg new file mode 100644 index 00000000..39f9d896 Binary files /dev/null and b/static/img/mail-logo-2.jpg differ diff --git a/static/img/male.png b/static/img/male.png new file mode 100644 index 00000000..42f3832b Binary files /dev/null and b/static/img/male.png differ diff --git a/static/img/map.png b/static/img/map.png new file mode 100644 index 00000000..e006e14c Binary files /dev/null and b/static/img/map.png differ diff --git a/static/img/no-logo.jpg b/static/img/no-logo.jpg new file mode 100644 index 00000000..af5abc3c Binary files /dev/null and b/static/img/no-logo.jpg differ diff --git a/static/img/no-logo.png b/static/img/no-logo.png new file mode 100644 index 00000000..a29836ad Binary files /dev/null and b/static/img/no-logo.png differ diff --git a/static/img/pic1.jpg b/static/img/pic1.jpg new file mode 100644 index 00000000..c016064d Binary files /dev/null and b/static/img/pic1.jpg differ diff --git a/static/img/pic10.jpg b/static/img/pic10.jpg new file mode 100644 index 00000000..d9e0ee87 Binary files /dev/null and b/static/img/pic10.jpg differ diff --git a/static/img/pic11.jpg b/static/img/pic11.jpg new file mode 100644 index 00000000..ba3e75c3 Binary files /dev/null and b/static/img/pic11.jpg differ diff --git a/static/img/pic12.png b/static/img/pic12.png new file mode 100644 index 00000000..6fe246bb Binary files /dev/null and b/static/img/pic12.png differ diff --git a/static/img/pic13.jpg b/static/img/pic13.jpg new file mode 100644 index 00000000..ca44f19a Binary files /dev/null and b/static/img/pic13.jpg differ diff --git a/static/img/pic14.jpg b/static/img/pic14.jpg new file mode 100644 index 00000000..61f2456a Binary files /dev/null and b/static/img/pic14.jpg differ diff --git a/static/img/pic15.jpg b/static/img/pic15.jpg new file mode 100644 index 00000000..8e3e85fe Binary files /dev/null and b/static/img/pic15.jpg differ diff --git a/static/img/pic16.jpg b/static/img/pic16.jpg new file mode 100644 index 00000000..a0c2420e Binary files /dev/null and b/static/img/pic16.jpg differ diff --git a/static/img/pic2.jpg b/static/img/pic2.jpg new file mode 100644 index 00000000..0012dcc5 Binary files /dev/null and b/static/img/pic2.jpg differ diff --git a/static/img/pic3.jpg b/static/img/pic3.jpg new file mode 100644 index 00000000..6963b2fa Binary files /dev/null and b/static/img/pic3.jpg differ diff --git a/static/img/pic4.jpg b/static/img/pic4.jpg new file mode 100644 index 00000000..c9870741 Binary files /dev/null and b/static/img/pic4.jpg differ diff --git a/static/img/pic5.jpg b/static/img/pic5.jpg new file mode 100644 index 00000000..8fafa1a0 Binary files /dev/null and b/static/img/pic5.jpg differ diff --git a/static/img/pic6.jpg b/static/img/pic6.jpg new file mode 100644 index 00000000..3259b33b Binary files /dev/null and b/static/img/pic6.jpg differ diff --git a/static/img/pic7.jpg b/static/img/pic7.jpg new file mode 100644 index 00000000..a494ce73 Binary files /dev/null and b/static/img/pic7.jpg differ diff --git a/static/img/pic8.jpg b/static/img/pic8.jpg new file mode 100644 index 00000000..8f41ae64 Binary files /dev/null and b/static/img/pic8.jpg differ diff --git a/static/img/pic8.png b/static/img/pic8.png new file mode 100644 index 00000000..6fc26cb7 Binary files /dev/null and b/static/img/pic8.png differ diff --git a/static/img/pic9.jpg b/static/img/pic9.jpg new file mode 100644 index 00000000..cfaa2219 Binary files /dev/null and b/static/img/pic9.jpg differ diff --git a/static/img/pin.png b/static/img/pin.png new file mode 100644 index 00000000..b0dba26d Binary files /dev/null and b/static/img/pin.png differ diff --git a/static/img/search-bg.jpg b/static/img/search-bg.jpg new file mode 100644 index 00000000..6c1828d1 Binary files /dev/null and b/static/img/search-bg.jpg differ diff --git a/static/img/select.png b/static/img/select.png new file mode 100644 index 00000000..bcda1db4 Binary files /dev/null and b/static/img/select.png differ diff --git a/static/img/semitransparent-ie8.png b/static/img/semitransparent-ie8.png new file mode 100644 index 00000000..528d21c0 Binary files /dev/null and b/static/img/semitransparent-ie8.png differ diff --git a/static/img/signature.png b/static/img/signature.png new file mode 100644 index 00000000..60c78cb6 Binary files /dev/null and b/static/img/signature.png differ diff --git a/static/img/soc-medias/icon-fb.png b/static/img/soc-medias/icon-fb.png new file mode 100644 index 00000000..2edee29b Binary files /dev/null and b/static/img/soc-medias/icon-fb.png differ diff --git a/static/img/soc-medias/icon-fb_hover.png b/static/img/soc-medias/icon-fb_hover.png new file mode 100644 index 00000000..ab5d6798 Binary files /dev/null and b/static/img/soc-medias/icon-fb_hover.png differ diff --git a/static/img/soc-medias/icon-goog.png b/static/img/soc-medias/icon-goog.png new file mode 100644 index 00000000..4c7048de Binary files /dev/null and b/static/img/soc-medias/icon-goog.png differ diff --git a/static/img/soc-medias/icon-lin.png b/static/img/soc-medias/icon-lin.png new file mode 100644 index 00000000..99e8ab6d Binary files /dev/null and b/static/img/soc-medias/icon-lin.png differ diff --git a/static/img/soc-medias/icon-lin_hover.png b/static/img/soc-medias/icon-lin_hover.png new file mode 100644 index 00000000..c33719f4 Binary files /dev/null and b/static/img/soc-medias/icon-lin_hover.png differ diff --git a/static/img/soc-medias/icon-mailr.png b/static/img/soc-medias/icon-mailr.png new file mode 100644 index 00000000..1bfee0c3 Binary files /dev/null and b/static/img/soc-medias/icon-mailr.png differ diff --git a/static/img/soc-medias/icon-ok.png b/static/img/soc-medias/icon-ok.png new file mode 100644 index 00000000..e77a9a42 Binary files /dev/null and b/static/img/soc-medias/icon-ok.png differ diff --git a/static/img/soc-medias/icon-twit.png b/static/img/soc-medias/icon-twit.png new file mode 100644 index 00000000..e4dc8c9d Binary files /dev/null and b/static/img/soc-medias/icon-twit.png differ diff --git a/static/img/soc-medias/icon-vk.png b/static/img/soc-medias/icon-vk.png new file mode 100644 index 00000000..b151ec5a Binary files /dev/null and b/static/img/soc-medias/icon-vk.png differ diff --git a/static/img/soc-medias/icon-yand.png b/static/img/soc-medias/icon-yand.png new file mode 100644 index 00000000..6ce829fe Binary files /dev/null and b/static/img/soc-medias/icon-yand.png differ diff --git a/static/img/soc-medias/sm-icon-fb-w.png b/static/img/soc-medias/sm-icon-fb-w.png new file mode 100644 index 00000000..9b5314d7 Binary files /dev/null and b/static/img/soc-medias/sm-icon-fb-w.png differ diff --git a/static/img/soc-medias/sm-icon-fb.png b/static/img/soc-medias/sm-icon-fb.png new file mode 100644 index 00000000..bd286046 Binary files /dev/null and b/static/img/soc-medias/sm-icon-fb.png differ diff --git a/static/img/soc-medias/sm-icon-fb_hover.png b/static/img/soc-medias/sm-icon-fb_hover.png new file mode 100644 index 00000000..ab5d6798 Binary files /dev/null and b/static/img/soc-medias/sm-icon-fb_hover.png differ diff --git a/static/img/soc-medias/sm-icon-lin-w.png b/static/img/soc-medias/sm-icon-lin-w.png new file mode 100644 index 00000000..19b88726 Binary files /dev/null and b/static/img/soc-medias/sm-icon-lin-w.png differ diff --git a/static/img/soc-medias/sm-icon-lin.png b/static/img/soc-medias/sm-icon-lin.png new file mode 100644 index 00000000..6783ffd7 Binary files /dev/null and b/static/img/soc-medias/sm-icon-lin.png differ diff --git a/static/img/soc-medias/sm-icon-lin_hover.png b/static/img/soc-medias/sm-icon-lin_hover.png new file mode 100644 index 00000000..c33719f4 Binary files /dev/null and b/static/img/soc-medias/sm-icon-lin_hover.png differ diff --git a/static/img/soc-medias/sm-icon-rss.png b/static/img/soc-medias/sm-icon-rss.png new file mode 100644 index 00000000..e1aaf8e5 Binary files /dev/null and b/static/img/soc-medias/sm-icon-rss.png differ diff --git a/static/img/soc-medias/sm-icon-twit-w.png b/static/img/soc-medias/sm-icon-twit-w.png new file mode 100644 index 00000000..0aa71157 Binary files /dev/null and b/static/img/soc-medias/sm-icon-twit-w.png differ diff --git a/static/img/soc-medias/sm-icon-twit.png b/static/img/soc-medias/sm-icon-twit.png new file mode 100644 index 00000000..642d994a Binary files /dev/null and b/static/img/soc-medias/sm-icon-twit.png differ diff --git a/static/img/soc-medias/sm-icon-twit_hover.png b/static/img/soc-medias/sm-icon-twit_hover.png new file mode 100644 index 00000000..7b5b587d Binary files /dev/null and b/static/img/soc-medias/sm-icon-twit_hover.png differ diff --git a/static/img/soc-medias/sm-icon-vk-w.png b/static/img/soc-medias/sm-icon-vk-w.png new file mode 100644 index 00000000..34dc48a1 Binary files /dev/null and b/static/img/soc-medias/sm-icon-vk-w.png differ diff --git a/static/img/soc-medias/sm-icon-vk.png b/static/img/soc-medias/sm-icon-vk.png new file mode 100644 index 00000000..99b581c9 Binary files /dev/null and b/static/img/soc-medias/sm-icon-vk.png differ diff --git a/static/img/soc-medias/sm-icon-vk_hover.png b/static/img/soc-medias/sm-icon-vk_hover.png new file mode 100644 index 00000000..c94aee90 Binary files /dev/null and b/static/img/soc-medias/sm-icon-vk_hover.png differ diff --git a/static/img/soc.png b/static/img/soc.png new file mode 100644 index 00000000..59fc664b Binary files /dev/null and b/static/img/soc.png differ diff --git a/static/img/space.png b/static/img/space.png new file mode 100644 index 00000000..ff8d2b18 Binary files /dev/null and b/static/img/space.png differ diff --git a/static/img/spacer.gif b/static/img/spacer.gif new file mode 100644 index 00000000..dd027da0 Binary files /dev/null and b/static/img/spacer.gif differ diff --git a/static/img/sprites.png b/static/img/sprites.png new file mode 100644 index 00000000..805bb799 Binary files /dev/null and b/static/img/sprites.png differ diff --git a/static/img/subjects_list.png b/static/img/subjects_list.png new file mode 100644 index 00000000..023f4afd Binary files /dev/null and b/static/img/subjects_list.png differ diff --git a/static/img/wait.gif b/static/img/wait.gif new file mode 100644 index 00000000..b4d4ff8d Binary files /dev/null and b/static/img/wait.gif differ diff --git a/static/img/wether.png b/static/img/wether.png new file mode 100644 index 00000000..3737c197 Binary files /dev/null and b/static/img/wether.png differ diff --git a/static/img/x2.png b/static/img/x2.png new file mode 100644 index 00000000..22c3c78e Binary files /dev/null and b/static/img/x2.png differ diff --git a/templates/registration/activation_email.html b/templates/registration/activation_email.html new file mode 100644 index 00000000..3a97ff83 --- /dev/null +++ b/templates/registration/activation_email.html @@ -0,0 +1,114 @@ + + + + + + + + + + + +
+ + + + + + +
+ + + + +
    +
  • RSS
    • +
  • Facebook
    • +
  • LinkedIn
    • +
  • В контакте
    • +
  • Twitter
    • +
+
+ + + + + + + + +

Ваша регистрация на портале Expomap

+ + + + + + + + + + + + + + + + + + + +
+

Добрый день, {{ user.first_name }}!

+
+

Благодарим за регистрацию! Остался 1 шаг - подтвердить Ваш электронный адрес, нажав на кнопку:

+
+ подтвердить регистрацию +
+

Ваш логин: {{ user.email }}

+
+ В личном кабинете вам доступен собственный профиль, персональная лента событий,свое расписание, сообщения и многое другое. +
+ + + +
+ + + + + + +
+ + + +
+ + + + +
+ © 2018 — 2013 Expomap.ru +
+ +
+ + \ No newline at end of file diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt deleted file mode 100644 index 9c2b349a..00000000 --- a/templates/registration/activation_email.txt +++ /dev/null @@ -1,6 +0,0 @@ - -Someone, hopefully you, signed up for a new account at {{ site }} using this email address. If it was you, and you'd like to activate and use your account, click the link below or copy and paste it into your web browser's address bar: - -http://{{ site }}/accounts/activate/{{ activation_key }}/ - -If you didn't request this, you don't need to do anything; you won't receive any more email from us, and the account will expire automatically in {{ expiration_days }} days.