Fast commitn

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()
-'''

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
 
 
@@ -117,3 +118,24 @@ class BlogsSiteMap(Abstract):
 
     def location(self, obj):
         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/']

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(), \
+    'expo_card': ExpoCard(), 'news': NewsSiteMap(), 'blogs': BlogsSiteMap(), 'expo_city': ExpoCity(), \
-    'conference': ConfCard(), 'expo_tag': ExpoTag(), 'conference_city': ConfCity(), 'conference_country': ConfCountry(),\
+    'expo_country': ExpoCountry(), 'expo_theme': ExpoTheme(), \
-    'conference_theme': ConfTheme(), 'conference_tag': ConfTag()
+    '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'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
-    url(r'^robot\.txt$', Robot.as_view()),
+    url(r'^sitemap\.xml$', views.index, {'sitemaps': sitemaps}),
+    url(r'^sitemap-(?P<section>.+)\.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')),

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<some>.*)/(?P<event>.*)/buildstand.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/buildstand/'}),
+    url(r'^content.php/coID/(?P<some>.*)/perevodchiki-(?P<some1>.*)/$', old_redirect, {'redirect_url': '/service/translator/'}),
+    url(r'^content.php/coID/(?P<some>.*)/perevodchiki-(?P<some1>.*)$', old_redirect, {'redirect_url': '/service/translator/'}),
+
+    url(r'^(?P<some>.*)/(?P<event>.*)/buildstand.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}),
     url(r'^(?P<some>.*)/(?P<event>.*)/bilet.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/tickets/'}),
     url(r'^(?P<some>.*)/(?P<event>.*)/zaoch.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/remote/'}),
     url(r'^(?P<some>.*)/(?P<event>.*)/translator.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/translator/'}),
     url(r'^(?P<some>.*)/(?P<event>.*)/visit.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/visit/'}),
     url(r'^(?P<some>.*)/(?P<event>.*)/uchastie.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}),
+    url(r'^(?P<some>.*)/(?P<event>.*)/ad.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}),
+    url(r'^(?P<some>.*)/(?P<event>.*)/mobilestand.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}),
+
     # company
     url(r'^company/(?P<company>.*)$', old_redirect, {'redirect_url': '/members/{company}/'}),
     # articles and news

templates/client/base_catalog.html

@@ -23,7 +23,7 @@
                         <div class="sbnr">
                             <div class="sbnr-wrap">
                                 <a href="/redirect/redirect/11/">
-                                    <img src="{% static 'client/img/partners/imgo.jpg' %}" alt="" />
+                                    <img src="{% static 'client/img/partners/ipsa_.gif' %}" alt="" />
                                 </a>
                             </div>
                         </div>
@@ -36,14 +36,18 @@
                     {% include 'client/includes/announces.html' %}
 
                     {% block asside_banner2 %}
-                    {% comment %}
+
                     <!-- task EXPO-145-->
+                        {% comment %}
                         <div class="sbnr">
                             <div class="sbnr-wrap">
-                                <a href="#"><img src="{% static 'client/img/_del-temp/bnrs.jpg' %}" alt="" /></a>
+                                <a href="/redirect/redirect/11/">
+                                    <img src="{% static 'client/img/partners/imgo.jpg' %}" alt="" />
+                                </a>
                             </div>
                         </div>
-                    {% endcomment %}
+                        {% endcomment %}
+
 
                 {% endblock %}
                     {% include 'client/includes/side_confs.html' %}

templates/client/blank.html

@@ -73,6 +73,42 @@ This template include basic anf main styles and js files,
 			socialInputMask:['http://','https://']
 		});
 	</script>
+    <!-- Yandex.Metrika counter -->
+	<script type="text/javascript">
+		(function (d, w, c) {
+			(w[c] = w[c] || []).push(function() {
+				try {
+					w.yaCounter21606697 = new Ya.Metrika(
+							{id:21606697, webvisor:true, clickmap:true, trackLinks:true, accurateTrackBounce:true}
+					);
+				} catch(e) { }
+			});
+			var n = d.getElementsByTagName("script")[0],
+					s = d.createElement("script"),
+					f = function ()
+					{ n.parentNode.insertBefore(s, n); }
+					;
+			s.type = "text/javascript";
+			s.async = true;
+			s.src = (d.location.protocol == "https:" ? "https:" : "http:") + "//mc.yandex.ru/metrika/watch.js";
+			if (w.opera == "[object Opera]")
+			{ d.addEventListener("DOMContentLoaded", f, false); }
+			else
+			{ f(); }
+		})(document, window, "yandex_metrika_callbacks");
+	</script>
+	<noscript><div><img src="//mc.yandex.ru/watch/21606697" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
+	<!-- /Yandex.Metrika counter -->
+	<script>
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function()
+				{ (i[r].q=i[r].q||[]).push(arguments)}
+				,i[r].l=1*new Date();a=s.createElement(o),
+				m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-3151423-1', 'auto');
+		ga('send', 'pageview');
+	</script>
+
 	</head>
 <body {% block body_class %}{% endblock %}>
 <!--[if lt IE 8]>

templates/client/includes/accounts/simple_user.html

@@ -26,17 +26,18 @@
                     <div class="i-title">{{ member.get_full_name }}</div>
                 </header>
 
-                <div class="i-position">{{ member.profile.position }}
+                <div class="i-position">{{ member.position }}
                 {% if member.company %}
                     в <a href="{{ member.company.get_permanent_url }}">“{{ member.company }}”</a>
                 {% else %}
                     {{ member.profile.work }}
                 {% endif %}
                 </div>
-
+                {% comment %}
                 <div class="i-descr">
                     {{ member.profile.about_company|safe }}
                 </div>
+                {% endcomment %}
 
                 <hr />
 

templates/client/includes/company/company_object.html

@@ -213,7 +213,7 @@
             {% endfor %}
             </ul>
             {% if company.get_events %}
-            <a class="button more" href="/expositions/member-{{ company.url }}">{% trans 'Все события' %}</a>
+            <a class="button more" href="/expo/members/{{ company.url }}">{% trans 'Все события' %}</a>
             {% endif %}
         </div>
 		{% if company.get_expositions_number > 0 or company.get_conferences_number > 0 or company.get_seminars_number > 0 %}
@@ -221,7 +221,7 @@
 		{% endif %}
 		{% if company.users.all|length > 0 %}
 			<div class="i-staff">
-				<div class="sect-title"><a href="#">{% trans 'Сотрудники' %}</a></div>
+				<div class="sect-title">{% trans 'Сотрудники' %}</div>
 
 				<div class="i-staff-list">
 					<ul>
@@ -233,7 +233,7 @@
 								<div class="sl-pict">
 
 									{% if user.profile.avatar %}
-										{% thumbnail user.profile.avatar "100x100" crop="center" as im %}
+										{% thumbnail user.profile.avatar  "100x100" format="PNG"  as im %}
 											<img class="user-avatar" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
 										{% endthumbnail %}
 									{% else %}

templates/client/includes/exposition/price.html

@@ -151,7 +151,7 @@
 
                                 <div class="tp-btn-wrap">
                                     <div class="tp-btn">
-                                        <a class="button big orange b-more" href="#">{% trans 'Заказать билет' %}</a>
+                                        <a class="button big orange b-more" href="{{ exposition.get_permanent_url }}service/tickets/">{% trans 'Заказать билет' %}</a>
                                     </div>
 									{% if exposition.get_audience %}
                                     <div class="tp-categories">
@@ -216,7 +216,7 @@
                             <p class="mb-2em">{% trans 'Цены на площадь доступны по запросу' %}</p>
                         {% endif %}
 
-                        <a class="button big orange b-more" href="#">{% trans 'Заявка на участие' %}</a>
+                        <a class="button big orange b-more" href="{{ exposition.get_permanent_url }}service/participation/">{% trans 'Заявка на участие' %}</a>
 
                         {% if exposition.min_stand_size or exposition.registration_payment or exposition.application_deadline %}
                             <div class="epr-conditons">

templates/client/robots.txt

@@ -13,6 +13,9 @@ Disallow: /members/search/
 Disallow: /members/search/
 Disallow: /admin/
 Disallow: /theme/
+Disallow: /expo/add-note/
+Disallow: /exposition-add-calendar/
+Disallow: /exposition-visit/
 Disallow: /conference/search/
 Disallow: /conference/add-note/
 Disallow: /conference-add-calendar/
@@ -108,6 +111,9 @@ Disallow: /members/search/
 Disallow: /members/search/
 Disallow: /admin/
 Disallow: /theme/
+Disallow: /expo/add-note/
+Disallow: /exposition-add-calendar/
+Disallow: /exposition-visit/
 Disallow: /conference/search/
 Disallow: /conference/add-note/
 Disallow: /conference-add-calendar/
@@ -204,6 +210,9 @@ Disallow: /members/search/
 Disallow: /admin/
 Disallow: /theme/
 Disallow: /conference/search/
+Disallow: /expo/add-note/
+Disallow: /exposition-add-calendar/
+Disallow: /exposition-visit/
 Disallow: /conference/add-note/
 Disallow: /conference-add-calendar/
 Disallow: /conference-visit/

theme/manager.py

@@ -34,7 +34,7 @@ class ThemeActiveManager(TranslationManager):
             return cached_themes
         else:
             from exposition.models import Exposition
-            themes_id = [item['theme_id'] for item in Exposition.objects.values('theme').distinct()]
+            themes_id = [item['theme'] for item in Exposition.objects.values('theme').distinct()]
             themes = list(self.language().filter(id__in=themes_id))
             cache.set(key, themes, 300)
             return themes