diff --git a/article/admin.py b/article/admin.py index 94a892a3..ff178cee 100644 --- a/article/admin.py +++ b/article/admin.py @@ -5,6 +5,7 @@ from django.core.context_processors import csrf from django.conf import settings from django.contrib.auth.decorators import login_required from django.contrib.contenttypes.models import ContentType +from django.views.generic import DeleteView #models and forms from forms import ArticleForm, ArticleDeleteForm, Article, NewsForm from theme.models import Tag @@ -16,6 +17,18 @@ from functions.custom_views import objects_list, add_object_with_file, delete_ob from functions.views_help import get_referer +class ArticleDeleteView(DeleteView): + model = Article + template_name = "admin/article/article_confirm_delete.html" + + def get_success_url(self): + if self.object.type == 1: + type = "blog" + else: + type = "news" + return "/admin/article/%s/all/" % type + + def article_all(request): """ Return list of all articles with pagination diff --git a/article/admin_urls.py b/article/admin_urls.py index cbc9b1f6..ed180fb2 100644 --- a/article/admin_urls.py +++ b/article/admin_urls.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, url -from admin import BlogList, BlogView, NewsList, NewsView +from admin import BlogList, BlogView, NewsList, NewsView, ArticleDeleteView urlpatterns = patterns('article.admin', @@ -11,6 +11,7 @@ urlpatterns = patterns('article.admin', #url(r'^all/$', 'article_all'), url(r'^blog/all/$', BlogList.as_view()), url(r'^blog/$', BlogView.as_view()), + url(r'^delete/(?P.*)/$', ArticleDeleteView.as_view()), url(r'^news/all/$', NewsList.as_view()), url(r'^news/$', NewsView.as_view()), diff --git a/article/forms.py b/article/forms.py index 2648f96b..54e6477f 100644 --- a/article/forms.py +++ b/article/forms.py @@ -19,7 +19,7 @@ from conference.models import Conference class BlogForm(forms.Form): type = Article.blog - theme = forms.ModelMultipleChoiceField(label='Тематики', queryset=Theme.objects.all(), required=False, + theme = forms.ModelMultipleChoiceField(label='Тематики', queryset=Theme.objects.exclude(article__id=None), required=False, widget=forms.SelectMultiple(attrs={'style':'width: 550px'})) publish_date = forms.DateField(label=u'Дата публикации', input_formats=['%Y-%m-%d', '%d.%m.%Y'], required=False) tag = forms.CharField(label=u'Теги', widget=forms.HiddenInput(), required=False) @@ -258,7 +258,7 @@ class BlogForm(forms.ModelForm): class ArticleFilterForm(forms.Form): theme = forms.MultipleChoiceField(label=_(u'Тематика:'), required=False, - choices=[(item.id, item.name) for item in Theme.objects.language().all()]) + choices=[(item.id, item.name) for item in Theme.objects.language().exclude(article__id=None)]) tag = forms.CharField(label=_(u'Теги:'), widget=forms.HiddenInput(), required=False) ''' @@ -295,4 +295,4 @@ class NewsFilterForm(forms.Form): super(NewsFilterForm, self).__init__(*args, **kwargs) ids = [item['theme'] for item in list(Article.objects.news().values('theme').distinct())] self.fields['theme'] = forms.MultipleChoiceField(label=_(u'Тематика:'), required=False, - choices=[(item.id, item.name) for item in Theme.objects.language().filter(id__in=ids)]) \ No newline at end of file + choices=[(item.id, item.name) for item in Theme.objects.language().exclude(article__id=None).filter(id__in=ids)]) \ No newline at end of file diff --git a/article/urls.py b/article/urls.py index a0faf232..482a9e76 100644 --- a/article/urls.py +++ b/article/urls.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, url -from views import BlogList, NewsList, BlogDetail, NewsDetail, NewsTagCatalog, BlogsTagCatalog +from views import BlogList, NewsList, BlogDetail, NewsDetail, NewsTagCatalog, BlogsFilterCatalog urlpatterns = patterns('', - url(r'^blogs/tag/(?P.*)/page/(?P\d+)/$', BlogsTagCatalog.as_view(), {'meta_id':75}), + url(r'^blogs/tag/(?P.*)/page/(?P\d+)/$', BlogsFilterCatalog.as_view(), {'meta_id':75, 'filter':'tag'}), + url(r'^blogs/theme/(?P.*)/page/(?P\d+)/$', BlogsFilterCatalog.as_view(), {'filter':'theme'}), url(r'^blogs/page/(?P\d+)/$', BlogList.as_view(), {'meta_id':79}), - url(r'^blogs/tag/(?P.*)/$', BlogsTagCatalog.as_view(), {'meta_id':75}), + url(r'^blogs/tag/(?P.*)/$', BlogsFilterCatalog.as_view(), {'meta_id':75, 'filter':'tag'}), + url(r'^blogs/theme/(?P.*)/$', BlogsFilterCatalog.as_view(), {'filter':'theme'}), url(r'^blogs/$', BlogList.as_view(), {'meta_id':79}), diff --git a/article/views.py b/article/views.py index 53dbdb6e..7b5c68ec 100644 --- a/article/views.py +++ b/article/views.py @@ -5,11 +5,12 @@ from functions.custom_views import ListView from django.http import HttpResponse from models import Article from forms import ArticleFilterForm -from theme.models import Tag +from theme.models import Tag, Theme from meta.views import MetadataMixin + class NewsList(MetadataMixin, ListView): model = Article template_name = 'article/news_list.html' @@ -53,7 +54,6 @@ class NewsList(MetadataMixin, ListView): return context - class NewsDetail(MetadataMixin, DetailView): model = Article slug_field = 'slug' @@ -163,7 +163,7 @@ class NewsTagCatalog(MetadataMixin, ListView): -class BlogsTagCatalog(MetadataMixin, ListView): +class BlogsFilterCatalog(MetadataMixin, ListView): model = Article template_name = 'client/article/catalog.html' catalog_url = '/blogs/tag/' @@ -171,12 +171,19 @@ class BlogsTagCatalog(MetadataMixin, ListView): year = None month = None - def get_queryset(self): + def get_queryset(self, **kwargs): slug = self.kwargs.get('slug') - tag = get_object_or_404(Tag, url=slug) - self.kwargs['tag'] = tag - self.filter_object = tag - qs = Article.objects.blogs().filter(tag=tag) + filter = self.kwargs['filter'] + if filter == 'tag': + tag = get_object_or_404(Tag, url=slug) + self.kwargs['tag'] = tag + self.filter_object = tag + qs = Article.objects.blogs().filter(tag=tag) + else: + theme = get_object_or_404(Theme, url=slug) + self.kwargs['theme'] = theme + self.filter_object = theme + qs = Article.objects.blogs().filter(theme = theme) year = self.kwargs.get('year') if year: @@ -201,8 +208,9 @@ class BlogsTagCatalog(MetadataMixin, ListView): def get_context_data(self, **kwargs): - context = super(BlogsTagCatalog, self).get_context_data(**kwargs) + context = super(BlogsFilterCatalog, self).get_context_data(**kwargs) context['filter_object'] = self.filter_object + context['type'] = 'article' context['year'] = self.year context['month'] = self.month context['catalog_url'] = self.catalog_url diff --git a/core/utils.py b/core/utils.py index 37a7f4ce..99b93844 100644 --- a/core/utils.py +++ b/core/utils.py @@ -7,6 +7,21 @@ http://www.simplistix.co.uk/presentations/python-excel.pdf import xlwt import datetime from django.core.exceptions import ObjectDoesNotExist +from django.conf import settings +from django.utils.translation import get_language + +current_lang = get_language()[:2] +if current_lang == 'ru': + header_list = [u'#', u'Название события',u'Даты',u'Краткое описание',u'Место проведения', u'Заметка', u'Ссылка на событие'] + main_header = u'Мой календарь собитий на {month} {year} года' +else: + header_list = [u'#', u'Event',u'Period',u'Short description',u'Place', u'Notes', u'Hyperlink'] + main_header = u'My event calendar on {month} {year}' + + + + + HEADER_STYLE = xlwt.easyxf('font: bold on') DEFAULT_STYLE = xlwt.easyxf() @@ -46,6 +61,12 @@ def get_column_cell(obj, name): def queryset_to_workbook(queryset, columns, report_date = None): + # localization + if current_lang == 'ru': + month_name = settings.MONTHES[report_date.strftime("%b").lower()]['name'] + else: + month_name = report_date.strftime("%B") + # defining styles for different types of cells main_style = xlwt.Style.easyxf( "font: name Calibri, height 600, bold False;" @@ -63,13 +84,13 @@ def queryset_to_workbook(queryset, columns, report_date = None): odd_style = xlwt.Style.easyxf( 'font: name Calibri, height 300, bold False;' 'borders: left thin, right thin, top thin, bottom thin;' - 'alignment: horizontal center, wrap True;' + 'alignment: horizontal center, vertical center, wrap True;' 'pattern: pattern solid, fore_color white;', ) even_style = xlwt.Style.easyxf( 'font: name Calibri, height 300, bold False;' 'borders: left thin, right thin, top thin, bottom thin;' - 'alignment: horizontal center, wrap True;' + 'alignment: horizontal center, vertical center, wrap True;' 'pattern: pattern solid, fore_color silver_ega;', ) # creating workbook and adding sheet @@ -78,14 +99,15 @@ def queryset_to_workbook(queryset, columns, report_date = None): sheet_name = u'My calendar {0}'.format(report_date.strftime('%Y-%B')) sheet = workbook.add_sheet(sheet_name) + # drawing head part with image - sheet.write_merge(0, 6, 0, 6, u'Мой календарь собитий на %s года' % report_date.strftime("%B %Y"), main_style) + sheet.write_merge(0, 6, 0, 6, main_header.format( + month = month_name,year = report_date.strftime("%Y")), main_style) for i in range(7): sheet.row(i).set_style(xlwt.Style.easyxf('font:height 300;')) - sheet.insert_bitmap('/home/www/proj/media/logo.bmp', row=0, col=5, x=0, y=0, scale_x=0.3, scale_y=2) + sheet.insert_bitmap('/home/www/proj/static/logo.bmp', row=0, col=5, x=0, y=0, scale_x=0.3, scale_y=2) # drawing headers - header_list = [u'#', u'Название события',u'Даты',u'Краткое описание',u'Место проведения', u'Заметка', u'Ссылка на событие'] for i, column in enumerate(columns): sheet.write(8, i, header_list[i], header_style) sheet.col(i).width = 8000 diff --git a/core/views.py b/core/views.py index 1ad5be9a..125c1f1f 100644 --- a/core/views.py +++ b/core/views.py @@ -282,9 +282,9 @@ def download_workbook(request): setattr(obj, 'dates', u'%s - %s'%(obj.data_begin.strftime('%d %B %Y'),obj.data_end.strftime('%d %B %Y'))) setattr(obj, 'full_place', u'%s, %s, %s' % (obj.country, obj.city, getattr(obj.place, 'name', ''))) try: - setattr(obj, 'link', u'http://www.expomap.ru%s)'%obj.get_absolute_url()) + setattr(obj, 'link', u'http://www.expomap.ru%s'%obj.get_absolute_url()) except: - setattr(obj, 'link', u'http://www.expomap.ru%s)'%obj.get_permanent_url()) + setattr(obj, 'link', u'http://www.expomap.ru%s'%obj.get_permanent_url()) columns = ( 'number', diff --git a/expobanner/admin.py b/expobanner/admin.py index 7d1bf1b1..4c053c53 100644 --- a/expobanner/admin.py +++ b/expobanner/admin.py @@ -117,10 +117,10 @@ class BannerStat(DetailView): date_from, date_to = self.request.GET.get('date_from'), self.request.GET.get('date_to') if date_from: date_from = datetime.strptime(date_from, "%d.%m.%Y") - qs = qs.filter(date__gt=date_from) + qs = qs.filter(date__gte=date_from) if date_to: date_to = datetime.strptime(date_to, "%d.%m.%Y") - qs = qs.filter(date__lt=date_to) + qs = qs.filter(date__lte=date_to) context['stats'] = qs return context @@ -195,10 +195,10 @@ class PaidStat(DetailView): date_from, date_to = self.request.GET.get('date_from'), self.request.GET.get('date_to') if date_from: date_from = datetime.strptime(date_from, "%d.%m.%Y") - qs = qs.filter(date__gt=date_from) + qs = qs.filter(date__gte=date_from) if date_to: date_to = datetime.strptime(date_to, "%d.%m.%Y") - qs = qs.filter(date__lt=date_to) + qs = qs.filter(date__lte=date_to) context['stats'] = qs return context @@ -264,10 +264,10 @@ class MainStat(DetailView): date_from, date_to = self.request.GET.get('date_from'), self.request.GET.get('date_to') if date_from: date_from = datetime.strptime(date_from, "%d.%m.%Y") - qs = qs.filter(date__gt=date_from) + qs = qs.filter(date__gte=date_from) if date_to: date_to = datetime.strptime(date_to, "%d.%m.%Y") - qs = qs.filter(date__lt=date_to) + qs = qs.filter(date__lte=date_to) context['stats'] = qs return context diff --git a/functions/custom_views.py b/functions/custom_views.py index 781626cc..01e0ac25 100644 --- a/functions/custom_views.py +++ b/functions/custom_views.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from django.shortcuts import render_to_response -from django.http import HttpResponseRedirect, HttpResponse +from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.core.context_processors import csrf from django.conf import settings from django.contrib.auth.decorators import login_required @@ -20,8 +20,11 @@ import random from django.views.generic import ListView as OldListView + class ListView(OldListView): """ + Default Django generic ListView with few overrided methods for redirecting + onto first page of pagination in case of entering big page number(for search engines) List of modules, where overrided ListView is used: - accounts.views - article.views @@ -34,7 +37,37 @@ class ListView(OldListView): - specialist_catalog.views - translator.views """ - paginator_class = settings.DEFAULT_PAGINATOR + def paginate_queryset(self, queryset, page_size): + """ + Paginate the queryset, if needed. + """ + paginator = self.get_paginator(queryset, page_size, allow_empty_first_page=self.get_allow_empty()) + page_kwarg = self.page_kwarg + page = self.kwargs.get(page_kwarg) or self.request.GET.get(page_kwarg) or 1 + try: + page_number = int(page) + except ValueError: + if page == 'last': + page_number = paginator.num_pages + else: + raise Http404(_("Page is not 'last', nor can it be converted to an int.")) + try: + page = paginator.page(page_number) + self.kwargs['home'] = False + + except EmptyPage as e: + page = paginator.page(1) + self.kwargs['home'] = True + return (paginator, page, page.object_list, page.has_other_pages()) + + def get(self, request, *args, **kwargs): + response = super(ListView, self).get(request, *args, **kwargs) + if self.kwargs.get("home"): + path = self.request.path + return HttpResponseRedirect(path[:path.find('page')]) + else: + return response + @login_required def filtered_list(request, objects, template, item_per_page=settings.ADMIN_PAGINATION): diff --git a/proj/admin.py b/proj/admin.py index 39bccbc2..7c8afd82 100644 --- a/proj/admin.py +++ b/proj/admin.py @@ -3,7 +3,7 @@ from django.shortcuts import render_to_response from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.contrib.contenttypes.models import ContentType from django.conf import settings -from django.views.generic import TemplateView +from django.views.generic import TemplateView, DeleteView from file.models import TmpFile, FileModel from file.forms import FileModelForm, FileForm from city.models import City @@ -13,6 +13,10 @@ from django.db.models.loading import get_model + + + + class AdminIndex(TemplateView): template_name = 'admin/base.html' diff --git a/templates/admin/article/article_confirm_delete.html b/templates/admin/article/article_confirm_delete.html new file mode 100644 index 00000000..ac15985c --- /dev/null +++ b/templates/admin/article/article_confirm_delete.html @@ -0,0 +1,11 @@ +{% extends 'base.html' %} +{% block sidebar %}{% endblock %} +{% block body %} +
{% csrf_token %} +
+

Вы точно хотите удалить "{{ object }}" ?

+ + Нет +
+
+{% endblock %} \ No newline at end of file diff --git a/templates/client/accounts/calendar.html b/templates/client/accounts/calendar.html index d49542e5..6a1f8502 100644 --- a/templates/client/accounts/calendar.html +++ b/templates/client/accounts/calendar.html @@ -65,11 +65,11 @@ } console.log(clear_list); var query = $.param({data:clear_list}); - if(clear_list.Length > 0){ + if(clear_list.length > 0){ window.location.href = "/profile/calendar/export/?" + query; } else{ - alert({% trans "Не выбрано ни одного события!" %}) + alert('{% trans "Не выбрано ни одного события!" %}'); } }); diff --git a/templates/client/article/article.html b/templates/client/article/article.html index da51969d..71f5d860 100644 --- a/templates/client/article/article.html +++ b/templates/client/article/article.html @@ -19,7 +19,7 @@ {% include 'client/includes/article/article_logo.html' with obj=object %}

{{ object.main_title }}

- {{ object.publish_date|date:"d E Y" }}{{ object.author.get_full_name }} + {{ object.created|date:"d E Y" }}{% if object.theme.all.exists %}{% include 'includes/article_theme.html' with obj=object %}{% endif %} {% if request.user.is_admin %} {% trans 'изменить' %} {% endif %} @@ -30,18 +30,6 @@
- - - - - - -
{% trans 'Автор' %}:{% include 'includes/show_logo.html' with obj=object.author %} -

{{ object.author.get_full_name }}

- {% if object.author.profile.fb %} - - {% endif %} -
{% if object.tag.all.exists %}
{% include 'includes/article_tags.html' with obj=object %} diff --git a/templates/client/article/blog_list.html b/templates/client/article/blog_list.html index de840d8d..17c35b26 100644 --- a/templates/client/article/blog_list.html +++ b/templates/client/article/blog_list.html @@ -45,7 +45,8 @@ + {%endif %} + {% endfor %} + + + {% else %} +

+ + {% trans "Выставки по указанным параметрам не найдены. Попробуйте задать менее точный запрос по теме или расширить период времени" %} + +

+ {% endif %} + +{% endwith %} + + + +{% block scripts %} +{% if request.GET.debug == '1' %} + +{% else %} + +{% endif %} +{% endblock %} \ No newline at end of file diff --git a/templates/client/includes/header.html b/templates/client/includes/header.html index be5848e3..88b10a58 100644 --- a/templates/client/includes/header.html +++ b/templates/client/includes/header.html @@ -5,7 +5,7 @@
diff --git a/templates/client/popups/login.html b/templates/client/popups/login.html index 12ff1fbf..000c6c8d 100644 --- a/templates/client/popups/login.html +++ b/templates/client/popups/login.html @@ -36,8 +36,6 @@
    • -
    • -
    • diff --git a/templates/client/popups/register.html b/templates/client/popups/register.html index 6e4e5204..333ca6b5 100644 --- a/templates/client/popups/register.html +++ b/templates/client/popups/register.html @@ -56,8 +56,6 @@
      • -
      • -
      • diff --git a/templates/client/static_client/img/logo_beta.png b/templates/client/static_client/img/logo_beta.png index 51ee5cb8..ac47efaa 100644 Binary files a/templates/client/static_client/img/logo_beta.png and b/templates/client/static_client/img/logo_beta.png differ diff --git a/theme/views.py b/theme/views.py index 25ac1c0a..e5271db1 100644 --- a/theme/views.py +++ b/theme/views.py @@ -7,10 +7,11 @@ def get_tag(request): #if request.is_ajax(): themes = request.GET.getlist('themes[]') term = request.GET['term'].capitalize() - if not term: - qs = Tag.objects.language().filter(theme__id__in=themes).order_by('translations__name').distinct() - else: - qs = Tag.objects.language().filter(theme__id__in=themes, translations__name__contains=term).distinct() + qs = Tag.objects.language().exclude(theme__article__id=None).distinct() + if term: + qs = qs.filter(translations__name__contains=term) + if themes: + qs = qs.filter(theme__id__in=themes).order_by('translations__name') result = [{'id': tag.id, 'label': '%s (%s)'%(tag.name, tag.theme.name)} for tag in qs] result = sorted(result, key=lambda x:x['label'])