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

m

Browse Source
remotes/origin/stage6
Alexander Burdeinyi 9 years ago
parent 61a86e9a1d
commit 38d0d27e5a
10 changed files with 55 additions and 41 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. 8
      conference/admin.py
  2. 20
      conference/forms.py
  3. 2
      functions/model_mixin.py
  4. 13
      settings/admin.py
  5. 6
      static/client/js/rejs/tops.js
  6. 18
      templates/c_admin/conference/conference.html
  7. 2
      templates/client/includes/conference/conference_list.html
  8. 23
      templates/client/includes/conference/conference_partner.html
  9. 2
      templates/client/includes/exposition/expo_top.html
  10. 2
      templates/client/includes/exposition/exposition_list.html

8
conference/admin.py
Unescape View File

@ -215,7 +215,8 @@ def conference_change(request, url):
'link':conference.link, 'conference_id':conference.id, 'expohit': conference.expohit,
'discount': conference.discount,'canceled': conference.canceled, 'moved': conference.moved,
'visitors': conference.visitors, 'members': conference.members,
'quality_label': [item for item, bool in conference.quality_label if bool==True]}
# 'quality_label': [item for item, bool in conference.quality_label if bool==True]
}
if conference.country:
data['country'] = conference.country.id
@ -290,7 +291,8 @@ class ConferenceView(AdminView):
'discount': obj.discount,'canceled': obj.canceled, 'moved': obj.moved,
'visitors': obj.visitors, 'members': obj.members, 'logo': obj.logo,
'audience': obj.audience.all().values_list('pk', flat=True),
'quality_label': [item for item, bool in obj.quality_label if bool==True]}
# 'quality_label': [item for item, bool in obj.quality_label if bool==True],
}
if obj.place:
data['place'] = obj.place.id
@ -309,7 +311,7 @@ class ConferenceView(AdminView):
data['description_%s' % code] = trans_obj.description
data['main_title_%s' % code] = trans_obj.main_title
data['time_%s' % code] = trans_obj.time
data['main_themes_%s' % code] = trans_obj.main_themes
# data['main_themes_%s' % code] = trans_obj.main_themes
data['discount_description_%s' % code] = trans_obj.discount_description
data['title_%s' % code] = trans_obj.title
data['keywords_%s' % code] = trans_obj.keywords

20
conference/forms.py
Unescape View File

@ -75,7 +75,7 @@ class ConferenceCreateForm(forms.Form):
foundation_year = forms.CharField(label=_(u'Год основания'), required=False)
members = forms.CharField(label=_(u'Участники'), required=False)
members_fc = forms.IntegerField(label=_(u'Ожидаемое количество участников'), required=False)
visitors = forms.CharField(label=_(u'Посетители'), required=False)
# visitors = forms.CharField(label=_(u'Посетители'), required=False)
discount = forms.CharField(label=_(u'Cкидка(%)'), required=False)
#
currency = forms.ChoiceField(label=_(u'Валюта'), choices=currencies, required=False)
@ -85,9 +85,9 @@ class ConferenceCreateForm(forms.Form):
expohit = forms.BooleanField(label=_(u'Expohit'), required=False)
canceled = forms.BooleanField(label=_(u'Отменена'), required=False)
moved = forms.BooleanField(label=_(u'Перенесена'), required=False)
quality_label = forms.MultipleChoiceField(label=_(u'Тип'), required=False,
choices=[('ufi', 'UFI'), ('rsva', 'РСВЯ'), ('exporating', 'ExpoRating')],
widget=forms.CheckboxSelectMultiple())
# quality_label = forms.MultipleChoiceField(label=_(u'Тип'), required=False,
# choices=[('ufi', 'UFI'), ('rsva', 'РСВЯ'), ('exporating', 'ExpoRating')],
# widget=forms.CheckboxSelectMultiple())
speakers = forms.ModelMultipleChoiceField(label=_(u'Спикеры'),
queryset=Speaker.objects.all(), required=False)
@ -113,8 +113,8 @@ class ConferenceCreateForm(forms.Form):
required=False, widget=CKEditorWidget)
self.fields['time_%s' % code] = forms.CharField(label=_(u'Время работы'),
required=False, widget=CKEditorWidget)
self.fields['main_themes_%s' % code] = forms.CharField(label=_(u'Основные темы'),
required=False, widget=CKEditorWidget)
# self.fields['main_themes_%s' % code] = forms.CharField(label=_(u'Основные темы'),
# required=False, widget=CKEditorWidget)
self.fields['discount_description_%s' % code] = forms.CharField(label=_(u'Описание скидки'),
required=False, widget=CKEditorWidget)
#meta data
@ -160,7 +160,7 @@ class ConferenceCreateForm(forms.Form):
conference.programm_link = data['programm_link']
conference.members = data['members']
conference.members_fc = data['members_fc']
conference.visitors = data['visitors']
# conference.visitors = data['visitors']
#
conference.currency = data['currency']
conference.tax = data['tax']
@ -175,10 +175,10 @@ class ConferenceCreateForm(forms.Form):
conference.place_alt = data['place_alt']
# generates bitfield
flag = 0
if data['quality_label']:
flag = reduce(lambda x,y: x|y, (getattr(Conference.quality_label, item) for item in data['quality_label']))
# if data['quality_label']:
# flag = reduce(lambda x,y: x|y, (getattr(Conference.quality_label, item) for item in data['quality_label']))
conference.quality_label = flag
# conference.quality_label = flag
conference.audience = data['audience']

2
functions/model_mixin.py
Unescape View File

@ -131,7 +131,7 @@ class EventMixin(object):
events.extend(qs.filter(data_begin__gte=now).exclude(pk__in=exclude_pks)[:3])
exclude_pks.update([x.pk for x in events])
return (list(
sorted((chain(zip(*[x for x in [events_m2, events_m, events] if x]))[:3]), key=lambda x: x.data_begin)),
sorted(list(chain(*zip(*[x for x in [events_m2, events_m, events] if x])))[:3], key=lambda x: x.data_begin)),
exclude_pks)
def get_nearest_events(self):

13
settings/admin.py
Unescape View File

@ -7,6 +7,7 @@ from django.http import HttpResponseRedirect
from django.core.urlresolvers import reverse, reverse_lazy
from django.core.context_processors import csrf
from django.conf import settings
from django.core.cache import cache
from functions.custom_views import ContextMixin
from .forms import MainPageArticle
@ -84,6 +85,18 @@ class EventSectionSettings(ContextMixin, FormView):
def form_valid(self, form):
form.save()
keys = [
'expo_city_catalog_ru',
'expo_city_catalog_en',
'expo_country_catalog_en',
'expo_country_catalog_ru',
'conf_country_catalog_ru',
'conf_country_catalog_en',
'conf_city_catalog_en',
'conf_city_catalog_ru',
]
for key in keys:
cache.delete(key)
return super(EventSectionSettings, self).form_valid(form)

6
static/client/js/rejs/tops.js
Unescape View File

@ -70,7 +70,7 @@
var removeDublicates = function () {
$('div#' + PARENT_ID + ' ul li.cl-item').each(function(index, el) {
$('div.page-body ul.cat-list li.cl-item a[href=\'' + $(el).data('url') + '\']').parents('li.cl-item').remove();
$('div.page-body ul.cat-list li.cl-item[data-slug=\'' + $(el).data('slug') + '\']').not(el).remove();
});
}
@ -79,7 +79,9 @@
if (parent) {
parent.innerHTML = text;
removeDublicates();
$(document).ready(function () {
removeDublicates();
});
}
};

18
templates/c_admin/conference/conference.html
Unescape View File

@ -283,9 +283,9 @@
</div>
</div>
{# main_themes #}
{% with field='main_themes' form=form languages=languages %}
{% include 'c_admin/forms/multilang.html' %}
{% endwith %}
{# {% with field='main_themes' form=form languages=languages %}#}
{# {% include 'c_admin/forms/multilang.html' %}#}
{# {% endwith %}#}
{# time #}
{% with field='time' form=form languages=languages %}
{% include 'c_admin/forms/multilang.html' %}
@ -298,12 +298,12 @@
</div>
</div>
{# quality_label #}
<div class="control-group {% if form.quality_label.errors %}error{% endif %}">
<label class="control-label">{{ form.quality_label.label }}:</label>
<div class="controls">{{ form.quality_label }}
<span class="help-inline">{{ form.quality_label.errors }}</span>
</div>
</div>
{# <div class="control-group {% if form.quality_label.errors %}error{% endif %}">#}
{# <label class="control-label">{{ form.quality_label.label }}:</label>#}
{# <div class="controls">{{ form.quality_label }}#}
{# <span class="help-inline">{{ form.quality_label.errors }}</span>#}
{# </div>#}
{# </div>#}
{# canceled #}
<div class="control-group {% if form.canceled.errors %}error{% endif %}">
<label class="control-label">{{ form.canceled.label }}:</label>

2
templates/client/includes/conference/conference_list.html
Unescape View File

@ -7,7 +7,7 @@
<ul class="cat-list cl-exhibitions">
{% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}">
<li class="cl-item {% if obj.canceled %}canceled{% endif %}" data-slug="{{ obj.url }}">
<div class="cl-item-wrap clearfix">
<a target="_blank" href="{{ obj.get_permanent_url }}">
{% if obj.canceled %}

23
templates/client/includes/conference/conference_partner.html
Unescape View File

@ -154,7 +154,7 @@
<hr>
{% include 'client/includes/conference/conference_services.html' with event=event %}
{# {% include 'client/includes/conference/conference_services.html' with event=event %}#}
{% include 'includes/event_steps.html' with event=event %}
<hr>
@ -174,11 +174,15 @@
<ul class="conf_extra">
{% if event.business_program.exists %}
<li><a href="{{ event.get_permanent_url }}program/"><i class="fa fa-file-text-o"></i> <span>{% trans 'Деловая программа' %}</span></a></li>
<li><a href="{{ event.get_permanent_url }}program/" rel="nofollow"><i class="fa fa-file-text-o"></i> <span>{% trans 'Деловая программа' %}</span></a></li>
{% endif %}
{% if event.web_page %}
<li><a target="_blank" href="{{ event.web_page }}" data-url="{{ event.web_page|base64_encode }}"><i class="fa fa-globe"></i> <span>{% trans 'На сайт события' %}</span></a></li>
<li><a target="_blank" href="{{ event.web_page }}" data-url="{{ event.web_page|base64_encode }}" rel="nofollow"><i class="fa fa-globe"></i> <span>{% trans 'На сайт события' %}</span></a></li>
{% endif %}
{% if event.programm_link %}
<li><a target="_blank" href="{{ event.programm_link }}" rel="nofollow"><i class="fa fa-globe"></i> <span>{% trans 'Программа' %}</span></a></li>
{% endif %}
</ul>
@ -359,7 +363,7 @@
</div>
</div>
{% if object.place or object.place_alt %}
<div class="conf_place">
{% if object.place %}
<div class="place_detail">
@ -373,24 +377,17 @@
<div class="place_image">
{% thumbnail object.place.get_logo "349x401" as im %}
<img src="{{ im.url }}" alt="">
{# {% epmty %}#}
{% endthumbnail %}
{# <img src="{% static 'client/img/_del-temp/place.jpg' %}" alt="">#}
</div>
{% else %}
<div class="place_detail">
<h3>{% trans 'Место проведения' %}</h3>
<h4><i class="fa fa-map-marker"></i> {{ object.place_alt }}</h4>
<div class="grey">{{ event.country.name }}, {{ event.city.name }}{% if event.place_alt %} , {{ event.place_alt }}{% endif %}</div>
{# <br> Экспозиционная площадь павильона №8 – 14 842 кв.м</div>#}
{# <p>Главное событие отрасли высоких технологий — 9-й Russian Interactive Week (RIW) — это место встреч, коммуникаций, обмена опытом и демонстрации достижений российской отрасли высоких технологий и инноваций. RIW — ежегодное осеннее выставочно- конференционное событие сразу четырех отраслей: Интернет, Телеком, Медиа, Софт. А с 2016 года в RIW активно</p>#}
{# <a class="button" href="#">{% trans 'подробнее' %}</a>#}
</div>
{# <div class="place_image">#}
{# <img src="{% static 'client/img/_del-temp/place.jpg' %}" alt="">#}
{# </div>#}
{% endif %}
</div>
{% endif %}
{% comment %}
{% if event.members or event.visitors or event.foundation_year %}
@ -447,7 +444,7 @@
</form>
</div>
{% else %}
<p>{% trans 'Для отправки комментариев авторизуйтесь.' %}</p>
<p>{% trans 'Если вы хотите оставить отзыв или комментарий' %}, <a class="pw-open" href="#pw-login">{% trans 'авторизуйтесь' %}.</a></p>
{% endif %}
</div>

2
templates/client/includes/exposition/expo_top.html
Unescape View File

@ -5,7 +5,7 @@
<ul class="cat-list cl-exhibitions">
{% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}" style="border:1px solid #ff6600;" data-url="{{ obj.get_permanent_url }}">
<li class="cl-item {% if obj.canceled %}canceled{% endif %}" style="border:1px solid #ff6600;" data-url="{{ obj.get_permanent_url }}" data-slug="{{ obj.url }}">
<div class="cl-item-wrap clearfix">
{% if not obj.canceled %}
<a href="{{ obj.get_top_link }}">

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

@ -7,7 +7,7 @@
<ul class="cat-list cl-exhibitions">
{% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}">
<li class="cl-item {% if obj.canceled %}canceled{% endif %}" data-slug="{{ obj.url }}">
<div class="cl-item-wrap clearfix">
{% if not obj.canceled %}
<a target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">

Write Preview
Loading…
Cancel
Save