From 29ac2c0b4b7caa17731c9f9330bdce5991c7b2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B0=D1=80=20=D0=9A=D0=BE=D1=82=D1=8E?= =?UTF-8?q?=D0=BA?= Date: Mon, 4 May 2015 14:00:50 +0300 Subject: [PATCH] Fast commitn --- exposition/management/commands/expo_old.py | 54 ++++++++++++++---- proj/sitemaps.py | 24 +++++++- proj/urls.py | 19 +++--- settings/old_urls.py | 8 ++- templates/client/base_catalog.html | 12 ++-- templates/client/blank.html | 36 ++++++++++++ .../client/includes/accounts/simple_user.html | 5 +- .../includes/company/company_object.html | 6 +- .../client/includes/exposition/price.html | 4 +- templates/client/{robot.txt => robots.txt} | 9 +++ .../static_client/img/partners/ipsa_.gif | Bin 0 -> 28182 bytes theme/manager.py | 2 +- 12 files changed, 147 insertions(+), 32 deletions(-) rename templates/client/{robot.txt => robots.txt} (96%) create mode 100644 templates/client/static_client/img/partners/ipsa_.gif diff --git a/exposition/management/commands/expo_old.py b/exposition/management/commands/expo_old.py index fef86a0b..fdf7135f 100644 --- a/exposition/management/commands/expo_old.py +++ b/exposition/management/commands/expo_old.py @@ -16,6 +16,7 @@ file_path = settings.MEDIA_ROOT + 'exposition/bad_expos.txt' import datetime from theme.models import Theme from conference.models import Conference +''' class Command(BaseCommand): def handle(self, *args, **options): db = MySQLdb.connect(host="localhost", @@ -75,9 +76,12 @@ class Command(BaseCommand): # continue # Theme.objects.get(id=item['categories_id']) #print(result) +''' +from haystack.query import SearchQuerySet +from django.db import IntegrityError +from django.utils import translation -''' class Command(BaseCommand): def handle(self, *args, **options): db = MySQLdb.connect(host="localhost", @@ -98,19 +102,52 @@ class Command(BaseCommand): LEFT JOIN `products_description` ON products.products_id=products_description.products_id WHERE `products_status` =1 AND `conference` =0 AND places_id >0 + ORDER BY products.products_id DESC """ + translation.activate('ru') + expos = list(Exposition.objects.language().filter(old_url='')) + find_expo = "SELECT products_name, url from products_description WHERE products_name = '%s'" + + for expo in expos: + cursor.execute(find_expo%expo.name) + result = cursor.fetchall() + if result: + expo.old_url = result[0]['url'] + expo.save() + print(expo) + + #cursor.execute(sql) + #result = cursor.fetchall() + + #names = [item['name'] for item in result] - cursor.execute(sql) - result = cursor.fetchall() - names = [item['name'] for item in result] #media = settings.MEDIA_ROOT.replace('media/', '') #counter = 0 #bad_cities = {} + bad_expos = [] + ''' for i, item in enumerate(result): + qs = SearchQuerySet().models(Exposition).filter(name_ru=item['name']) + if not item: + continue + if not qs.count()>0: + continue + expo =qs[0].object + + if not expo or expo.old_url: + continue + print(expo) + expo.old_url = item['old_url'] + try: + expo.save() + except IntegrityError: + continue + + """ print('number: %d, errors: %d'%(i, len(bad_expos))) name = item['name'] if Exposition.objects.filter(translations__name=name).exists(): @@ -160,10 +197,5 @@ class Command(BaseCommand): msg = u'%s|||%s|||%s'%(name, item['old_url'], str(e)) bad_expos.append(msg) continue - - print('saving file') - file = open(file_path, 'w') - for item in bad_expos: - file.write("%s\n" % item) - file.close() -''' \ No newline at end of file + """ + ''' diff --git a/proj/sitemaps.py b/proj/sitemaps.py index 9b4cd46e..265f4243 100644 --- a/proj/sitemaps.py +++ b/proj/sitemaps.py @@ -6,6 +6,7 @@ from city.models import City from country.models import Country from theme.models import Theme, Tag from article.models import Article +from django.core.urlresolvers import reverse from django.core.paginator import Paginator @@ -116,4 +117,25 @@ class BlogsSiteMap(Abstract): return Article.objects.blogs().filter(publish_date__isnull=False) def location(self, obj): - return "/blogs/%s/" % obj.slug \ No newline at end of file + return "/blogs/%s/" % obj.slug + + +class SimpleAbstract(Sitemap): + priority = 0.5 + + def location(self, item): + return item + + +class Important(SimpleAbstract): + priority = 1 + + def items(self): + return ['', '/expo/', '/conference/', '/conference/country/', '/conference/city/', '/conference/theme/', + '/expo/theme/', '/expo/country/', '/expo/city/'] + +class Additional(SimpleAbstract): + priority = 0.5 + + def items(self): + return ['/blogs/', '/news/', '/partners/', '/about/', '/advertising/', '/contacts/'] \ No newline at end of file diff --git a/proj/urls.py b/proj/urls.py index 808c691e..9cc974e2 100644 --- a/proj/urls.py +++ b/proj/urls.py @@ -3,11 +3,12 @@ from django.conf import settings from django.conf.urls import patterns, include, url from core.simple_index_view import AdvertisingView, AboutView from views import MainPageView +from django.contrib.sitemaps import views import debug_toolbar from django.views.generic.base import TemplateView class Robot(TemplateView): - template_name = 'robot.txt' + template_name = 'robots.txt' content_type = 'text/plain' @@ -15,19 +16,23 @@ from django.contrib.sitemaps import Sitemap from exposition.models import Exposition from sitemaps import ExpoCard, ExpoCity, ExpoCountry, ExpoTheme, ExpoTag, ConfCard, ConfCity, ConfCountry, ConfTheme,\ - ConfTag, NewsSiteMap, BlogsSiteMap + ConfTag, NewsSiteMap, BlogsSiteMap, Additional, Important + sitemaps = { - 'expo': ExpoCard(), 'news': NewsSiteMap(), 'blogs': BlogsSiteMap(),#'expo_city': ExpoCity(), 'expo_country': ExpoCountry(), 'expo_theme': ExpoTheme(), \ - 'conference': ConfCard(), 'expo_tag': ExpoTag(), 'conference_city': ConfCity(), 'conference_country': ConfCountry(),\ - 'conference_theme': ConfTheme(), 'conference_tag': ConfTag() + 'expo_card': ExpoCard(), 'news': NewsSiteMap(), 'blogs': BlogsSiteMap(), 'expo_city': ExpoCity(), \ + 'expo_country': ExpoCountry(), 'expo_theme': ExpoTheme(), \ + 'conference_card': ConfCard(), 'expo_tag': ExpoTag(), 'conference_city': ConfCity(), 'conference_country': ConfCountry(),\ + 'conference_theme': ConfTheme(), 'conference_tag': ConfTag(), 'main': Important(), 'additional': Additional() } urlpatterns = patterns('', #url(r'^__debug__/', include(debug_toolbar.urls)), url(r'^admin/', include('proj.admin_urls')), - url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}), - url(r'^robot\.txt$', Robot.as_view()), + #url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}), + url(r'^sitemap\.xml$', views.index, {'sitemaps': sitemaps}), + url(r'^sitemap-(?P
.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}), + url(r'^robots.txt$', Robot.as_view()), url(r'^$', MainPageView.as_view()), url(r'^theme/', include('theme.urls')), url(r'^places/', include('place_exposition.urls')), diff --git a/settings/old_urls.py b/settings/old_urls.py index dcbbec2c..e56d8806 100644 --- a/settings/old_urls.py +++ b/settings/old_urls.py @@ -14,12 +14,18 @@ urlpatterns = patterns('', url(r'^serv-visit-info.php$', old_redirect, {'redirect_url': '/service/visit/'}), url(r'^serv-bilet-info.php$', old_redirect, {'redirect_url': '/service/tickets/'}), url(r'^serv-translator-info.php$', old_redirect, {'redirect_url': '/service/translator/'}), - url(r'^(?P.*)/(?P.*)/buildstand.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/buildstand/'}), + url(r'^content.php/coID/(?P.*)/perevodchiki-(?P.*)/$', old_redirect, {'redirect_url': '/service/translator/'}), + url(r'^content.php/coID/(?P.*)/perevodchiki-(?P.*)$', old_redirect, {'redirect_url': '/service/translator/'}), + + url(r'^(?P.*)/(?P.*)/buildstand.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}), url(r'^(?P.*)/(?P.*)/bilet.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/tickets/'}), url(r'^(?P.*)/(?P.*)/zaoch.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/remote/'}), url(r'^(?P.*)/(?P.*)/translator.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/translator/'}), url(r'^(?P.*)/(?P.*)/visit.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/visit/'}), url(r'^(?P.*)/(?P.*)/uchastie.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}), + url(r'^(?P.*)/(?P.*)/ad.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}), + url(r'^(?P.*)/(?P.*)/mobilestand.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}), + # company url(r'^company/(?P.*)$', old_redirect, {'redirect_url': '/members/{company}/'}), # articles and news diff --git a/templates/client/base_catalog.html b/templates/client/base_catalog.html index 674a7eae..7ae7dab6 100644 --- a/templates/client/base_catalog.html +++ b/templates/client/base_catalog.html @@ -23,7 +23,7 @@
- +
@@ -36,14 +36,18 @@ {% include 'client/includes/announces.html' %} {% block asside_banner2 %} - {% comment %} + + {% comment %}
- + + +
- {% endcomment %} + {% endcomment %} + {% endblock %} {% include 'client/includes/side_confs.html' %} diff --git a/templates/client/blank.html b/templates/client/blank.html index 0f20138e..2755ecc6 100644 --- a/templates/client/blank.html +++ b/templates/client/blank.html @@ -73,6 +73,42 @@ This template include basic anf main styles and js files, socialInputMask:['http://','https://'] }); + + + + + +