Pgtologue bug

remotes/origin/1203
Kotiuk Nazarii 11 years ago
parent 692925fa83
commit c84aecfe48
  1. 17
      photologue/models.py
  2. 2
      templates/client/includes/event_steps.html
  3. 2
      templates/client/includes/news.html
  4. 4
      templates/client/includes/place/place_object.html

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

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

@ -14,7 +14,7 @@
</span> </span>
<span class="nl-body"> <span class="nl-body">
<span class="nl-text">{{ item.main_title }}</span> <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> </span>
</a> </a>
</li> </li>

@ -244,7 +244,7 @@
{% endwith %} {% endwith %}
</div> </div>
<div class="cli-place"> <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> </div>
</div> </div>
@ -315,7 +315,7 @@
<div class="cli-dim">{{ pl.total_area }}</div> <div class="cli-dim">{{ pl.total_area }}</div>
{% endif %} {% endif %}
<div class="cli-place"> <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> <a href="{{ pl.get_permanent_url }}">{{ pl.adress }}</a>
</div> </div>
</div> </div>

Loading…
Cancel
Save