Pgtologue bug

photologue/models.py

@@ -32,17 +32,18 @@ from django.contrib.sites.models import Site
 
 # Required PIL classes may or may not be available from the root namespace
 # depending on the installation method used.
-try:
-    import Image
-    import ImageFile
-    import ImageFilter
-    import ImageEnhance
-except ImportError:
 try:
     from PIL import Image
     from PIL import ImageFile
     from PIL import ImageFilter
     from PIL import ImageEnhance
+
+except ImportError:
+    try:
+        import Image
+        import ImageFile
+        import ImageFilter
+        import ImageEnhance
     except ImportError:
         raise ImportError(
             'Photologue was unable to import the Python Imaging Library. Please confirm it`s installed and available on your current Python path.')

templates/client/includes/event_steps.html

@@ -6,7 +6,7 @@
             <li class="s1">
 				<div class="label">{% if event.catalog == '/expo/' %}{% trans 'Создайте уникальную концепцию' %}{% else %}{% trans 'Зарегистрируйтесь на событие' %}{% endif %}</div>
 			    <a class="step"
-                   href="{% if event.registration_link %}{{ registration_link }}{% else %}{{ event.get_permanent_url }}service/tickets/{% endif %}"
+                   href="{% if event.registration_link %}{{ registration_link }}{% else %}{{ event.get_permanent_url }}service/participation/{% endif %}"
                    target="_blank">
                     {% if event.catalog == '/expo/' %}{% trans 'Заявка на участие' %}{% else %}{% trans 'Регистрация' %}{% endif %}
                 </a>

templates/client/includes/news.html

@@ -14,7 +14,7 @@
                     </span>
                     <span class="nl-body">
                         <span class="nl-text">{{ item.main_title }}</span>
-                        <span class="nl-date">{{ item.created|date:"d E Y" }}</span>
+                        <span class="nl-date">{{ item.publish_date|date:"d E Y" }}</span>
                     </span>
                 </a>
             </li>

templates/client/includes/place/place_object.html

@@ -244,7 +244,7 @@
 									{% endwith %}
 								</div>
 								<div class="cli-place">
-									<a href="{{ event.country.get_permanent_url }}">{{ event.country }}</a>, <a href="{{ event.city.get_permanent_url }}">{{ event.city }}</a>
+									<a href="{{ event.catalog }}country/{{ event.country.url }}/">{{ event.country }}</a>, <a href="{{ event.catalog }}city/{{ event.city.url }}/">{{ event.city }}</a>
 								</div>
 							</div>
 							</div>
@@ -315,7 +315,7 @@
 							<div class="cli-dim">{{ pl.total_area }}</div>
 							{% endif %}
 							<div class="cli-place">
-								<a href="{{ pl.country.get_permanent_url }}">{{ pl.country }}</a>, <a href="{{ pl.city.get_permanent_url }}">{{ pl.city }}</a>,
+								<a href="/places/country/{{ pl.country.url }}/">{{ pl.country }}</a>, <a href="places/city/{{ pl.city.url }}/">{{ pl.city }}</a>,
 								<a href="{{ pl.get_permanent_url }}">{{ pl.adress }}</a>
 							</div>
 						</div>