From 03e1da1e0d63f8e5e4087682b5b57fcd5f9f5994 Mon Sep 17 00:00:00 2001 From: Alexander Burdeinyi Date: Mon, 14 Nov 2016 08:36:20 +0200 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B?= =?UTF-8?q?=D1=82=D0=B8=D1=8E=206=20=D1=8D=D1=82=D0=B0=D0=BF=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- expobanner/admin.py | 4 ++ templates/c_admin/service/order_list.html | 45 +++++++++++++++++-- templates/client/base_catalog.html | 2 +- .../client/conference/conference_by.html | 2 + .../client/exposition/exposition_by.html | 2 + .../client/includes/reverseorder_warning.html | 2 +- templates/client/includes/side_popular.html | 19 ++++---- templates/client/popups/register.html | 6 +-- 8 files changed, 64 insertions(+), 18 deletions(-) diff --git a/expobanner/admin.py b/expobanner/admin.py index b9ccf184..82f63dec 100644 --- a/expobanner/admin.py +++ b/expobanner/admin.py @@ -4,6 +4,7 @@ from itertools import chain from django.conf import settings from django.core.urlresolvers import reverse_lazy +from django.contrib import admin from django.db.models import Q, Sum from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 @@ -50,6 +51,9 @@ from settings.forms import CommentForm, HtmlForm, ParticipationCommentForm from settings.models import Html, LandingComment, ParticipationComment +admin.site.register(BannerGroup) + + class BannersControl(TemplateView): template_name = 'c_admin/expobanner/banners_control.html' diff --git a/templates/c_admin/service/order_list.html b/templates/c_admin/service/order_list.html index bd797c91..bc10f5fe 100644 --- a/templates/c_admin/service/order_list.html +++ b/templates/c_admin/service/order_list.html @@ -1,4 +1,5 @@ {% extends 'base.html' %} +{% load i18n %} {% block body %} @@ -18,17 +19,53 @@ {% for item in object_list %} - + {{ item.id }} {{ item.person_inf }} - {{ item.phone }} - {{ item.created }} - + {{ item.phone }} + {{ item.created }} + + + + {% trans "Первый переход" %} +
{% trans "Последний переход" %} +
{% trans "utm_source1" %} +
{% trans "utm_medium1" %} +
{% trans "utm_campaign1" %} +
{% trans "utm_source2" %} +
{% trans "utm_medium2" %} +
{% trans "utm_campaign2" %} +
{% trans "search1" %} +
{% trans "search2" %} +
{% trans "search3" %} + + + {{ item.referer1 }} +
{{ item.referer2 }} +
{{ item.utm_source1 }} +
{{ item.utm_medium1 }} +
{{ item.utm_campaign1 }} +
{{ item.utm_source2 }} +
{{ item.utm_medium2 }} +
{{ item.utm_campaign2 }} +
{{ item.search1 }} +
{{ item.search2 }} +
{{ item.search3 }} + + {% endfor %} + + {% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %} {# pagination #} diff --git a/templates/client/base_catalog.html b/templates/client/base_catalog.html index bde2f835..1f632633 100644 --- a/templates/client/base_catalog.html +++ b/templates/client/base_catalog.html @@ -36,7 +36,7 @@ {% include 'client/includes/announces.html' %} - {% include 'client/includes/side_popular.html' %} +{# {% include 'client/includes/side_popular.html' %}#} {% include 'client/includes/side_confs.html' %} diff --git a/templates/client/conference/conference_by.html b/templates/client/conference/conference_by.html index 7c14825d..01d6d7cd 100644 --- a/templates/client/conference/conference_by.html +++ b/templates/client/conference/conference_by.html @@ -23,6 +23,8 @@ {% endblock %} {% block content_list %} + {% include 'client/includes/side_popular.html' %} + {% for obj in object_list %} {% set cur_word = obj.name %} {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower and forloop.counter != 1 %} diff --git a/templates/client/exposition/exposition_by.html b/templates/client/exposition/exposition_by.html index 0d479d82..0bef5ffb 100644 --- a/templates/client/exposition/exposition_by.html +++ b/templates/client/exposition/exposition_by.html @@ -23,6 +23,8 @@ {% endblock %} {% block content_list %} + {% include 'client/includes/side_popular.html' %} + {% with objects=object_list %} {% for obj in objects %} {% set cur_word = obj.name %} diff --git a/templates/client/includes/reverseorder_warning.html b/templates/client/includes/reverseorder_warning.html index b8f75ace..2c0da620 100644 --- a/templates/client/includes/reverseorder_warning.html +++ b/templates/client/includes/reverseorder_warning.html @@ -1,5 +1,5 @@ {% load i18n %} -
{% trans "Выставки по указанным параметрам не найдены. Попробуйте упростить параметры или расширить временные рамки. Также Вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}
+
{% trans "Выставки по указанным параметрам не найдены. Попробуйте упростить параметры или расширить временные рамки. Также, вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}

{% trans "Прошедшие события" %}

diff --git a/templates/client/includes/side_popular.html b/templates/client/includes/side_popular.html index 5165fc42..a807c224 100644 --- a/templates/client/includes/side_popular.html +++ b/templates/client/includes/side_popular.html @@ -1,14 +1,15 @@ {% load i18n %} {% if side_popular %} -
-
{% trans 'Самые популярные' %}
- #} +{#
#} {% endif %} diff --git a/templates/client/popups/register.html b/templates/client/popups/register.html index 79a43a7d..49d0f590 100644 --- a/templates/client/popups/register.html +++ b/templates/client/popups/register.html @@ -42,9 +42,9 @@
{% trans 'пароль должен иметь не меньше 6 символов' %}
-
-
- {% trans "Пользовательское соглашение" %} + {% trans "Пользовательское соглашение" %} +
+
{% trans "Ошибка" %}