From 82c9ef87f5625c5999f165d2eff8e4f8f92f71c8 Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Tue, 21 Apr 2015 13:33:55 +0000
Subject: [PATCH] EXPO-25 includes/conference/conference_list.html

---
 .../includes/conference/conference_list.html  | 221 ++++++++----------
 1 file changed, 103 insertions(+), 118 deletions(-)

diff --git a/templates/client/includes/conference/conference_list.html b/templates/client/includes/conference/conference_list.html
index fc6388bd..459032f2 100644
--- a/templates/client/includes/conference/conference_list.html
+++ b/templates/client/includes/conference/conference_list.html
@@ -1,129 +1,114 @@
 {% load static %}
 {% load i18n %}
 {% load template_filters %}
-
 <ul class="cat-list cl-exhibitions">
-    {% with objects=object_list %}
-    {% 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 }}">
-                {% if obj.canceled %}
-                    <div class="cancel"></div>
-                {% else %}
-                    {% if obj.expohit %}
-                        <div class="hit"></div>
-                    {% endif %}
-                {% endif %}
+	{% with objects=object_list %}
+	{% 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 }}">
+				{% if obj.canceled %}
+					<div class="cancel"></div>
+				{% else %}
+					{% if obj.expohit %}
+						<div class="hit"></div>
+					{% endif %}
+				{% endif %}
 				<div class="cli-pict">
-                {% with obj=obj  %}
-                    {% include 'client/includes/show_logo.html' %}
-                {% endwith %}
-                </div>
+				{% with obj=obj  %}
+					{% include 'client/includes/show_logo.html' %}
+				{% endwith %}
+				</div>
 			</a>
-
-
-            <div class="cli-info">
-                <div class="cli-top clearfix">
-
-
-                    {% if obj.quality_label.ufi.is_set %}
-                    <div class="cli-approved">
-                        <img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
-                    </div>
-                    {% endif %}
-
-
-                    <header>
-                        <div class="cli-title"><a href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
-                    </header>
-                    <div class="cli-descr">
-                        {{ obj.main_title|safe }}
-                    </div>
-                </div>
-
-                <div class="cli-bot clearfix">
-
-                    <div class="cli-date">
-                    {% with obj=obj  %}
-                        {% include 'client/includes/show_date_block.html' %}
-                    {% endwith %}
-                    </div>
-
-                    {% if obj.country %}
-                    <div class="cli-place">
-                        <a href="{{ obj.catalog }}country/{{ obj.country.url }}/">{{ obj.country }}</a>, <a href="{{ obj.catalog }}city/{{ obj.city.url }}/">{{ obj.city }}</a>
-
-                        {% if obj.place %}
-                            , <a href="/places/{{ obj.place.url }}/">{{ obj.place }}</a>
-                        {% endif %}
-                    </div>
-                    {% endif %}
-                </div>
-            </div>
-
-
-            <div class="cli-buttons clearfix">
-                <div class="cli-m-buttons">
-                    {% include 'client/includes/exposition/services.html' with obj=obj %}
-
-                    {% include 'client/includes/calendar_button.html'  with obj=obj%}
-                    <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-                        {% with note=obj|note_by_user:request.user %}
-					    <a class="button green icon-note {% if note %}active{% endif %} note-button" href="/conference/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
-                        <div class="note-overlay">
-                            <form action="">
-                                <textarea name="note_text" class="note-text"> {{ note }}</textarea>
-                            </form>
-                        </div>
-                        {% endwith %}
-                    </div>
-                    {% if request.user.is_admin %}
-                        <div class="note-wrap">
-                            <a class="button green " href="/admin/conference/{{ obj.url }}/">{% trans 'изменить' %}</a>
-                        </div>
-                    {% endif %}
-                    <div></div>
-
-                </div>
-
-                <div class="cli-s-buttons">
-                    {% include 'client/buttons/booking_button.html' with object=obj %}
-                </div>
-            </div>
-        </div>
-
-        <footer class="clearfix">
-            <div class="cli-stats">
-                {% if obj.visitors %}
-                    <span class="visitors" title="Посетители">{{ obj.visitors }}</span>
-                {% endif %}
-                {% if obj.members %}
-                    <span class="participants" title="Участники">{{ obj.members }}</span>
-                {% endif %}
-            </div>
-            <div class="cli-tags">
-                {% include 'client/includes/exposition/tags.html' with obj=obj %}
-            </div>
-        </footer>
-    </li>
-
-    {% endfor %}
-    {% endwith %}
+			<div class="cli-info">
+				<div class="cli-top clearfix">
+					{% if obj.quality_label.ufi.is_set %}
+					<div class="cli-approved">
+						<img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
+					</div>
+					{% endif %}
+					<header>
+						<div class="cli-title"><a href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
+					</header>
+					<div class="cli-descr">
+						{{ obj.main_title|safe }}
+					</div>
+				</div>
+				<div class="cli-bot clearfix">
+					<div class="cli-date">
+					{% with obj=obj  %}
+						{% include 'client/includes/show_date_block.html' %}
+					{% endwith %}
+					</div>
+					{% if obj.country %}
+					<div class="cli-place">
+						<a href="{{ obj.catalog }}country/{{ obj.country.url }}/">{{ obj.country }}</a>, <a href="{{ obj.catalog }}city/{{ obj.city.url }}/">{{ obj.city }}</a>
+						{% if obj.place %}
+							, <a href="/places/{{ obj.place.url }}/">{{ obj.place }}</a>
+						{% endif %}
+					</div>
+					{% endif %}
+				</div>
+			</div>
+			<div class="cli-buttons clearfix">
+				<div class="cli-m-buttons">
+					{% include 'client/includes/exposition/services.html' with obj=obj %}
+					{% include 'client/includes/calendar_button.html'  with obj=obj%}
+					<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
+						{% with note=obj|note_by_user:request.user %}
+						<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/conference/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
+						<div class="note-overlay">
+							<form action="">
+								<textarea name="note_text" class="note-text"> {{ note }}</textarea>
+							</form>
+						</div>
+						{% endwith %}
+					</div>
+					{% if request.user.is_admin %}
+						<div class="note-wrap">
+							<a class="button green " href="/admin/conference/{{ obj.url }}/">{% trans 'изменить' %}</a>
+						</div>
+					{% endif %}
+					<div></div>
+				</div>
+				<div class="cli-s-buttons">
+					{% include 'client/buttons/booking_button.html' with object=obj %}
+				</div>
+			</div>
+		</div>
+		<footer class="clearfix">
+			<div class="cli-stats">
+				{% if obj.visitors %}
+					<span class="visitors" title="Посетители">{{ obj.visitors }}</span>
+				{% endif %}
+				{% if obj.members %}
+					<span class="participants" title="Участники">{{ obj.members }}</span>
+				{% endif %}
+			</div>
+			<div class="cli-tags">
+				{% include 'client/includes/exposition/tags.html' with obj=obj %}
+			</div>
+		</footer>
+	</li>
+	{% endfor %}
+	{% endwith %}
 </ul>
 {% block scripts %}
-<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.exposition.list{% if debug %}{% else %}.min{% endif %}.js"></script>
+{% if request.GET.debug == '1' %}
+<script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script>
+{% else %}
+<script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
+{% endif %}
 <script>
-    EXPO.exposition.list.init({
-        note:{
-            wrapClass:'note-wrap',
-            wrapDisabledClass:'note-wrap-disabled',
-            buttonClass:'note-button',
-            inputClass:'note-text'
-        },
-        addCalendarText:"{% trans 'В расписание' %}",
-        removeCalendarText:"{% trans 'Из расписания' %}"
-    });
+	EXPO.exposition.list.init({
+		note:{
+			wrapClass:'note-wrap',
+			wrapDisabledClass:'note-wrap-disabled',
+			buttonClass:'note-button',
+			inputClass:'note-text'
+		},
+		addCalendarText:"{% trans 'В расписание' %}",
+		removeCalendarText:"{% trans 'Из расписания' %}"
+	});
 </script>
 {% endblock %}
\ No newline at end of file