diff --git a/accounts/forms.py b/accounts/forms.py index ede4846e..966a21e0 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -221,7 +221,7 @@ class RegistrationCompleteForm(forms.ModelForm): country = forms.ChoiceField(label='Страна', choices=[(c.id, c.name) for c in Country.objects.all()], widget=forms.Select(attrs={'class': 'select2'})) city = forms.CharField(label='Город', widget=forms.HiddenInput()) - url = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'адрес страны(обязательно)')})) + url = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'url(обязательно)')})) code_country = forms.ChoiceField(label=_(u'код страны'), initial='70', choices=[(str(c.phone_code), '+'+str(c.phone_code)) for c in Country.objects.all() if c.phone_code is not None], diff --git a/functions/custom_views.py b/functions/custom_views.py index 9cfff4a9..7e7bb98d 100644 --- a/functions/custom_views.py +++ b/functions/custom_views.py @@ -344,8 +344,6 @@ class ExpoSearchView(ListView): form = self.search_form(self.request.GET) if form.is_valid(): form.data_with_parents = form.get_form_data() - context['form_data_with_parents'] = form.data_with_parents - else: form = self.search_form() diff --git a/password_reset/templates/password_reset/recovery_email_expo.html b/password_reset/templates/password_reset/recovery_email_expo.html new file mode 100644 index 00000000..cfcca57d --- /dev/null +++ b/password_reset/templates/password_reset/recovery_email_expo.html @@ -0,0 +1,114 @@ + + + + + + + + + + + +
+ + + + + + +
+ + + + +
    +
  • RSS
    • +
  • Facebook
    • +
  • LinkedIn
    • +
  • В контакте
    • +
  • Twitter
    • +
+
+ + + + + + + + +

Воостановление пароля на портале Expomap

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

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

+
+ Вы или кто-то еще сделал запрос на сброс пароля на сайте {{ domain }} +
+ Вы можете восстановить доступ, нажав на кнопку ниже и указав новый пароль: +
+ востановить пароль +
+ Если вы не хотите сбрасывать пароль, просто проигнорируйте это сообщение +
+ + + +
+ + + + + + +
+ + + +
+ + + + +
+ © 2018 — 2013 Expomap.ru +
+ +
+ + \ No newline at end of file diff --git a/password_reset/views.py b/password_reset/views.py index 88b84a07..8f1fd143 100644 --- a/password_reset/views.py +++ b/password_reset/views.py @@ -1,15 +1,18 @@ import datetime - +from django.core.mail import EmailMessage from django.conf import settings from django.contrib.sites.models import Site, RequestSite from django.core import signing from django.core.mail import send_mail +from django.template import Context from django.core.urlresolvers import reverse, reverse_lazy from django.shortcuts import get_object_or_404, redirect from django.http import Http404 from django.template import loader from django.utils import timezone from django.views import generic +from django.template.loader import get_template +from email.MIMEImage import MIMEImage from .forms import PasswordRecoveryForm, PasswordResetForm from .utils import get_user_model, get_username @@ -52,7 +55,7 @@ class Recover(SaltMixin, generic.FormView): form_class = PasswordRecoveryForm template_name = 'password_reset/recovery_form.html' success_url_name = 'password_reset_sent' - email_template_name = 'password_reset/recovery_email.txt' + email_template_name = 'password_reset/recovery_email_expo.html' email_subject_template_name = 'password_reset/recovery_email_subject.txt' search_fields = ['username', 'email'] @@ -85,12 +88,35 @@ class Recover(SaltMixin, generic.FormView): 'token': signing.dumps(self.user.pk, salt=self.salt), 'secure': self.request.is_secure(), } - body = loader.render_to_string(self.email_template_name, - context).strip() + + #body = loader.render_to_string(self.email_template_name, + # context).strip() + message = get_template(self.email_template_name).render(Context(context)) subject = loader.render_to_string(self.email_subject_template_name, context).strip() - send_mail(subject, body, settings.DEFAULT_FROM_EMAIL, - [self.user.email]) + + msg = EmailMessage(subject, message, settings.DEFAULT_FROM_EMAIL, [self.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() + + #send_mail(subject, body, settings.DEFAULT_FROM_EMAIL, + # [self.user.email]) def form_valid(self, form): self.user = form.cleaned_data['user'] diff --git a/proj/settings.py b/proj/settings.py index 6c59c3b0..dcf5d43e 100644 --- a/proj/settings.py +++ b/proj/settings.py @@ -38,7 +38,7 @@ CACHES = { # Hosts/domain names that are valid for this site; required if DEBUG is False # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['hit.expomap.ru', '195.66.79.152', '195.66.79.145'] # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name @@ -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/proj/urls.py b/proj/urls.py index f20bfd65..2134a8fb 100644 --- a/proj/urls.py +++ b/proj/urls.py @@ -9,6 +9,8 @@ from place_exposition.views import PlaceSearchView from django.http import HttpResponse + + urlpatterns = patterns('', url(r'^admin/', include('proj.admin_urls')), url(r'^$', MainPageView.as_view()), @@ -67,6 +69,18 @@ urlpatterns = patterns('', ) +# test urls +from accounts.models import User +def delete_user(request): +# User.objects.filter(email='kotzillla@gmail.com').delete() + return HttpResponse('deleted') + +urlpatterns += patterns('', + url(r'^delete-user/', delete_user), + + ) + + # ajax urls urlpatterns += patterns('', url(r'^register/', 'registration.backends.default.views.RegisterAjaxView'), @@ -78,9 +92,6 @@ urlpatterns += patterns('', url(r'^search-form/autosearch/exposition/$', 'settings.views.expo_autosearch'), url(r'^search-form/autosearch/place/$', 'settings.views.place_autosearch'), url(r'^search-form/autosearch/company/$', 'settings.views.company_autosearch'), - - - url(r'^', include('accounts.user_catalog_urls')), ) diff --git a/proj/views.py b/proj/views.py index bbc0adc0..e9904df3 100644 --- a/proj/views.py +++ b/proj/views.py @@ -16,12 +16,14 @@ from functions.custom_views import ExpoListView from accounts.forms import RegistrationCompleteForm def expo_context(request): - cont = {'theme_search_form': ThemeSearch(), 'search_form': ExpositionSearchForm(), 'expo_catalog': Exposition.catalog, + cont = {'theme_search_form': ThemeSearch(), 'expo_catalog': Exposition.catalog, 'book_aid': settings.BOOKING_AID} user = request.user if not user.is_anonymous() and not user.url: cont.update({'reg_complete': RegistrationCompleteForm(instance=user)}) + if not request.GET: + cont.update({'search_form': ExpositionSearchForm()}) return cont 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/settings/views.py b/settings/views.py index be9bf5da..ea8fd076 100644 --- a/settings/views.py +++ b/settings/views.py @@ -92,8 +92,11 @@ def expo_autosearch(request): lang = translation.get_language() term = request.GET['term'] qs = SearchQuerySet().models(Exposition, Theme, Tag).autocomplete(content_auto=term).order_by('text') - result = [{'cat': get_by_lang(item, 'catalog_name', lang), 'text': get_by_lang(item, 'name', lang), 'url':item.url, - 'id':item.pk, 'name': item.form_name} for item in qs] + result = [{'cat': get_by_lang(item, 'catalog_name', lang), + 'text': '%s(%s)'%(get_by_lang(item, 'name', lang),get_by_lang(item, 'parent', lang)) if get_by_lang(item, 'parent', lang) else get_by_lang(item, 'name', lang), + 'url':item.url, + 'id':item.pk, + 'name': item.form_name} for item in qs] result = sorted(result, key=lambda x:x['cat'], reverse=True) return HttpResponse(json.dumps(result), content_type='application/json') else: 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/client/blank.html b/templates/client/blank.html index 4311dc67..9b2eafce 100644 --- a/templates/client/blank.html +++ b/templates/client/blank.html @@ -98,18 +98,6 @@ This template include basic anf main styles and js files, {% endif %} - - {% comment "Убрал т.к. функционал диалоговых окон расширенного поиска переносится в catalog_search.html" %} - {% include 'client/popups/theme.html' %} - {% if search_form.area %} - {% include 'client/popups/place.html' with search_form=search_form search_action=search_action %} - {% endif %} - {% if search_form.fr %} - {% with search_form=search_form search_action=search_action type=type%} - {% include 'client/popups/period.html' %} - {% endwith %} - {% endif %} - {% endcomment %} {% include 'client/popups/callback.html' %} {# if user doesnt have url- show form #} @@ -117,6 +105,7 @@ This template include basic anf main styles and js files, {% if not request.user.is_anonymous %} {% if not request.user.url %} {% include 'client/popups/user_information.html' with form=reg_complete %} + {% endif %} {% endif %} @@ -128,7 +117,6 @@ This template include basic anf main styles and js files, {% endblock %} - diff --git a/templates/client/includes/catalog_search.html b/templates/client/includes/catalog_search.html index 12bdba09..444680e3 100644 --- a/templates/client/includes/catalog_search.html +++ b/templates/client/includes/catalog_search.html @@ -115,7 +115,7 @@ EXPO.searchBlock.init({ formId: 'search-block-form', modalTriggerClass:'search-modal-open', - searchData:'{{ form_data_with_parents|safe }}', + searchData:'{{ search_form.data_with_parents|safe }}', closerText: closerText, closerTextSingle: closerTextSingle, place:{ diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html index 287dba9f..21e8e38f 100644 --- a/templates/client/includes/exposition/exposition_object.html +++ b/templates/client/includes/exposition/exposition_object.html @@ -368,10 +368,10 @@ -->
{% trans 'Смотрите также:' %}
- {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} - {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} - {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|lower }}» {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} - {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|lower }}» {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} + {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} + {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|lower }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|lower }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}
{% endblock %} diff --git a/templates/client/popups/user_information.html b/templates/client/popups/user_information.html index b585b685..3e6f3208 100644 --- a/templates/client/popups/user_information.html +++ b/templates/client/popups/user_information.html @@ -48,4 +48,4 @@ - diff --git a/templates/registration/activation_complete.html b/templates/registration/activation_complete.html index 3e079ba5..1212c67d 100644 --- a/templates/registration/activation_complete.html +++ b/templates/registration/activation_complete.html @@ -14,8 +14,5 @@ - - - {% endblock %} \ No newline at end of file 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. diff --git a/theme/search_indexes.py b/theme/search_indexes.py index c3069a45..edb8a51c 100644 --- a/theme/search_indexes.py +++ b/theme/search_indexes.py @@ -103,23 +103,26 @@ class TagIndex(indexes.SearchIndex, indexes.Indexable, ExpoSearchMixin): catalog_name_ru = indexes.CharField() def prepare_parent_en(self, obj): - translation.activate('en') + #translation.activate('en') try: - name = obj.theme.name - return name + # name = obj.theme.name + # return name + return obj.theme.translations.get(language_code='en').name except: return '' def prepare_parent_ru(self, obj): - translation.activate('ru') + #translation.activate('ru') + #print(obj.theme.name.encode('utf-8')) try: - name = obj.theme.name - return name + #name = obj.theme.name + #return name + return obj.theme.translations.get(language_code='ru').name except: return '' def prepare_name_en(self, obj): - translation.activate('en') + #translation.activate('en') try: name = obj.translations.get(language_code = 'en').name name = '%s'%name @@ -150,5 +153,5 @@ class TagIndex(indexes.SearchIndex, indexes.Indexable, ExpoSearchMixin): return Tag def index_queryset(self, using=None): - return self.get_model().active.all() - #return self.get_model().objects.filter() \ No newline at end of file + #return self.get_model().active.all() + return self.get_model().objects.filter() \ No newline at end of file