1621 upd, 1620 done

functions/views_help.py

@@ -2,6 +2,7 @@
 import re
 import datetime
 import json
+from ConfigParser import ConfigParser
 
 from django.shortcuts import get_object_or_404
 from django.core.cache import cache
@@ -70,7 +71,8 @@ def get_side_items(event_type, model):
     data = cache.get(key)
     if data is None:
         data = []
-        config = settings.INI_CONFIG
+        config = ConfigParser()
+        config.read(settings.INI_CONFIG_PATH)
         pks = json.loads(config.get('sections', option, '[]'))
         if pks:
             qs = model.objects.language().filter(pk__in=pks).values_list('pk', 'name', 'url')

support/d_dev/settings.py

@@ -3,6 +3,7 @@
 import os
 import django
 from django.utils.translation import ugettext_lazy as _
+from ConfigParser import ConfigParser
 
 
 DJANGO_ROOT = os.path.dirname(os.path.realpath(django.__file__))
@@ -506,6 +507,14 @@ CACHE_RANGE = [60, 120]
 
 DEFAULT_POPUP_COOKIE = 'expo_b_default_popup'
 
+INI_CONFIG_PATH = os.path.join(SITE_ROOT, 'proj/config.ini')
+INI_CONFIG = ConfigParser()
+INI_CONFIG.read(INI_CONFIG_PATH)
+C_CITY_CATALOG_KEY = 'conf_city_catalog'
+C_COUNTRY_CATALOG_KEY = 'conf_country_catalog'
+E_CITY_CATALOG_KEY = 'expo_city_catalog'
+E_COUNTRY_CATALOG_KEY = 'expo_country_catalog'
+
 try:
     from local import *
 except ImportError, e:

support/dev/settings.py

@@ -3,6 +3,7 @@
 import os
 import django
 from django.utils.translation import ugettext_lazy as _
+from ConfigParser import ConfigParser
 
 
 DJANGO_ROOT = os.path.dirname(os.path.realpath(django.__file__))
@@ -504,6 +505,14 @@ CACHE_RANGE = [60, 120]
 
 DEFAULT_POPUP_COOKIE = 'expo_b_default_popup'
 
+INI_CONFIG_PATH = os.path.join(SITE_ROOT, 'proj/config.ini')
+INI_CONFIG = ConfigParser()
+INI_CONFIG.read(INI_CONFIG_PATH)
+C_CITY_CATALOG_KEY = 'conf_city_catalog'
+C_COUNTRY_CATALOG_KEY = 'conf_country_catalog'
+E_CITY_CATALOG_KEY = 'expo_city_catalog'
+E_COUNTRY_CATALOG_KEY = 'expo_country_catalog'
+
 try:
     from local import *
 except ImportError, e:

support/prod/settings.py

@@ -3,6 +3,7 @@
 import os
 import django
 from django.utils.translation import ugettext_lazy as _
+from ConfigParser import ConfigParser
 
 
 DJANGO_ROOT = os.path.dirname(os.path.realpath(django.__file__))
@@ -503,6 +504,14 @@ CACHE_RANGE = [60, 120]
 
 DEFAULT_POPUP_COOKIE = 'expo_b_default_popup'
 
+INI_CONFIG_PATH = os.path.join(SITE_ROOT, 'proj/config.ini')
+INI_CONFIG = ConfigParser()
+INI_CONFIG.read(INI_CONFIG_PATH)
+C_CITY_CATALOG_KEY = 'conf_city_catalog'
+C_COUNTRY_CATALOG_KEY = 'conf_country_catalog'
+E_CITY_CATALOG_KEY = 'expo_city_catalog'
+E_COUNTRY_CATALOG_KEY = 'expo_country_catalog'
+
 try:
     from local import *
 except ImportError, e:

templates/client/includes/exposition/exposition_list.html

@@ -111,7 +111,9 @@
     </footer>
   </li>
 
-    {% if forloop.counter == 5 or objects|length < 5 %}
+    {% if forloop.counter == 5 %}
+      {% include 'client/includes/banners/catalog_inner_2.html' %}
+    {% elif forloop.last and objects|length < 5 %}
       {% include 'client/includes/banners/catalog_inner_2.html' %}
     {% endif %}