From 61d3831739fd4b5f4b113e37117e439e6a4702ee Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Tue, 21 Apr 2015 09:50:40 +0000
Subject: [PATCH] EXPO-25 accounts/feed.html

---
 templates/client/accounts/feed.html | 300 +++++++++++++---------------
 1 file changed, 144 insertions(+), 156 deletions(-)

diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html
index 61de510a..7b22e691 100644
--- a/templates/client/accounts/feed.html
+++ b/templates/client/accounts/feed.html
@@ -2,83 +2,75 @@
 {% load i18n %}
 {% load static %}
 {% block bread_scrumbs %}
-    <div class="bread-crumbs">
-        <a href="/">{% trans 'Главная страница' %}</a>
-        <strong>{% trans 'Моя лента событий' %}</strong>
-    </div>
+	<div class="bread-crumbs">
+		<a href="/">{% trans 'Главная страница' %}</a>
+		<strong>{% trans 'Моя лента событий' %}</strong>
+	</div>
 {% endblock %}
-
-
 {% block page_title %}
-        <div class="page-title">
-           <h1>{% trans 'Моя лента событий' %}</h1>
-       </div>
+    <div class="page-title">
+       <h1>{% trans 'Моя лента событий' %}</h1>
+   </div>
 {% endblock %}
-
 {% block page_body %}
-    <div class="page-body clearfix events-feed-page">
-        <div class="events-filter-wrap" id="events-filter-wrap">
-            <a rel="nofollow" id="filter-show-button" class="button icon-eye " href="javascript:void(0);">Фильтрация ленты</a>
-
+	<div class="page-body clearfix events-feed-page">
+		<div class="events-filter-wrap" id="events-filter-wrap">
+			<a rel="nofollow" id="filter-show-button" class="button icon-eye " href="javascript:void(0);">Фильтрация ленты</a>
+			<div class="events-filter" id="events-filter">
+				<section class="col">
+					<h2><span id="filter-subject-label" data-default="Тематические фильтры не выбраны" data-selected="Тематика">Тематические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwSubj" id="filter-subj-modal-trigger">Изменить</a>):</h2>
+					<div class="events-filter-box c-select-box">
+						<div class="csb-selected-items " >
+							<div class="csb-selected  csb-subj-selected dna-template" id="filter-subject-tags">
+								<div class="csbs-text ">~~text~~</div>
+								<a class="csbs-del del-on-page" href="javascript:void(0);"  data-checkbox-id="~~id~~">x</a>
+							</div>
+
+						</div>
+					</div>
+				</section>
+				<section class="col ">
+					<h2 class="mt-0"><span id="filter-place-label" data-default="Географические фильтры не выбраны" data-selected="Место проведения">Географические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwPlace" id="filter-place-modal-trigger">Изменить</a>):</h2>
+
+					<div class="events-filter-box c-select-box">
+						<div class="csb-selected-items" >
+							<div class="csb-selected csb-subj-selected dna-template" id="filter-places-tags">
+								<div class="csbs-text ">~~text~~</div>
+								<a class="csbs-del del-on-page" href="javascript:void(0);" data-checkbox-id="~~id~~">x</a>
+							</div>
+
+						</div>
+					</div>
+				</section>
+				<button class="icon-check apply-filter button" type="submit" id="apply-filter-button">{% trans 'Применить' %}</button>
+			</div>
+			<form method="post" action="/profile/feed/" class="search_form" id="filter-block-form">{% csrf_token %}
+                <div class="modals">
+                    <div class="search-modal-overlay" id="filter-modal">
+                        <div class="search-modal-wrap fancybox-skin">
+                            <div class="search-modal-body">
+
+                                {% if search_form.th %}
+                                {% include 'client/popups/theme.html' with search_form=search_form filter="filter-" formId="filter-pwSubj" selectedItemTemplate="filter-subj-selected" autoCompleteId="filter-subj-complete-block" filterInputId="filter-subj-fliter-input" selectedItemsContainer="filter-csb-subj-selected-items" subjectTriggerWrapId="filter-subj-checks" exhibitionCheck="filter-exhibition-check" conferenceCheck="filter-conference-check" prefix="f-s-" submitText="Применить" %}
+                                {% endif %}
+
+                                {% if search_form.area %}
+                                {% include 'client/popups/place.html' with search_form=search_form filter="filter-" formId="filter-pwPlace" selectedItemTemplate="filter-csb-selected" autoCompleteId="filter-place-complete-block" filterInputId="filter-place-filter-input" selectedItemsContainer="filter-csb-selected-items" prefix="f-p-" submitText="Применить" %}
+                                {% endif %}
 
-            <div class="events-filter" id="events-filter">
-                <section class="col">
-                    <h2><span id="filter-subject-label" data-default="Тематические фильтры не выбраны" data-selected="Тематика">Тематические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwSubj" id="filter-subj-modal-trigger">Изменить</a>):</h2>
-                    <div class="events-filter-box c-select-box">
-                        <div class="csb-selected-items " >
-                            <div class="csb-selected  csb-subj-selected dna-template" id="filter-subject-tags">
-                                <div class="csbs-text ">~~text~~</div>
-                                <a class="csbs-del del-on-page" href="javascript:void(0);"  data-checkbox-id="~~id~~">x</a>
                             </div>
-
-                        </div>
-                    </div>
-                </section>
-                <section class="col ">
-                    <h2 class="mt-0"><span id="filter-place-label" data-default="Географические фильтры не выбраны" data-selected="Место проведения">Географические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwPlace" id="filter-place-modal-trigger">Изменить</a>):</h2>
-
-                    <div class="events-filter-box c-select-box">
-                        <div class="csb-selected-items" >
-                            <div class="csb-selected csb-subj-selected dna-template" id="filter-places-tags">
-                                <div class="csbs-text ">~~text~~</div>
-                                <a class="csbs-del del-on-page" href="javascript:void(0);" data-checkbox-id="~~id~~">x</a>
-                            </div>
-
-                        </div>
-                    </div>
-                </section>
-                <button class="icon-check apply-filter button" type="submit" id="apply-filter-button">{% trans 'Применить' %}</button>
-
-            </div>
-            <form method="post" action="/profile/feed/" class="search_form" id="filter-block-form">{% csrf_token %}
-            <div class="modals">
-                <div class="search-modal-overlay" id="filter-modal">
-                    <div class="search-modal-wrap fancybox-skin">
-                        <div class="search-modal-body">
-
-                            {% if search_form.th %}
-                            {% include 'client/popups/theme.html' with search_form=search_form filter="filter-" formId="filter-pwSubj" selectedItemTemplate="filter-subj-selected" autoCompleteId="filter-subj-complete-block" filterInputId="filter-subj-fliter-input" selectedItemsContainer="filter-csb-subj-selected-items" subjectTriggerWrapId="filter-subj-checks" exhibitionCheck="filter-exhibition-check" conferenceCheck="filter-conference-check" prefix="f-s-" submitText="Применить" %}
-                            {% endif %}
-
-                            {% if search_form.area %}
-                            {% include 'client/popups/place.html' with search_form=search_form filter="filter-" formId="filter-pwPlace" selectedItemTemplate="filter-csb-selected" autoCompleteId="filter-place-complete-block" filterInputId="filter-place-filter-input" selectedItemsContainer="filter-csb-selected-items" prefix="f-p-" submitText="Применить" %}
-                            {% endif %}
-
+                            <div class="a modal-close fancybox-close">&nbsp;</div>
                         </div>
-                        <div class="a modal-close fancybox-close">&nbsp;</div>
                     </div>
                 </div>
-
-            </div>
-
-            </form>
-        </div>
-        <div class="filter-hint-block" id="filter-hint-block">
-            <p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p>
-        </div>
-        {% if object_list %}
-        {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
-        {% else %}
+			</form>
+		</div>
+		<div class="filter-hint-block" id="filter-hint-block">
+			<p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p>
+		</div>
+		{% if object_list %}
+		{% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
+		{% else %}
 			<p class="message-not-found">
 				<span>
 					<i class="fa fa-exclamation-triangle"></i>
@@ -87,92 +79,88 @@
 					{% trans "Увы, событий, соответствующих выбранным фильтрам, нет в каталоге.<br> Попробуйте укрупнить параметры поиска" %}
 				</span>
 			</p>
-
-        {% endif %}
-
-        {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
-        <!--todo: вернуть минификацию-->
-        <!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.events.feed{% if debug %}{% else %}.min{% endif %}.js"></script>-->
-
-        <script src="{% static 'client/js/_modules/page.events.feed.js' %}"></script>
-        <!--<script src="{% static 'client/js/_modules/block.search.js' %}"></script>-->
-
-        <script>
-            EXPO.events.feed.init({
-                bodyId:'events-filter-wrap',
-                formId: 'filter-block-form',
-                activeClass:'active',
-                modalTriggerClass:'filter-modal-open',
-                searchData:'{{ filter_form.data_with_parents|safe }}',
-                closerText: "{% trans ' и еще _ позиции' %}",
-                closerTextSingle:"{% trans ' и еще _ позиция' %}",
-                applyButtonId:'apply-filter-button',
-                place: {
-                    id: 'filter-pwPlace',
-                    selectedItemTemplate: 'filter-csb-selected',
-                    ajaxUrl: 'http://{{ request.get_host }}/search-form/',
-                    autoCompleteUrl: 'http://{{ request.get_host }}/search-form/autocomplete/',
-                    getParentUrl: 'http://{{ request.get_host }}/search-form/get-parent/',
-                    autoCompleteId: 'filter-place-complete-block',
-                    filterInputId: 'filter-place-filter-input',
-                    modalTrigger: 'filter-place-modal-trigger',
-                    selectedItemsContainer: 'filter-csb-selected-items',
-                    clearAllButtonClass: 'modal-clear',
-                    applyBtnClass: 'modal-approve',
-                    tagsBoxId: 'filter-places-tags',
-                    deleteTagClass: 'csbs-del',
-                    bodyId: 'events-filter-wrap',
-
-                    prefix: 'f-p-',
-                    deleteId: 'place-tag-remove',
-                    labelId: 'filter-place-label'
-                },
-                subject: {
-                    id: 'filter-pwSubj',
-                    selectedItemTemplate: 'filter-subj-selected',
-                    autoCompleteId: 'filter-subj-complete-block',
-                    ajaxUrl: 'http://{{ request.get_host }}/search-form/',
-                    autoCompleteUrl: 'http://{{ request.get_host }}/search-form/autocomplete/',
-                    filterInputId: 'filter-subj-fliter-input',
-                    modalTrigger: 'fiter-subj-modal-trigger',
-                    getParentUrl: 'http://{{ request.get_host }}/search-form/get-parent/',
-                    selectedItemsContainer: 'filter-csb-subj-selected-items',
-                    subjectTriggerWrapId: 'filter-subj-checks',
-                    //switched by default
-                    defaultOn: ['f-s-exhibition-check', 'f-s-conference-check'],
-                    clearAllButtonClass: 'modal-clear',
-                    applyBtnClass: 'modal-approve',
-                    tagsBoxId: 'filter-subject-tags',
-                    deleteTagClass: 'csbs-del',
-                    bodyId: 'events-filter-wrap',
-                    prefix: 'f-s-',
-                    deleteId: 'subject-tag-remove',
-
-                    labelId: 'filter-subject-label'
-                },
-                modal:{
-                    id:'filter-modal',
-                    wrapClass:'search-modal-wrap',
-                    size:{
-                        'filter-pwSubj':{
-                            width:640,
-                            height:514
-                        },
-                        'filter-pwPlace':{
-                            width:640,
-                            height:460
-                        }
-                    }
-                },
-                filter: {
-                    wrapperId:'"events-filter-wrap"',
-                    bodyId:'events-filter',
-                    buttonId:'filter-show-button',
-                    hintId:'filter-hint-block'
-
-                }
-
-            });
-        </script>
-    </div>
+		{% endif %}
+		{% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
+		{% if request.GET.debug == '1' %}
+		    <script src="{% static 'client/js/_modules/page.events.feed.js' %}"></script>
+		{% else %}
+		    <script src="{% static 'client/js_min/_modules/page.events.feed.min.js' %}"></script>
+		{% endif %}
+		<script>
+			EXPO.events.feed.init({
+				bodyId:'events-filter-wrap',
+				formId: 'filter-block-form',
+				activeClass:'active',
+				modalTriggerClass:'filter-modal-open',
+				searchData:'{{ filter_form.data_with_parents|safe }}',
+				closerText: "{% trans ' и еще _ позиции' %}",
+				closerTextSingle:"{% trans ' и еще _ позиция' %}",
+				applyButtonId:'apply-filter-button',
+				place: {
+					id: 'filter-pwPlace',
+					selectedItemTemplate: 'filter-csb-selected',
+					ajaxUrl: 'http://{{ request.get_host }}/search-form/',
+					autoCompleteUrl: 'http://{{ request.get_host }}/search-form/autocomplete/',
+					getParentUrl: 'http://{{ request.get_host }}/search-form/get-parent/',
+					autoCompleteId: 'filter-place-complete-block',
+					filterInputId: 'filter-place-filter-input',
+					modalTrigger: 'filter-place-modal-trigger',
+					selectedItemsContainer: 'filter-csb-selected-items',
+					clearAllButtonClass: 'modal-clear',
+					applyBtnClass: 'modal-approve',
+					tagsBoxId: 'filter-places-tags',
+					deleteTagClass: 'csbs-del',
+					bodyId: 'events-filter-wrap',
+
+					prefix: 'f-p-',
+					deleteId: 'place-tag-remove',
+					labelId: 'filter-place-label'
+				},
+				subject: {
+					id: 'filter-pwSubj',
+					selectedItemTemplate: 'filter-subj-selected',
+					autoCompleteId: 'filter-subj-complete-block',
+					ajaxUrl: 'http://{{ request.get_host }}/search-form/',
+					autoCompleteUrl: 'http://{{ request.get_host }}/search-form/autocomplete/',
+					filterInputId: 'filter-subj-fliter-input',
+					modalTrigger: 'fiter-subj-modal-trigger',
+					getParentUrl: 'http://{{ request.get_host }}/search-form/get-parent/',
+					selectedItemsContainer: 'filter-csb-subj-selected-items',
+					subjectTriggerWrapId: 'filter-subj-checks',
+					//switched by default
+					defaultOn: ['f-s-exhibition-check', 'f-s-conference-check'],
+					clearAllButtonClass: 'modal-clear',
+					applyBtnClass: 'modal-approve',
+					tagsBoxId: 'filter-subject-tags',
+					deleteTagClass: 'csbs-del',
+					bodyId: 'events-filter-wrap',
+					prefix: 'f-s-',
+					deleteId: 'subject-tag-remove',
+
+					labelId: 'filter-subject-label'
+				},
+				modal:{
+					id:'filter-modal',
+					wrapClass:'search-modal-wrap',
+					size:{
+						'filter-pwSubj':{
+							width:640,
+							height:514
+						},
+						'filter-pwPlace':{
+							width:640,
+							height:460
+						}
+					}
+				},
+				filter: {
+					wrapperId:'"events-filter-wrap"',
+					bodyId:'events-filter',
+					buttonId:'filter-show-button',
+					hintId:'filter-hint-block'
+
+				}
+			});
+		</script>
+	</div>
 {% endblock %}