diff --git a/conference/admin.py b/conference/admin.py index fdbea666..ab127900 100644 --- a/conference/admin.py +++ b/conference/admin.py @@ -26,6 +26,7 @@ from forms import ( ) from functions.admin_views import ( AdminListView, + AdminListViewNoThemeMixin, AdminView, stat_paginate_results, upload_photo @@ -310,6 +311,10 @@ class ConferenceListView(AdminListView): model = Conference +class ConferenceListViewNoTheme(AdminListViewNoThemeMixin, ConferenceListView): + pass + + def upload_conference_photo(request, conf_id): return upload_photo(request, conf_id, Conference) diff --git a/conference/admin_urls.py b/conference/admin_urls.py index 5abc9dd7..fa50ee56 100644 --- a/conference/admin_urls.py +++ b/conference/admin_urls.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url -from admin import ConferenceListView, ConferenceView +from admin import ConferenceListView, ConferenceView, ConferenceListViewNoTheme urlpatterns = patterns('conference.admin', url(r'^upload-photo/(?P.*)/$', 'upload_conference_photo'), url(r'^delete/(?P.*)$', 'conference_delete'), url(r'^copy/$', 'conf_copy'), - url(r'^all/$', ConferenceListView.as_view()), + url(r'^all/$', ConferenceListView.as_view(), name='admin-conference-all'), + url(r'^notheme/$', ConferenceListViewNoTheme.as_view(), name='admin-conference-notheme'), #url(r'^change/(?P.*)/$', 'conference_change'), url(r'^switch/(?P.*)/(?P.*)$', 'conference_switch'), @@ -14,4 +15,4 @@ urlpatterns = patterns('conference.admin', url(r'^(?P.*)/$', ConferenceView.as_view()), url(r'^$', ConferenceView.as_view()), -) \ No newline at end of file +) diff --git a/exposition/admin.py b/exposition/admin.py index 971fcd62..d16e63f2 100644 --- a/exposition/admin.py +++ b/exposition/admin.py @@ -24,6 +24,7 @@ from forms import ( ) from functions.admin_views import ( AdminListView, + AdminListViewNoThemeMixin, AdminView, stat_paginate_results, upload_photo @@ -349,6 +350,10 @@ class ExpositionListView(AdminListView): model = Exposition +class ExpositionListViewNoTheme(AdminListViewNoThemeMixin, ExpositionListView): + pass + + def upload_exposition_photo(request, expo_id): return upload_photo(request, expo_id, Exposition) diff --git a/exposition/admin_urls.py b/exposition/admin_urls.py index 9adda27b..1ffcc9d2 100644 --- a/exposition/admin_urls.py +++ b/exposition/admin_urls.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url -from admin import ExpositionListView, ExpositionView +from admin import ExpositionListView, ExpositionView, ExpositionListViewNoTheme urlpatterns = patterns('exposition.admin', url(r'^upload-photo/(?P.*)/$', 'upload_exposition_photo'), @@ -9,7 +9,9 @@ urlpatterns = patterns('exposition.admin', #url(r'^add.*/$', 'exposition_add'), url(r'^delete/(?P.*)/$', 'exposition_delete'), #url(r'^change/(?P.*)/$', 'exposition_change'), - url(r'^all/$', ExpositionListView.as_view()), + url(r'^all/$', ExpositionListView.as_view(), name='admin-exposition-all'), + url(r'^notheme/$', ExpositionListViewNoTheme.as_view(), name='admin-exposition-notheme'), + url(r'^switch/(?P.*)/(?P.*)$', 'exposition_switch'), #url(r'^copy/(?P.*)$', 'exposition_copy'), url(r'^search/$', 'search_expo'), diff --git a/functions/admin_views.py b/functions/admin_views.py index a4ef8305..28f2199b 100644 --- a/functions/admin_views.py +++ b/functions/admin_views.py @@ -131,16 +131,38 @@ class AdminListView(FormView): context.update({'object_list': result}) return self.render_to_response(context) - def get_context_data(self, **kwargs): - context = super(AdminListView, self).get_context_data(**kwargs) + def get_queryset(self): if issubclass(self.model, TranslatableModel): - qs = self.model.objects.language().all().order_by('name') + return self.model.objects.language().all().order_by('name') else: - qs = self.model.objects.all().order_by('-modified') + return self.model.objects.all().order_by('-modified') + + def get_context_data(self, **kwargs): + context = super(AdminListView, self).get_context_data(**kwargs) + qs = self.get_queryset() result = self.paginate_func(qs, page=self.request.GET.get('page')) context['object_list'] = result return context + +class AdminListViewNoThemeMixin(object): + def get_queryset(self): + return self.model.objects.language().filter(theme__isnull=True).order_by('name') + + def form_valid(self, form): + qs = form.filter() + qs = qs.filter(theme__isnull=True) + result = self.paginate_func(qs, page=self.request.GET.get('page')) + context = self.get_context_data(form=form) + context.update({'object_list': result}) + return self.render_to_response(context) + + def get_context_data(self, **kwargs): + context = super(AdminListViewNoThemeMixin, self).get_context_data(**kwargs) + context.update({'notheme': True}) + return context + + def upload_photo(request, id, Model): """ uploading photo to some instance of Model diff --git a/proj/views.py b/proj/views.py index e0b82252..5b987c26 100644 --- a/proj/views.py +++ b/proj/views.py @@ -86,8 +86,8 @@ class MainPageView(JitterCacheMixin, TemplateView): # update main_page counter for event in events: event.main.link.log(self.request, 1) - exposition_themes = Theme.objects.language().filter(main_page=True).order_by('-main_page').filter(types=Theme.types.exposition)[:6] - conference_themes = Theme.objects.language().filter(main_page=True).order_by('-main_page').filter(types=Theme.types.conference)[:6] + exposition_themes = Theme.objects.language().filter(main_page=True, types=Theme.types.exposition)[:6] + conference_themes = Theme.objects.language().filter(main_page=True, types=Theme.types.conference)[:6] args = {'events': events, 'exposition_themes': exposition_themes, 'conference_themes': conference_themes, 'search_form': ExpositionSearchForm, 'search_action': '/expo/search/', diff --git a/settings/admin.py b/settings/admin.py index 9414d003..d6c0aba5 100644 --- a/settings/admin.py +++ b/settings/admin.py @@ -46,8 +46,8 @@ def main_page(request): news_form.fields['main_page_news'].widget.attrs['data-init-text'] = json.dumps(a) article_form = MainPageArticle(initial={'article' : blogs}) - args = { 'theme_form' : MainPageThemes(initial=themes), + args = {'theme_form' : MainPageThemes(initial=themes), 'article_form' : article_form, 'news_form' : news_form} args.update(csrf(request)) - return render_to_response('admin/settings/main_page.html', args) \ No newline at end of file + return render_to_response('admin/settings/main_page.html', args) diff --git a/templates/admin/conference/conference_list.html b/templates/admin/conference/conference_list.html index 76c43f35..25454b13 100644 --- a/templates/admin/conference/conference_list.html +++ b/templates/admin/conference/conference_list.html @@ -20,12 +20,25 @@ td a{

{% trans "Фильтры" %}

-
-
- {{ form }} - -
+
+
+
+ {{ form }} + + +
+
+
+ +
+
+ {% if notheme %} + Отобразить все события + {% else %} + Отобразить события с пустыми темами + {% endif %} +
diff --git a/templates/admin/expobanner/comment_list.html b/templates/admin/expobanner/comment_list.html index d13c5ded..4e3fa6e0 100644 --- a/templates/admin/expobanner/comment_list.html +++ b/templates/admin/expobanner/comment_list.html @@ -32,6 +32,6 @@ {% endblock %} {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} + {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% endblock %} diff --git a/templates/admin/expobanner/pcomment_list.html b/templates/admin/expobanner/pcomment_list.html index a59cbc93..310ea791 100644 --- a/templates/admin/expobanner/pcomment_list.html +++ b/templates/admin/expobanner/pcomment_list.html @@ -32,6 +32,6 @@ {% endblock %} {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} + {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% endblock %} diff --git a/templates/admin/exposition/exposition_list.html b/templates/admin/exposition/exposition_list.html index a90a9561..bf1c6391 100644 --- a/templates/admin/exposition/exposition_list.html +++ b/templates/admin/exposition/exposition_list.html @@ -19,15 +19,29 @@ td a{

{% trans "Фильтры" %}

-
-
- {{ form }} - -
+
+
+
+ {{ form }} + + +
+
+
+ +
+
+ {% if notheme %} + Отобразить все события + {% else %} + Отобразить события с пустыми темами + {% endif %} +
+

{% trans "Список выставок" %}

diff --git a/templates/admin/place_conference/place_conference_list.html b/templates/admin/place_conference/place_conference_list.html index b3f656ac..11df2ff8 100644 --- a/templates/admin/place_conference/place_conference_list.html +++ b/templates/admin/place_conference/place_conference_list.html @@ -1,16 +1,17 @@ {% extends 'admin_list.html' %} +{% load i18n %} {% block body %}
-

Фильтры

+

{% trans "Фильтры" %}

{{ form }} - +
@@ -18,16 +19,16 @@
-

Места проведения конференций

+

{% trans "Места проведения конференций" %}

- - - + + + @@ -39,27 +40,27 @@ {% endfor %}
НазваниеСтранаГород{% trans "Название" %}{% trans "Страна" %}{% trans "Город" %}  
{% ifnotequal item.city None %}{{ item.city }} {% endifnotequal %} - Изменить + {% trans "Изменить" %} - Копировать + {% trans "Копировать" %} - Удалить + {% trans "Удалить" %}
- Добавить конферец зал + {% trans "Добавить конферец зал" %}
{# pagination #} {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/redirects/list.html b/templates/admin/redirects/list.html index c48d2ff9..5f845ad9 100644 --- a/templates/admin/redirects/list.html +++ b/templates/admin/redirects/list.html @@ -32,6 +32,6 @@ {% endblock %}
{# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} + {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %}
{% endblock %} diff --git a/templates/client/includes/conference/conference_object.html b/templates/client/includes/conference/conference_object.html index 2d6e10e2..07691a09 100644 --- a/templates/client/includes/conference/conference_object.html +++ b/templates/client/includes/conference/conference_object.html @@ -353,46 +353,53 @@
{% endif %} {% include 'client/includes/banners/detail_inner_3.html' %} +

{% trans 'Смотрите также:' %}

{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} {% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} - {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} - {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} + {% if event.theme.all %} + {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} + {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} + {% endif %}
+ {% endblock %} + {% block content_text %} {% endblock %} + {% block popup %} {% include 'client/popups/advertise_member.html' with form=advertising_form %} {% endblock %} + {% block scripts %} -{% if request.GET.debug == '1' %} - -{% else %} - -{% endif %} - + {% if request.GET.debug == '1' %} + + {% else %} + + {% endif %} + {% endblock %} diff --git a/templates/client/includes/conference/conference_paid.html b/templates/client/includes/conference/conference_paid.html index e1dfbd4d..ed7a8a3e 100644 --- a/templates/client/includes/conference/conference_paid.html +++ b/templates/client/includes/conference/conference_paid.html @@ -388,13 +388,17 @@ {% endif %} {% include 'client/includes/banners/detail_inner_3.html' %} +

{% trans 'Смотрите также:' %}

{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} {% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} - {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} - {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} + {% if event.theme.all %} + {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %} + {% trans "Конференции по тематике " %}«{{ event.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %} + {% endif %}
+ {% endblock %} {% block content_text %} diff --git a/templates/client/includes/exposition/expo_paid.html b/templates/client/includes/exposition/expo_paid.html index 9715b7e8..d48203dc 100644 --- a/templates/client/includes/exposition/expo_paid.html +++ b/templates/client/includes/exposition/expo_paid.html @@ -372,13 +372,16 @@ {% endif %} -
-

{% trans 'Смотрите также:' %}

- {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} - {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + +
+

{% trans 'Смотрите также:' %}

+ {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} + {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + {% if exposition.theme.all %} {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} -
+ {% endif %} +
{% endblock %} {% block content_text %} diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html index 45337400..4e6df6e2 100644 --- a/templates/client/includes/exposition/exposition_object.html +++ b/templates/client/includes/exposition/exposition_object.html @@ -381,43 +381,48 @@

{% trans 'Смотрите также:' %}

{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} - {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} - {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} - {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} + {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + {% if exposition.theme.all %} + {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|capfirst }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} + {% endif %}
{% endblock %} + {% block content_text %} {% endblock %} + {% block popup %} {% include 'client/popups/advertise_member.html' with form=advertising_form %} {% endblock %} + {% block scripts %} -{% if request.GET.debug == '1' %} - -{% else %} - -{% endif %} - + {% if request.GET.debug == '1' %} + + {% else %} + + {% endif %} + {% endblock %}