Commit

.gitignore

@@ -7,4 +7,5 @@
 *.gif
 *.doc
 .idea/
+/proj/local.py
 

exposition/models.py

@@ -50,8 +50,10 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin):
     quality_label = BitField(flags=['ufi', 'rsva', 'exporating'])
     audience = BitField(flags=[k for k, v in BIT_AUDIENCE])
     # relations
-    country = models.ForeignKey('country.Country', verbose_name='Страна', on_delete=models.PROTECT)
-    city = models.ForeignKey('city.City', verbose_name='Город', on_delete=models.PROTECT)
+    country = models.ForeignKey('country.Country', verbose_name='Страна', on_delete=models.PROTECT,
+                                related_name='exposition_country')
+    city = models.ForeignKey('city.City', verbose_name='Город', on_delete=models.PROTECT,
+                                related_name='exposition_city')
     place = models.ForeignKey('place_exposition.PlaceExposition', verbose_name='Место проведения',
                               blank=True, null=True, on_delete=models.PROTECT, related_name='exposition_place')
     theme = models.ManyToManyField('theme.Theme', verbose_name='Тематики',

exposition/search_indexes.py

@@ -5,6 +5,29 @@ from models import Exposition
 class ExpositionIndex(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
     where = indexes.MultiValueField()
+    data_begin = indexes.DateField(model_attr='data_begin')
+    data_end = indexes.DateField(model_attr='data_end')
+    theme = indexes.MultiValueField()
+    tag = indexes.MultiValueField()
+    country_id = indexes.IntegerField()
+    city_id = indexes.IntegerField()
+    area_id = indexes.IntegerField()
+
+    def prepare_area_id(self, obj):
+        return obj.country.area.id
+
+    def prepare_country_id(self, obj):
+        return obj.country.id
+
+    def prepare_city_id(self, obj):
+        return obj.city.id
+
+    def prepare_theme(self, obj):
+        return [th.id for th in obj.theme.filter()]
+
+    def prepare_tag(self, obj):
+        return [th.id for th in obj.tag.filter()]
+
     def prepare_where(self, obj):
         country = [tr.name for tr in obj.country.translations.all()]
         city = [tr.name for tr in obj.city.translations.all()]

exposition/urls.py

@@ -1,13 +1,20 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls import patterns, include, url
 from views import ExpositionView, ExpositionVisitors, ExpositionMembers, ExpositionStatistic, ExpositionPrice,\
-    ExpositionProgramme, ExpositionSearchView
+    ExpositionProgramme, ExpositionSearchView, ExpositionByCountry, ExpositionByTheme, ExpositionByCity
+
+from django.http import HttpResponse
 
 from views import ExpositionServiceView
 
+def test(request):
+    return HttpResponse('123')
 
 urlpatterns = patterns('',
     url(r'expositions/search/', ExpositionSearchView.as_view()),
+    url(r'expositions/country/', ExpositionByCountry.as_view()),
+    url(r'expositions/city/', ExpositionByCity.as_view()),
+    url(r'expositions/theme/', ExpositionByTheme.as_view()),
 
     url(r'expositions/(?P<params>.*)/(?P<page>\d+)/$', ExpositionView.as_view()),
     url(r'expositions/(?P<page>\d+)/$', ExpositionView.as_view()),

exposition/views.py

@@ -20,6 +20,27 @@ import json
 from django.utils.translation import ugettext as _
 
 
+class ExpositionByCountry(ListView):
+    model = Country
+    template_name = 'exposition/exposition_by_country.html'
+    def get_queryset(self):
+        return self.model.objects.select_related('exposition_country').filter(exposition_country__country__isnull=False).all().distinct()
+
+class ExpositionByTheme(ListView):
+    model = Theme
+    template_name = 'exposition/exposition_by_theme.html'
+
+    def get_queryset(self):
+        return self.model.objects.select_related('exposition_themes').filter(exposition_themes__theme__isnull=False).all().distinct()
+
+
+class ExpositionByCity(ListView):
+    model = City
+    template_name = 'exposition/exposition_by_city.html'
+
+    def get_queryset(self):
+        return self.model.objects.select_related('exposition_city').filter(exposition_city__city__isnull=False).all().distinct()
+
 class ExpositionServiceView(FormView, ExpoMixin):
     params = None
     search_form = ExpositionSearchForm
@@ -110,7 +131,7 @@ class ExpositionServiceView(FormView, ExpoMixin):
 
 
 class ExpositionSearchView(ListView):
-    paginate_by = 2
+    paginate_by = 10
     template_name = 'exposition/search.html'
     search_form = ExpositionSearchForm
     model = Exposition

functions/search_forms.py

@@ -13,6 +13,7 @@ from country.models import Country
 from city.models import City
 import ast
 
+
 class AbstactSearchForm(forms.Form):
     q = forms.CharField(label=_(u'Поиск'), required=False)
     w = forms.CharField(label=_(u'Где'), required=False)
@@ -75,12 +76,70 @@ class CompanySearchForm(AbstactSearchForm):
         return sqs
 
 
+from country.models import Area
 
 class ExpositionSearchForm(forms.Form):
     q = forms.CharField(label=_(u'Поиск'), required=False)
     w = forms.CharField(label=_(u'Где'), required=False)
-#    fr = forms.DateField(required=False)
-#    to = forms.DateField(required=False)
+
+    th = forms.CharField(label=_(u'Тематика'), required=False, widget=forms.SelectMultiple())
+    tg = forms.CharField(label=_(u'Теги'), required=False, widget=forms.SelectMultiple())
+
+    area = forms.MultipleChoiceField(label=_(u'Регион'), choices=[(item.id, item.name) for item in Area.objects.all()],
+                                     required=False, widget=forms.CheckboxSelectMultiple())
+    co = forms.CharField(label=_(u'Страна'), required=False, widget=forms.SelectMultiple())
+    ci = forms.CharField(label=_(u'Город'), required=False, widget=forms.SelectMultiple())
+
+    fr = forms.DateField(required=False,
+                         widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateFrom',
+                                                       'placeholder': _(u'дд.мм.гггг')}))
+    to = forms.DateField(required=False,
+                         widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateTo',
+                                                       'placeholder': _(u'дд.мм.гггг')}))
+
+    """
+    def clean_area(self):
+
+        area = self.cleaned_data.get('area')
+        if area:
+            res = ast.literal_eval(area)
+            return res
+        return area
+    """
+
+    def clean_co(self):
+
+        co = self.cleaned_data.get('co')
+        if co:
+            res = ast.literal_eval(co)
+            return res
+        return co
+
+    def clean_ci(self):
+
+        ci = self.cleaned_data.get('ci')
+        if ci:
+            res = ast.literal_eval(ci)
+            return res
+        return ci
+
+    def clean_th(self):
+
+        th = self.cleaned_data.get('th')
+        if th:
+            res = ast.literal_eval(th)
+            return res
+        return th
+
+    def clean_tg(self):
+
+        tg = self.cleaned_data.get('tg')
+        if tg:
+            res = ast.literal_eval(tg)
+            return res
+        return tg
+
+
 
     def search(self):
 
@@ -88,26 +147,50 @@ class ExpositionSearchForm(forms.Form):
             return EmptySearchQuerySet()
         q = self.cleaned_data.get('q')
         w = self.cleaned_data.get('w')
+        fr = self.cleaned_data.get('fr')
+        to = self.cleaned_data.get('to')
+        th = self.cleaned_data.get('th')
+        tg = self.cleaned_data.get('tg')
+        co = self.cleaned_data.get('co')
+        ci = self.cleaned_data.get('ci')
+        area = self.cleaned_data.get('area')
 
-        if not q and not w:
-            return EmptySearchQuerySet()
-        sqs = SearchQuerySet().models(Exposition)
+        sqs = SearchQuerySet().models(Exposition).all()
 
         if q:
             sqs = sqs.auto_query(q)
         if w:
             sqs = sqs.filter(where__contains=w)
+        if fr:
+            sqs = sqs.filter(data_begin__gte=fr)
+        if to:
+            sqs = sqs.filter(data_begin__lte=to)
+        if area:
+            sqs = sqs.filter(area_id__in=area)
+        if co:
+            sqs = sqs.filter(country_id__in=co)
+        if ci:
+            sqs = sqs.filter(city_id__in=ci)
+        if th:
+            sqs = sqs.filter(theme__in=th)
+        if tg:
+            sqs = sqs.filter(tag__in=tg)
+
 
-        return sqs
 
+        return sqs.order_by('data_begin')
 
 
 
 class EventSearchForm(forms.Form):
     q = forms.CharField(label=_(u'Поиск'), required=False)
     w = forms.CharField(label=_(u'Где'), required=False)
-    fr = forms.DateField(required=False)
-    to = forms.DateField(required=False)
+    fr = forms.DateField(required=False,
+                         widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateFrom',
+                                                       'placeholder': _(u'дд.мм.гггг')}))
+    to = forms.DateField(required=False,
+                         widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateTo',
+                                                       'placeholder': _(u'дд.мм.гггг')}))
 
     def search(self):
 

place_exposition/models.py

@@ -31,7 +31,7 @@ class PlaceExposition(TranslatableModel, ExpoMixin):
 
     url = models.SlugField(unique=True, max_length=255)
     country = models.ForeignKey('country.Country', on_delete=models.PROTECT)
-    city = models.ForeignKey('city.City', on_delete=models.PROTECT)
+    city = models.ForeignKey('city.City', on_delete=models.PROTECT, related_name='place_expostions')
     #type uses EnumField for creating Enum type field in Mysql database
     type = EnumField(values = [item1 for item1, item2 in EXPOSITION_TYPE])
     #information

proj/local.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Django local settings
+
+DEBUG = True
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'test',
+        'USER': 'root',
+        'PASSWORD': 'qazedc',
+        'HOST': '',
+        'PORT': '',
+    }
+}
+
+INSTALLED_APPS += (
+    'debug_toolbar',
+)

proj/production.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Django local settings
+DEBUG = True # изменить когда будет продакшн
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'test',
+        'USER': 'kotzilla',
+        'PASSWORD': 'qazedc',
+        'HOST': '',
+        'PORT': '',
+    }
+}

proj/settings.py

@@ -8,7 +8,7 @@ DJANGO_ROOT = os.path.dirname(os.path.realpath(django.__file__))
 SITE_ROOT = os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
+
 
 ADMINS = (
     # ('Your Name', 'your_email@example.com'),
@@ -329,7 +329,7 @@ INSTALLED_APPS = (
     'translator',
     'webinar',
     #django modules
-
+    'sorl.thumbnail',
     'hvad',
     'tinymce',
     'ckeditor',
@@ -382,3 +382,11 @@ LOGGING = {
         },
     }
 }
+
+
+try:
+    from local import *
+except ImportError, e:
+    from production import *
+
+TEMPLATE_DEBUG = DEBUG

static/client/js/main.js

@@ -52,6 +52,30 @@ function addError(inputId, msg){
 	
     /* submiting registration form */
 	$(function () {
+
+		$('.search_form').on('submit', function(e){				
+		    e.preventDefault();		    
+		    var action = $(this).attr('action');
+		    var formData = ''
+		    $('.search_form').each(function(i){
+		    	if (i==0){
+		    		formData = formData+$(this).serialize();	
+		    	}
+		    	else{
+		    		formData = formData+'&'+$(this).serialize()	;
+		    	}		    			   
+		    });
+		    var url = action+'?'+formData.replace(/[^&]+=\.?(?:&|$)/g, '')
+
+		    //console.log(action+'?'+formData.replace(/[^&]+=\.?(?:&|$)/g, ''));
+		    //console.log(url)
+		    window.location = url
+
+
+		    //var formData = $(this).serialize()
+		    
+		    //alert(window.location+formData);
+		});
 		$('#send_message_form').on('submit', function(event){
 			event.preventDefault();
 			$this = $(this);

templates/admin/exposition/exposition_add.html

@@ -1,5 +1,7 @@
 {% extends 'base.html' %}
 {% load static %}
+{% load thumbnail %}
+
 {# Displays exposition form and file form in modal window #}
 
 
@@ -383,7 +385,12 @@
 
                 <tr>
                     <td>{{ file.id }}</td>
-                    <td><img src="{{ file.file_path.url }}"></td>
+                    <td>
+                        {% thumbnail file.file_path "100x100" as im %}
+                        <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
+                        {% endthumbnail %}
+
+                    </td>
                     <td>{{ file.file_name }}</td>
                     <td>{{ file.purpose }}</td>
                     <td>

templates/client/blank.html

@@ -87,9 +87,15 @@ This template include basic anf main styles and js files,
         {% include 'client/popups/login.html' %}
         {% include 'client/popups/register.html' %}
     {% endif %}
-        {% include 'client/popups/theme.html' %}
-        {% include 'client/popups/place.html' %}
-        {% include 'client/popups/period.html' %}
+
+    {% include 'client/popups/theme.html' %}
+    {% include 'client/popups/place.html' %}
+    {% if search_form.fr %}
+        {% with search_form=search_form search_action=search_action type=type%}
+                {% include 'client/popups/period.html' %}
+        {% endwith %}
+    {% endif %}
+
     {% block popup %}
     {% endblock %}
     </div>

templates/client/exposition/exposition_by_city.html

@@ -0,0 +1,28 @@
+{% extends 'base_catalog.html' %}
+{% load i18n %}
+
+{% block bread_scrumbs %}
+   <div class="bread-crumbs">
+        <a href="/">{% trans 'Главная страница' %}</a>
+       <a href="/expositions/">{% trans 'Выставки' %}</a>
+        <strong>{% trans 'По городам' %}</strong>
+   </div>
+{% endblock %}
+
+{% block page_title %}
+    <div class="page-title">
+       <h1>{% trans 'Выставки мира по городам' %}:</h1>
+    </div>
+{% endblock %}
+
+{% block content_list %}
+    <ul>
+    {% for obj in object_list %}
+        <li>
+            <a href="/expositions/city-{{ obj.url }}">{{ obj.name }}</a>
+        </li>
+    {% endfor %}
+    </ul>
+
+{% endblock %}
+

templates/client/exposition/exposition_by_country.html

@@ -0,0 +1,27 @@
+{% extends 'base_catalog.html' %}
+{% load i18n %}
+
+{% block bread_scrumbs %}
+   <div class="bread-crumbs">
+        <a href="/">{% trans 'Главная страница' %}</a>
+       <a href="/expositions/">{% trans 'Выставки' %}</a>
+        <strong>{% trans 'По странам' %}</strong>
+   </div>
+{% endblock %}
+
+{% block page_title %}
+    <div class="page-title">
+       <h1>{% trans 'Выставки мира по странам' %}:</h1>
+    </div>
+{% endblock %}
+
+{% block content_list %}
+    <ul>
+    {% for obj in object_list %}
+        <li>
+            <a href="/expositions/country-{{ obj.url }}">{{ obj.name }}</a>
+        </li>
+    {% endfor %}
+    </ul>
+
+{% endblock %}

templates/client/exposition/exposition_by_theme.html

@@ -0,0 +1,27 @@
+{% extends 'base_catalog.html' %}
+{% load i18n %}
+
+{% block bread_scrumbs %}
+   <div class="bread-crumbs">
+        <a href="/">{% trans 'Главная страница' %}</a>
+       <a href="/expositions/">{% trans 'Выставки' %}</a>
+        <strong>{% trans 'По тематикам' %}</strong>
+   </div>
+{% endblock %}
+
+{% block page_title %}
+    <div class="page-title">
+       <h1>{% trans 'Выставки мира по тематикам' %}:</h1>
+    </div>
+{% endblock %}
+
+{% block content_list %}
+    <ul>
+    {% for obj in object_list %}
+        <li>
+            <a href="/expositions/theme-{{ obj.url }}">{{ obj.name }}</a>
+        </li>
+    {% endfor %}
+    </ul>
+
+{% endblock %}

templates/client/includes/catalog_search.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div class="in-search-form">
-    <form action="{{ search_action }}">
+    <form action="{{ search_action }}" class="search_form">
         <div class="s-title">{% if type %}{{ type }}{% else %}{% trans 'поиск событий' %}{% endif %}</div>
             <div class="search-form-wrap">
                 <div class="search-line">
@@ -19,7 +19,7 @@
                         </div>
                     </div>
                     <div class="sf-field-wrap">
-                        <button type="submit"><span>{% trans 'найти' %}</span></button>
+                        <button class="search_submit" type="submit"><span>{% trans 'найти' %}</span></button>
                     </div>
                 </div>
                 <div class="search-line sl-options">
@@ -29,4 +29,4 @@
                 </div>
         </div>
     </form>
-</div>
+</div>

templates/client/includes/event_steps.html

@@ -7,19 +7,19 @@
         <ul>
             <li class="s1">
 				<div class="label">1. {% trans 'Зарегистрируйтесь на событие' %}</div>
-			    <a class="step" href="{% if filter %}/{{ filter|generate_url:'event' }}/service/visit/{% else %}{{ event.get_permanent_url }}/service/visit/{%endif%}">
+			    <a class="step" href="{% if filter %}/{{ filter|generate_url:'event' }}/service/visit/{% else %}{{ event.get_permanent_url }}/service/visit/{%endif%}" target="_blank">
                     {% trans 'Билеты на выставку' %}
                 </a>
 			</li>
 
 			<li class="s2">
 				<div class="label">2. {% trans 'Забронируйте отель по лучшей цене' %}</div>
-				<a class="step" href="#"><b>booking</b>.com</a>
+				<a class="step" href="#" target="_blank"><b>booking</b>.com</a>
 			</li>
 
 			<li class="s3">
 				<div class="label">3. {% trans 'Купите авиабилеты по лучшему тарифу' %}</div>
-				<a class="step" href="#">Any<b>way</b>Any<b>day</b></a>
+				<a class="step" href="#" target="_blank">Any<b>way</b>Any<b>day</b></a>
 			</li>
         </ul>
 </div>

templates/client/includes/footer.html

@@ -7,11 +7,11 @@
 	    <aside>
 			<div class="copy">© 2008 — 2013 Expomap.ru</div>
 			<ul class="soc-media-buttons">
-				<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-rss.png' %}" title="RSS" alt="RSS" /></a></li>
-				<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png' %}" title="Facebook" alt="Facebook" /></a></li>
-				<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png' %}" title="LinkedIn" alt="LinkedIn" /></a></li>
-				<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png' %}" title="В контакте" alt="В контакте" /></a></li>
-				<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-twit.png' %}" title="Twitter" alt="Twitter" /></a></li>
+				<li><a href="http://expomap.ru/rss3.php/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-rss.png' %} " title="RSS" alt="RSS" /></a></li>
+						<li><a href="https://www.facebook.com/Expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png" title="Facebook" alt="Facebook' %} " /></a></li>
+						<li><a href="http://www.linkedin.com/company/expomap-ru/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png" title="LinkedIn" alt="LinkedIn' %} " /></a></li>
+						<li><a href="http://vk.com/expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png" title="В контакте" alt="В контакте' %} " /></a></li>
+						<li><a href="https://twitter.com/expomap_ru" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-twit.png" title="Twitter" alt="Twitter' %} " /></a></li>
 			</ul>
 		</aside>
 

templates/client/includes/header.html

@@ -15,7 +15,7 @@
 				<div class="ht-main">
                     {% if user.is_authenticated %}
                         {% if user.organiser %}
-						<div class="add-link"><a class="l-button ico" href="#">добавить событие</a></div>
+						<div class="add-link"><a class="l-button ico" href="#">{% trans 'добавить событие' %}</a></div>
                         {% endif %}
                     {% endif %}
 
@@ -42,23 +42,15 @@
 
 				<div class="ht-side">
 					<ul class="soc-media-buttons">
-						<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-rss.png' %} " title="RSS" alt="RSS" /></a></li>
-						<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png" title="Facebook" alt="Facebook' %} " /></a></li>
-						<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png" title="LinkedIn" alt="LinkedIn' %} " /></a></li>
-						<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png" title="В контакте" alt="В контакте' %} " /></a></li>
-						<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-twit.png" title="Twitter" alt="Twitter' %} " /></a></li>
+						<li><a href="http://expomap.ru/rss3.php/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-rss.png' %} " title="RSS" alt="RSS" /></a></li>
+						<li><a href="https://www.facebook.com/Expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png" title="Facebook" alt="Facebook' %} " /></a></li>
+						<li><a href="http://www.linkedin.com/company/expomap-ru/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png" title="LinkedIn" alt="LinkedIn' %} " /></a></li>
+						<li><a href="http://vk.com/expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png" title="В контакте" alt="В контакте' %} " /></a></li>
+						<li><a href="https://twitter.com/expomap_ru" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-twit.png" title="Twitter" alt="Twitter' %} " /></a></li>
 					</ul>
                     {% if user.is_authenticated %}
                         <div class="cabinet-links">
                             <div class="cl-body clearfix">
-                                {% if user.organiser %}
-                                <ul class="clb-menu">
-                                    <li><a href="#">события</a></li>
-                                    <li><a href="#">Новости</a></li>
-                                    <li><a href="#">репортажи</a></li>
-                                </ul>
-                                {% endif %}
-
                                 <div class="clb-profile"><a class="icon-user" href="/profile/">{% trans 'личный кабинет' %}</a></div>
 
                                 <div class="clb-messages"><a class="icon-msg" href="/profile/messages/">{% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}</a></div>
@@ -91,13 +83,13 @@
 					<ul>
 						<li><a href="/expositions/country-germany">{% trans 'Выставки в Германии' %}</a></li>
 						<li><a href="/expositions/city-berlin-de">{% trans 'Выставки в Берлине' %}</a></li>
-						<li><a href="/places/country-russia">{% trans 'Выставки в России' %}</a></li>
+						<li><a href="/expositions/country-russia">{% trans 'Выставки в России' %}</a></li>
 					</ul>
 
 					<ul>
-						<li><a href="#">{% trans 'Выставки по городам' %}</a></li>
-						<li><a href="#">{% trans 'Выставки по странам' %}</a></li>
-						<li><a href="#">{% trans 'Выставки по тематикам' %}</a></li>
+						<li><a href="/expositions/city/">{% trans 'Выставки по городам' %}</a></li>
+						<li><a href="/expositions/country/">{% trans 'Выставки по странам' %}</a></li>
+						<li><a href="/expositions/theme/">{% trans 'Выставки по тематикам' %}</a></li>
 					</ul>
 
 			    </div>

templates/client/popups/period.html

@@ -6,15 +6,15 @@
         <div class="pw-title">{% trans 'Период' %}</div>
     </header>
     <div class="pw-body clearfix">
-        <form class="pw-form" action="#">
+        <form class="pw-form search_form" action="{{ search_action }}">
             <div class="pwf-line period">
                 <div class="pwf-field">
                     <label for="dateFrom">{% trans 'с' %}</label>
-                    <input type="text" class="date" id="dateFrom" name="dateFrom" placeholder="дд.мм.гггг" />
+                    {{ search_form.fr }}
                 </div>
                 <div class="pwf-field">
                     <label for="dateTo">{% trans 'по' %}</label>
-                    <input type="text" class="date" id="dateTo" name="dateTo" placeholder="дд.мм.гггг" />
+                    {{ search_form.to }}
                 </div>
             </div>
             <div class="pwf-buttons-line">

templates/client/popups/place.html

@@ -6,7 +6,7 @@
 				<div class="pw-title">{% trans 'Место' %}</div>
 			</header>
 			<div class="pw-body clearfix">
-				<form class="pw-form" action="#">
+				<form class="pw-form search_form" action="{{ search_action }}">
 					<div class="c-select-box-wrap">
 						<div class="c-select-box places">
 							<div class="csb-title">
@@ -60,15 +60,16 @@
 											</li>
 											<li class="level1"><label><input type="checkbox" name="place" value="c500" /><span class="hidden">Европа</span></label><a href="#">Европа</a>
 												<ul>
-													<li><label><input type="checkbox" name="place" value="c501" />Лондон</label></li>
+													<li><label class="active"><input type="checkbox" name="place" value="c501" />Лондон</label></li>
 													<li><label><input type="checkbox" name="place" value="c502" />Берлин</label></li>
 													<li><label><input type="checkbox" name="place" value="c503" />Париж</label></li>
 													<li><label><input type="checkbox" name="place" value="c504" />Брюсель</label></li>
 												</ul>
 											</li>
-                                            {% for value, text in place_search_form.r.field.choices %}
-                                                <li class="level1"><label><input type="checkbox" name="r" value="{{ value }}" />{{ text }}</label></li>
+                                            {% for value, text in search_form.area.field.choices %}
+                                                <li class="level1"><label><input type="checkbox" name="area" value="{{ value }}" />{{ text }}</label></li>
                                             {% endfor %}
+                                            {{ search_form.area }}
 										</ul>
 									</div>
 									<div class="q-sel">
@@ -86,29 +87,6 @@
 					</div>
 					<div class="pwf-buttons-line">
 
-						<button type="submit" class="icon-check">{% trans 'применить' %}</button>
-					</div>
-				</form>
-			</div>
-		</div>
-
-		<div id="pw-period" class="popup-window pw-period">
-			<header class="clearfix">
-				<div class="pw-title">{% trans 'Период' %}</div>
-			</header>
-			<div class="pw-body clearfix">
-				<form class="pw-form" action="#">
-					<div class="pwf-line period">
-						<div class="pwf-field">
-							<label for="dateFrom">{% trans 'с' %}</label>
-							<input type="text" class="date" id="dateFrom" name="dateFrom" placeholder="дд.мм.гггг" />
-						</div>
-						<div class="pwf-field">
-							<label for="dateTo">{% trans 'по' %}</label>
-							<input type="text" class="date" id="dateTo" name="dateTo" placeholder="дд.мм.гггг" />
-						</div>
-					</div>
-					<div class="pwf-buttons-line">
 						<button type="submit" class="icon-check">{% trans 'применить' %}</button>
 					</div>
 				</form>

templates/client/popups/register.html

@@ -51,13 +51,13 @@
 					<div class="sm-label">{% trans 'или войдите с помощью' %}</div>
 					<div class="sm-body">
 						<ul>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-fb.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-twit.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-goog.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-lin.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-ok.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-mailr.png' %}" alt="" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/icon-vk.png' %}" alt="" /></a></li>
+							<li><a href="{% url 'social:begin' 'facebook' %}?next={{ request.path }}"><img src="{% static 'client/img/soc-medias/icon-fb.png' %}" alt="" /></a></li>
+							<li><a href="{% url 'social:begin' 'twitter' %}?next={{ request.path }}"><img src="{% static 'client/img/soc-medias/icon-twit.png' %}" alt="" /></a></li>
+							<li><a href="{% url 'social:begin' 'google-oauth' %}?next={{ request.path }}"><img src="{% static 'client/img/soc-medias/icon-goog.png' %}" alt="" /></a></li>
+							<li><a href="{% url 'social:begin' 'linkedin' %}?next={{ request.path }}"><img src="{% static 'client/img/soc-medias/icon-lin.png' %}" alt="" /></a></li>
+							<li><a href="{% url 'social:begin' 'odnoklassniki-oauth2' %}?next={{ request.path }}"><img src="{% static 'client/img/soc-medias/icon-ok.png' %}" alt="" /></a></li>
+							<li><a href="{% url 'social:begin' 'mailru-oauth2' %}?next={{ request.path }}"><img src="{% static 'client/img/soc-medias/icon-mailr.png' %}" alt="" /></a></li>
+							<li><a href="{% url 'social:begin' 'vk-oauth2' %}?next={{ request.path }}"><img src="{% static 'client/img/soc-medias/icon-vk.png' %}" alt="" /></a></li>
 						</ul>
 					</div>
 				</div>