From 2233a2231ba2b43d420874217f7ecbc7e1898422 Mon Sep 17 00:00:00 2001 From: pavel Date: Tue, 6 Jan 2015 20:10:28 +0000 Subject: [PATCH 1/3] submit button text --- templates/client/accounts/feed.html | 171 ++++++++++++++-------------- templates/client/popups/place.html | 2 +- templates/client/popups/theme.html | 2 +- 3 files changed, 88 insertions(+), 87 deletions(-) diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html index 65cd841f..11f5e735 100644 --- a/templates/client/accounts/feed.html +++ b/templates/client/accounts/feed.html @@ -57,11 +57,11 @@
{% 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-" %} + {% 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-" %} + {% 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 %}
@@ -73,95 +73,96 @@ + {% include 'includes/exposition/exposition_list.html' with object_list=object_list %} {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} -{% endblock %} -{% block scripts %} - - + + + + + + } + }); + {% endblock %} + + diff --git a/templates/client/popups/place.html b/templates/client/popups/place.html index 2f085630..c29147e2 100644 --- a/templates/client/popups/place.html +++ b/templates/client/popups/place.html @@ -108,7 +108,7 @@
- {% trans 'Уточнить тему' %} + {% trans 'Уточнить тему' %} {% if hasDate %}{% trans 'Уточнить дату' %}{% endif %}
diff --git a/templates/client/popups/theme.html b/templates/client/popups/theme.html index e4a1a699..2a4a7a4d 100644 --- a/templates/client/popups/theme.html +++ b/templates/client/popups/theme.html @@ -76,7 +76,7 @@
- {% trans 'Уточнить географию' %} + {% trans 'Уточнить географию' %} {% if hasDate %}{% trans 'Уточнить дату' %}{% endif %}
From 860c116f915a9cb9dbd14323745cd8ceb7e6c2d7 Mon Sep 17 00:00:00 2001 From: pavel Date: Tue, 6 Jan 2015 20:40:45 +0000 Subject: [PATCH 2/3] 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 %}
-
- Фильтрация ленты - - -
-
-

Тематические фильтры не выбраны: (Изменить):

-
-
-
-
~~text~~
- x -
+
+ Фильтрация ленты + + +
+
+

Тематические фильтры не выбраны: (Изменить):

+
+
+
+
~~text~~
+ x +
-
-
-
-
-

Географические фильтры не выбраны: (Изменить):

- -
-
-
-
~~text~~
- x
+
+
+
+

Географические фильтры не выбраны: (Изменить):

+
+
+
+
~~text~~
+ x +
+ +
-
-
- + + -
-
{% csrf_token %} -
-
-
-
+
+ {% csrf_token %} +
+
+
+
- {% 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 %} +
+
 
-
 
+
+ +
+
+

*{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}

- -
-
- {% include 'includes/exposition/exposition_list.html' with object_list=object_list %} - - {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} - - - - + - 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', + + } + }); + +
{% 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; + } From 61360f7ff447f3155634840ee7cac7ddb22e0bd6 Mon Sep 17 00:00:00 2001 From: pavel Date: Tue, 6 Jan 2015 21:25:20 +0000 Subject: [PATCH 3/3] hint javascript --- templates/client/accounts/feed.html | 14 +++++++++----- .../static_client/js/_modules/page.events.feed.js | 8 +++++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html index 32bbaa7a..4674f61c 100644 --- a/templates/client/accounts/feed.html +++ b/templates/client/accounts/feed.html @@ -28,7 +28,7 @@
~~text~~
- x + x
@@ -41,7 +41,7 @@
~~text~~
- x + x
@@ -73,7 +73,7 @@
-
+

*{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}

@@ -81,7 +81,10 @@ {% include 'includes/exposition/exposition_list.html' with object_list=object_list %} {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} - + + + +