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

изменения по закрытию 6 этапа

Browse Source
remotes/origin/stage6
Alexander Burdeinyi 9 years ago
parent df9dd17e85
commit 03e1da1e0d
8 changed files with 64 additions and 18 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. 4
      expobanner/admin.py
  2. 45
      templates/c_admin/service/order_list.html
  3. 2
      templates/client/base_catalog.html
  4. 2
      templates/client/conference/conference_by.html
  5. 2
      templates/client/exposition/exposition_by.html
  6. 2
      templates/client/includes/reverseorder_warning.html
  7. 19
      templates/client/includes/side_popular.html
  8. 6
      templates/client/popups/register.html

4
expobanner/admin.py
Unescape View File

@ -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'

45
templates/c_admin/service/order_list.html
Unescape View File

@ -1,4 +1,5 @@
{% extends 'base.html' %}
{% load i18n %}
{% block body %}
@ -18,17 +19,53 @@
</thead>
<tbody>
{% for item in object_list %}
<tr>
<tr>
<td>{{ item.id }}</td>
<td>{{ item.person_inf }}</td>
<td>{{ item.phone }}</td>
<td>{{ item.created }}</td>
</tr>
<td>{{ item.phone }}</td>
<td>{{ item.created }}</td>
</tr>
<tr style="display: none" class="addition">
<td>
{% trans "Первый переход" %}
<br>{% trans "Последний переход" %}
<br>{% trans "utm_source1" %}
<br>{% trans "utm_medium1" %}
<br>{% trans "utm_campaign1" %}
<br>{% trans "utm_source2" %}
<br>{% trans "utm_medium2" %}
<br>{% trans "utm_campaign2" %}
<br>{% trans "search1" %}
<br>{% trans "search2" %}
<br>{% trans "search3" %}
</td>
<td colspan="3">
{{ item.referer1 }}
<br>{{ item.referer2 }}
<br>{{ item.utm_source1 }}
<br>{{ item.utm_medium1 }}
<br>{{ item.utm_campaign1 }}
<br>{{ item.utm_source2 }}
<br>{{ item.utm_medium2 }}
<br>{{ item.utm_campaign2 }}
<br>{{ item.search1 }}
<br>{{ item.search2 }}
<br>{{ item.search3 }}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<script type="application/javascript">
$(document).ready(function () {
$('div.box-content table tr:not(.addition)').click(function () {
$(this).next().toggle();
})
});
</script>
{% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %}
</div>
{# pagination #}

2
templates/client/base_catalog.html
Unescape View File

@ -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' %}

2
templates/client/conference/conference_by.html
Unescape View File

@ -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 %}

2
templates/client/exposition/exposition_by.html
Unescape View File

@ -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 %}

2
templates/client/includes/reverseorder_warning.html
Unescape View File

@ -1,5 +1,5 @@
{% load i18n %}
<div class="reversed" style="border-left: 5px solid #ff9900; padding: 8px 12px; background-color: #fff; font-size:17px; text-align: justify; margin-bottom: 10px">{% trans "Выставки по указанным параметрам не найдены. Попробуйте упростить параметры или расширить временные рамки. Также Вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}</div>
<div class="reversed" style="border-left: 5px solid #ff9900; padding: 8px 12px; background-color: #fff; font-size:17px; text-align: justify; margin-bottom: 10px">{% trans "Выставки по указанным параметрам не найдены. Попробуйте упростить параметры или расширить временные рамки. Также, вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}</div>
<div class="page-title">
<h2 style="font-size:30px;">{% trans "Прошедшие события" %}</h2>
</div>

19
templates/client/includes/side_popular.html
Unescape View File

@ -1,14 +1,15 @@
{% load i18n %}
{% if side_popular %}
<div class="mps-sect">
<header style="font-size: 23px;">{% trans 'Самые популярные' %}</header>
<nav>
<ul>
{% for obj in side_popular %}
<li><a href="{{ obj.url }}">{{ obj.name }}</a></li>
{% endfor %}
{# <div class="mps-sect">#}
{# <header style="font-size: 23px;">{% trans 'Самые популярные' %}</header>#}
{# <nav>#}
<ul class="leter-list">
<li class="leter" style="font-size: 24px">{% trans 'Самые популярные' %}</li>
{% for obj in side_popular %}
<li><a href="{{ obj.url }}">{{ obj.name }}</a></li>
{% endfor %}
</ul>
</nav>
</div>
{# </nav>#}
{# </div>#}
{% endif %}

6
templates/client/popups/register.html
Unescape View File

@ -42,9 +42,9 @@
<div class="pwf-msg"><div class="msg-help">{% trans 'пароль должен иметь не меньше 6 символов' %}</div></div>
</div>
<div class="pwf-buttons-line pwf-line">
<div class="pwf-field">
<a href="{% url 'termsofuse' %}" style="color:#a2a2a2;">{% trans "Пользовательское соглашение" %}</a>
<a href="{% url 'termsofuse' %}" style="color:#a2a2a2;">{% trans "Пользовательское соглашение" %}</a>
<div class="pwf-buttons-line pwf-line" style="margin-top: 12px;">
<div class="pwf-field">
<button type="submit" class="icon-check">{% trans 'Зарегистрироваться' %}</button>
</div>
<div class="pwf-msg err-message-box pd-top-14 red"> {% trans "Ошибка" %}</div>

Write Preview
Loading…
Cancel
Save