mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small fixes from production

Browse Source
remotes/origin/1203
Nazarii Kotiuk 10 years ago
parent 4a78df6d8b
commit ce5b3633e6
9 changed files with 19 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      settings/templatetags/template_filters.py
  2. 8
      templates/admin/place_exposition/place_exposition.html
  3. 4
      templates/client/includes/company/company_list.html
  4. 4
      templates/client/includes/conference/conference_list.html
  5. 2
      templates/client/includes/exposition/expo_paid.html
  6. 4
      templates/client/includes/exposition/exposition_list.html
  7. 2
      templates/client/includes/exposition/exposition_object.html
  8. 4
      templates/client/includes/place/place_list.html
  9. 2
      templates/client/includes/place/place_object.html

4
settings/templatetags/template_filters.py
Unescape View File

@ -320,3 +320,7 @@ def get_theme_name(id):
return ''
else:
return theme.name
@register.filter
def coord_format(value):
return u'%s' % value

8
templates/admin/place_exposition/place_exposition.html
Unescape View File

@ -15,10 +15,10 @@
<script src="{% static 'ckeditor/ckeditor/ckeditor.js' %}"></script>
{# google map не забыть скачать скрипты на локал #}
<link href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/redmond/jquery-ui.css' rel="stylesheet"/>
<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js'></script>
<script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js'></script>
<script src='http://maps.google.com/maps/api/js?sensor=false'></script>
<link href='https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/redmond/jquery-ui.css' rel="stylesheet"/>
<script src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js'></script>
<script src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js'></script>
<script src='https://maps.google.com/maps/api/js?sensor=false'></script>
{# selects #}
<link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
<script src="{% static 'js/select/select2.js' %}"></script>

4
templates/client/includes/company/company_list.html
Unescape View File

@ -6,7 +6,7 @@
{% for company in object_list %}
<li class="cl-item">
<div class="cl-item-wrap clearfix">
<a href="{{ company.get_permanent_url }}">
<a target="_blank" href="{{ company.get_permanent_url }}">
<div class="cli-pict">
{% with obj=company %}
{% include 'client/includes/show_logo.html' %}
@ -16,7 +16,7 @@
<div class="cli-info">
<div class="cli-top clearfix">
<header>
<div class="cli-title"><a href="{{ company.get_permanent_url }}">{{ company.name|safe }}</a></div>
<div class="cli-title"><a target="_blank" href="{{ company.get_permanent_url }}">{{ company.name|safe }}</a></div>
</header>
<div class="cli-bot clearfix">
<div class="cli-area">

4
templates/client/includes/conference/conference_list.html
Unescape View File

@ -8,7 +8,7 @@
{% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}">
<div class="cl-item-wrap clearfix">
<a href="{{ obj.get_permanent_url }}">
<a target="_blank" href="{{ obj.get_permanent_url }}">
{% if obj.canceled %}
<div class="cancel"></div>
{% else %}
@ -40,7 +40,7 @@
</div>
{% endif %}
<header>
<div class="cli-title"><a href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
<div class="cli-title"><a target="_blank" href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
</header>
<div class="cli-descr">
{{ obj.main_title|safe }}

2
templates/client/includes/exposition/expo_paid.html
Unescape View File

@ -65,7 +65,7 @@
<div class="i-map">
<div class="close-map"><a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
</div>
<div class="map-canvas" id="map-canvas" data-coords="{{ exposition.place.address.lat|stringformat:'f' }},{{ exposition.place.address.lng|stringformat:'f' }}" ></div>
<div class="map-canvas" id="map-canvas" data-coords="{{ exposition.place.address.lat|coord_format }},{{ exposition.place.address.lng|coord_format }}" ></div>
</div>
</div>
{% endif %}

4
templates/client/includes/exposition/exposition_list.html
Unescape View File

@ -10,7 +10,7 @@
<li class="cl-item {% if obj.canceled %}canceled{% endif %}">
<div class="cl-item-wrap clearfix">
{% if not obj.canceled %}
<a href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">
<a target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">
{% if obj.expohit %}
<div class="hit"></div>
{% endif %}
@ -48,7 +48,7 @@
{% endif %}
<header>
<div class="cli-title"><a href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">{{ obj.name|safe }}</a></div>
<div class="cli-title"><a target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">{{ obj.name|safe }}</a></div>
</header>
<div class="cli-descr">
{{ obj.main_title|safe }}

2
templates/client/includes/exposition/exposition_object.html
Unescape View File

@ -62,7 +62,7 @@
<div class="i-map">
<div class="close-map"><a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
</div>
<div class="map-canvas" id="map-canvas" data-coords="{{ exposition.place.address.lat|stringformat:'f' }},{{ exposition.place.address.lng|stringformat:'f' }}" ></div>
<div class="map-canvas" id="map-canvas" data-coords="{{ exposition.place.address.lat|coord_format }},{{ exposition.place.address.lng|coord_format }}" ></div>
</div>
</div>
{% else %}

4
templates/client/includes/place/place_list.html
Unescape View File

@ -6,7 +6,7 @@
{% for object in object_list %}
<li class="cl-item" {% if forloop.counter == 1 %}style="border:1px solid #ff6600;"{% else %}{% endif %}>
<div class="cl-item-wrap clearfix">
<a href="{{ object.get_permanent_url }}">
<a target="_blank" href="{{ object.get_permanent_url }}">
<div class="cli-pict">
{% with obj=object %}
{% include 'client/includes/show_logo.html' %}
@ -17,7 +17,7 @@
<div class="cli-top clearfix">
<header>
<div class="cli-title"><a href="{{ object.get_permanent_url }}">{{ object.name|safe }}</a></div>
<div class="cli-title"><a target="_blank" href="{{ object.get_permanent_url }}">{{ object.name|safe }}</a></div>
<!--<div class="cli-rate">{{ object.rating }}</div>-->
</header>

2
templates/client/includes/place/place_object.html
Unescape View File

@ -32,7 +32,7 @@
<div class="i-map ">
<div class="close-map"><a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a></div>
<!-- позиция для карты задается в атрибуте data-coords -->
<div class="map-canvas" id="map-canvas" data-coords="{{ place.address.lat|stringformat:'f' }},{{ place.address.lng|stringformat:'f' }}" ></div>
<div class="map-canvas" id="map-canvas" data-coords="{{ place.address.lat|coord_format }},{{ place.address.lng|coord_format }}" ></div>
</div>
</div>
{% else %}

Write Preview
Loading…
Cancel
Save