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

Catalog bugs

Browse Source
remotes/origin/1203
Kotiuk Nazarii 11 years ago
parent e71dfb51ba
commit a43196d54a
7 changed files with 180 additions and 129 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. 12
      conference/models.py
  2. 3
      settings/templatetags/template_filters.py
  3. 116
      templates/admin/base.html
  4. 110
      templates/admin/includes/admin_nav.html
  5. 30
      templates/admin/includes/staff_nav.html
  6. 34
      templates/client/includes/exposition/exposition_list.html
  7. 4
      templates/client/includes/header.html

12
conference/models.py
Unescape View File

@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
import datetime
from django.utils.translation import ugettext as _
from django.db import models
from django.db.models import Q
@ -129,8 +130,15 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin):
#return list(Service.objects.language().filter(url__in=ids, type=Service.type.conference).order_by('sort'))
def get_nearest_events(self):
conferences = Conference.objects.all()[:5]
return conferences
if self.theme.all():
theme = self.theme.all()[0]
now = datetime.datetime.now()
now = now - datetime.timedelta(days=1)
conferences = Conference.objects.filter(theme__in=[theme], data_begin__gt=now).exclude(id=self.id).order_by('data_begin')
return conferences[:3]
else:
return []
def get_catalog_url(self):
return '/conference/'

3
settings/templatetags/template_filters.py
Unescape View File

@ -251,7 +251,8 @@ def in_events(day, events):
@register.filter
def base64_encode(value):
return base64.b64encode(value)
return base64.b64encode(value.encode("utf-8"))
@register.filter

116
templates/admin/base.html
Unescape View File

@ -54,116 +54,12 @@
{# Side navigation #}
{% block sidebar %}
<div class="span3" data-spy="affix" data-offset-top="0" id="navigation">
<div class="well sidebar-nav">
<ul class="nav nav-tabs nav-stacked">
<li class="nav-header">Добавить</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-eye-open"></i> События<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/exposition/all">Выставка</a></li>
<li><a href="/admin/conference/all">Конференция</a></li>
<li><a href="/admin/seminar/all">Семинар</a></li>
<li><a href="/admin/webinar/all">Вебинар</a></li>
<li class="divider"></li>
<li><a href="/admin/import-event">Импорт</a></li>
<li><a href="/admin/export-event">Экспорт</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-eye-open"></i> Места проведения<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/place_exposition/all">Место проведения выставки</a></li>
<li><a href="/admin/place_conference/all">Место проведения конференции</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-eye-open"></i> Пользователи<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/accounts/all">Пользователи</a></li>
<li><a href="/admin/translator/all">Переводчики</a></li>
<li><a href="/admin/organiser/all">Организаторы</a></li>
<li><a href="/admin/company/all">Компании</a></li>
<li class="divider"></li>
<li><a href="/admin/import-organiser">Импорт организаторов</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-wrench"></i> Настройки<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/country/all">Страна</a></li>
<li><a href="/admin/city/all">Город</a></li>
<li><a href="/admin/theme/theme/all">Тематики</a></li>
<li><a href="/admin/theme/tag/all">Теги</a></li>
<li><a href="/admin/service/all">Услуги</a></li>
<li><a href="/admin/settings">Настройки</a></li>
<li><a href="/admin/settings/main-page/">Главная страница</a></li>
<li><a href="/admin/meta/all/">Мета</a></li>
<li class="divider"></li>
<li><a href="/admin/import-theme">Импорт тематик</a></li>
<li><a href="/admin/import-tag">Импорт тегов</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-list"></i> Справочники<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/article/blog/all/">Статьи</a></li>
<li><a href="/admin/article/news/all/">Новости</a></li>
<li><a href="#">Отзывы</a></li>
<li><a href="/admin/language/add">Языки</a></li>
<li><a href="/admin/currency/add">Валюты</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-circle-arrow-down"></i> Импорт<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/import-event">События</a></li>
<li><a href="/admin/import-organiser">Организаторы</a></li>
<li><a href="/admin/import-place_exposition">Место проведения выставок</a></li>
<li><a href="/admin/import-place_conference">Место проведения конференций</a></li>
<li><a href="/admin/import-theme">Тематики</a></li>
<li><a href="/admin/import-tag">Теги</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class=" icon-circle-arrow-up"></i> Экспорт<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/export-event">События</a></li>
<li><a href="/admin/export-organiser">Организаторы</a></li>
<li><a href="/admin/export-place_exposition">Место проведения выставок</a></li>
<li><a href="/admin/export-place_conference">Место проведения конференций</a></li>
<li><a href="/admin/export-theme">Тематики</a></li>
<li><a href="/admin/export-tag">Теги</a></li>
<li><a href="/admin/export-user">Пользователи</a></li>
<li><a href="/admin/export-company">Компании</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class=" icon-circle-arrow-up"></i> Заказы<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/service/order/callback/">Обратный звонок</a></li>
<li><a href="/admin/service/order/visit/">Бизнес-тур под ключ</a></li>
<li><a href="/admin/service/order/translation/">Переводчик</a></li>
<li><a href="/admin/service/order/advertising/">Рекламировать</a></li>
<li><a href="/admin/service/order/participation/">Участие</a></li>
<li><a href="/admin/service/order/remote/">Заочное посещение</a></li>
<li><a href="/admin/service/order/tickets/">Билеты</a></li>
</ul>
</li>
</ul>
</div>
</div>
{% if user.is_superuser %}
{% include 'admin/includes/admin_nav.html' %}
{% else %}
{% include 'admin/includes/staff_nav.html' %}
{% endif %}
{% endblock %}

110
templates/admin/includes/admin_nav.html
Unescape View File

@ -0,0 +1,110 @@
<div class="span3" data-spy="affix" data-offset-top="0" id="navigation">
<div class="well sidebar-nav">
<ul class="nav nav-tabs nav-stacked">
<li class="nav-header">Добавить</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-eye-open"></i> События<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/exposition/all">Выставка</a></li>
<li><a href="/admin/conference/all">Конференция</a></li>
<li><a href="/admin/seminar/all">Семинар</a></li>
<li><a href="/admin/webinar/all">Вебинар</a></li>
<li class="divider"></li>
<li><a href="/admin/import-event">Импорт</a></li>
<li><a href="/admin/export-event">Экспорт</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-eye-open"></i> Места проведения<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/place_exposition/all">Место проведения выставки</a></li>
<li><a href="/admin/place_conference/all">Место проведения конференции</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-eye-open"></i> Пользователи<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/accounts/all">Пользователи</a></li>
<li><a href="/admin/translator/all">Переводчики</a></li>
<li><a href="/admin/organiser/all">Организаторы</a></li>
<li><a href="/admin/company/all">Компании</a></li>
<li class="divider"></li>
<li><a href="/admin/import-organiser">Импорт организаторов</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-wrench"></i> Настройки<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/country/all">Страна</a></li>
<li><a href="/admin/city/all">Город</a></li>
<li><a href="/admin/theme/theme/all">Тематики</a></li>
<li><a href="/admin/theme/tag/all">Теги</a></li>
<li><a href="/admin/service/all">Услуги</a></li>
<li><a href="/admin/settings">Настройки</a></li>
<li><a href="/admin/settings/main-page/">Главная страница</a></li>
<li><a href="/admin/meta/all/">Мета</a></li>
<li class="divider"></li>
<li><a href="/admin/import-theme">Импорт тематик</a></li>
<li><a href="/admin/import-tag">Импорт тегов</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-list"></i> Справочники<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/article/blog/all/">Статьи</a></li>
<li><a href="/admin/article/news/all/">Новости</a></li>
<li><a href="#">Отзывы</a></li>
<li><a href="/admin/language/add">Языки</a></li>
<li><a href="/admin/currency/add">Валюты</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-circle-arrow-down"></i> Импорт<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/import-event">События</a></li>
<li><a href="/admin/import-organiser">Организаторы</a></li>
<li><a href="/admin/import-place_exposition">Место проведения выставок</a></li>
<li><a href="/admin/import-place_conference">Место проведения конференций</a></li>
<li><a href="/admin/import-theme">Тематики</a></li>
<li><a href="/admin/import-tag">Теги</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class=" icon-circle-arrow-up"></i> Экспорт<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/export-event">События</a></li>
<li><a href="/admin/export-organiser">Организаторы</a></li>
<li><a href="/admin/export-place_exposition">Место проведения выставок</a></li>
<li><a href="/admin/export-place_conference">Место проведения конференций</a></li>
<li><a href="/admin/export-theme">Тематики</a></li>
<li><a href="/admin/export-tag">Теги</a></li>
<li><a href="/admin/export-user">Пользователи</a></li>
<li><a href="/admin/export-company">Компании</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class=" icon-circle-arrow-up"></i> Заказы<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/service/order/callback/">Обратный звонок</a></li>
<li><a href="/admin/service/order/visit/">Бизнес-тур под ключ</a></li>
<li><a href="/admin/service/order/translation/">Переводчик</a></li>
<li><a href="/admin/service/order/advertising/">Рекламировать</a></li>
<li><a href="/admin/service/order/participation/">Участие</a></li>
<li><a href="/admin/service/order/remote/">Заочное посещение</a></li>
<li><a href="/admin/service/order/tickets/">Билеты</a></li>
</ul>
</li>
</ul>
</div>
</div>

30
templates/admin/includes/staff_nav.html
Unescape View File

@ -0,0 +1,30 @@
<div class="span3" data-spy="affix" data-offset-top="0" id="navigation">
<div class="well sidebar-nav">
<ul class="nav nav-tabs nav-stacked">
<li class="nav-header">Добавить</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-eye-open"></i> События<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/exposition/all">Выставка</a></li>
<li><a href="/admin/conference/all">Конференция</a></li>
<li><a href="/admin/seminar/all">Семинар</a></li>
<li><a href="/admin/webinar/all">Вебинар</a></li>
<li class="divider"></li>
<li><a href="/admin/import-event">Импорт</a></li>
<li><a href="/admin/export-event">Экспорт</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-list"></i> Справочники<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/article/blog/all/">Статьи</a></li>
<li><a href="/admin/article/news/all/">Новости</a></li>
</ul>
</li>
</ul>
</div>
</div>

34
templates/client/includes/exposition/exposition_list.html
Unescape View File

@ -8,20 +8,26 @@
{% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}">
<div class="cl-item-wrap clearfix">
<a href="{{ obj.get_permanent_url }}">
{% if obj.canceled %}
<div class="cancel"></div>
{% else %}
{% if obj.expohit %}
<div class="hit"></div>
{% endif %}
{% endif %}
<div class="cli-pict">
{% with obj=obj %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
</a>
{% if not obj.canceled %}
<a href="{{ obj.get_permanent_url }}">
{% if obj.expohit %}
<div class="hit"></div>
{% endif %}
<div class="cli-pict">
{% with obj=obj %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
</a>
{% else %}
<div class="cancel"></div>
<div class="cli-pict">
{% with obj=obj %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
{% endif %}
<div class="cli-info">
<div class="cli-top clearfix">
{% if obj.quality_label.ufi.is_set %}

4
templates/client/includes/header.html
Unescape View File

@ -35,8 +35,8 @@
</form>
{% endfor %}
{% if user.is_admin %}
<li><a href="/admin">admin</a></li>
{% if user.is_staff %}
<li><a href="/admin/">admin</a></li>
{% endif %}
</ul>
</div>

Write Preview
Loading…
Cancel
Save