From 860c116f915a9cb9dbd14323745cd8ceb7e6c2d7 Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Tue, 6 Jan 2015 20:40:45 +0000
Subject: [PATCH] hint layout

---
 templates/client/accounts/feed.html         | 258 ++++++++++----------
 templates/client/static_client/css/main.css |  15 ++
 2 files changed, 146 insertions(+), 127 deletions(-)

diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html
index 11f5e735..32bbaa7a 100644
--- a/templates/client/accounts/feed.html
+++ b/templates/client/accounts/feed.html
@@ -17,152 +17,156 @@
 
 {% 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="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" href="#"  data-checkbox-id="~~id~~" id="subject-tag-remove">x</a>
-                        </div>
+        <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" href="#"  data-checkbox-id="~~id~~" id="subject-tag-remove">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 " href="#" data-checkbox-id="~~id~~" id="place-tag-remove">x</a>
                         </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 " href="#" data-checkbox-id="~~id~~" id="place-tag-remove">x</a>
+                            </div>
+
+                        </div>
                     </div>
-                </div>
-            </section>
-            <button class="icon-check apply-filter button" type="submit" id="apply-filter-button">{% trans 'Применить' %}</button>
+                </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">
+            </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.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 %}
+                            {% 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>
+                        <div class="a modal-close fancybox-close">&nbsp;</div>
                     </div>
-                    <div class="a modal-close fancybox-close">&nbsp;</div>
                 </div>
+
             </div>
 
+            </form>
+        </div>
+        <div class="filter-hint-block">
+            <p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p>
         </div>
 
-        </form>
-    </div>
-    </div>
 
-    {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
-
-    {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
-    <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/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:'clear-all-button',
-                applyBtnClass:'modal-approve',
-                tagsBoxId:'filter-places-tags',
-                deleteTagClass:'csbs-del',
-                bodyId:'events-filter-wrap',
+        {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
+
+        {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
+        <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/block.search.js' %}"></script>-->
 
-                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:'clear-all-button',
-                applyBtnClass:'modal-approve',
-                tagsBoxId:'filter-subject-tags',
-                deleteTagClass:'csbs-del',
+        <script>
+            EXPO.events.feed.init({
                 bodyId:'events-filter-wrap',
-                prefix:'f-s-',
-                deleteId:'subject-tag-remove',
-
-                labelId:'filter-subject-label'
-
-
-            },
-
-            filter: {
-                wrapperId:'"events-filter-wrap"',
-                bodyId:'events-filter',
-                buttonId:'filter-show-button'
-
-            },
-            modal:{
-                id:'filter-modal',
-                wrapClass:'search-modal-wrap',
-                size:{
-                    'filter-pwSubj':{
-                        width:640,
-                        height:514
-                    },
-                    'filter-pwPlace':{
-                        width:640,
-                        height:460
+                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:'clear-all-button',
+                    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:'clear-all-button',
+                    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'
+
+
+                },
+
+                filter: {
+                    wrapperId:'"events-filter-wrap"',
+                    bodyId:'events-filter',
+                    buttonId:'filter-show-button'
+
+                },
+                modal:{
+                    id:'filter-modal',
+                    wrapClass:'search-modal-wrap',
+                    size:{
+                        'filter-pwSubj':{
+                            width:640,
+                            height:514
+                        },
+                        'filter-pwPlace':{
+                            width:640,
+                            height:460
+                        }
                     }
-                }
 
-            }
-        });
-    </script>
+                }
+            });
+        </script>
+    </div>
 {% endblock %}
 
 
diff --git a/templates/client/static_client/css/main.css b/templates/client/static_client/css/main.css
index 05504c4d..b444d537 100644
--- a/templates/client/static_client/css/main.css
+++ b/templates/client/static_client/css/main.css
@@ -12073,6 +12073,7 @@ hr + .rq-note {
 
 	.events-feed-page{
 		margin-top: -14px;
+		margin-bottom: 2em;
 	}
 	.events-feed-page h2{
 		font-size: 16px;
@@ -12168,6 +12169,7 @@ hr + .rq-note {
 	.events-filter-wrap{
 		position: relative;
 		overflow: visible;
+		margin-bottom: 1em;
 	}
 	.events-filter-wrap .button{
 		margin-top: -40px;
@@ -12234,6 +12236,19 @@ hr + .rq-note {
 	.button.apply-filter.icon-check:hover:before{
 		background-position: -106px -16px;
 	}
+	.events-feed-page .filter-hint-block{
+		border: 1px dashed #87C525;
+		border-radius: 4px
+	}
+		.events-feed-page .filter-hint-block p{
+			margin: 8px;
+			text-align: center;
+			color: #464646;
+		}
+		.events-feed-page .filter-hint-block p .red{
+			font-weight: bold;
+			color: #d80000;
+		}