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

merged with filter functionlity

Browse Source
remotes/origin/1203
pavel 11 years ago
parent 49ca6baa5b 61360f7ff4
commit 69e186e819
5 changed files with 140 additions and 138 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 129
      templates/client/accounts/feed.html
  2. 2
      templates/client/popups/place.html
  3. 2
      templates/client/popups/theme.html
  4. 15
      templates/client/static_client/css/main.css
  5. 8
      templates/client/static_client/js/_modules/page.events.feed.js

129
templates/client/accounts/feed.html
Unescape View File

@ -28,7 +28,7 @@
<div class="csb-selected-items " > <div class="csb-selected-items " >
<div class="csb-selected csb-subj-selected dna-template" id="filter-subject-tags"> <div class="csb-selected csb-subj-selected dna-template" id="filter-subject-tags">
<div class="csbs-text ">~~text~~</div> <div class="csbs-text ">~~text~~</div>
<a class="csbs-del" href="#" data-checkbox-id="~~id~~" id="subject-tag-remove">x</a> <a class="csbs-del" href="javascript:void(0);" data-checkbox-id="~~id~~" id="subject-tag-remove">x</a>
</div> </div>
</div> </div>
@ -41,7 +41,7 @@
<div class="csb-selected-items" > <div class="csb-selected-items" >
<div class="csb-selected csb-subj-selected dna-template" id="filter-places-tags"> <div class="csb-selected csb-subj-selected dna-template" id="filter-places-tags">
<div class="csbs-text ">~~text~~</div> <div class="csbs-text ">~~text~~</div>
<a class="csbs-del " href="#" data-checkbox-id="~~id~~" id="place-tag-remove">x</a> <a class="csbs-del " href="javascript:void(0);" data-checkbox-id="~~id~~" id="place-tag-remove">x</a>
</div> </div>
</div> </div>
@ -57,11 +57,11 @@
<div class="search-modal-body"> <div class="search-modal-body">
{% if search_form.th %} {% 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 %} {% endif %}
{% if search_form.area %} {% 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 %} {% endif %}
</div> </div>
@ -73,17 +73,20 @@
</form> </form>
</div> </div>
<div class="filter-hint-block" id="filter-hint-block">
<p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p>
</div> </div>
{% include 'includes/exposition/exposition_list.html' with object_list=object_list %} {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
{% include 'includes/catalog_paginator.html' with page_obj=page_obj %} {% 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' %}{% 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 src="{% static 'client/js/_modules/block.search.js' %}"></script>-->
<script> <script>
EXPO.events.feed.init({ EXPO.events.feed.init({
bodyId:'events-filter-wrap', bodyId:'events-filter-wrap',
formId: 'filter-block-form', formId: 'filter-block-form',
@ -93,79 +96,57 @@
closerText: "{% trans ' и еще _ позиции' %}", closerText: "{% trans ' и еще _ позиции' %}",
closerTextSingle:"{% trans ' и еще _ позиция' %}", closerTextSingle:"{% trans ' и еще _ позиция' %}",
applyButtonId:'apply-filter-button', applyButtonId:'apply-filter-button',
place:{ place: {
id:'filter-pwPlace', id: 'filter-pwPlace',
selectedItemTemplate:'filter-csb-selected', selectedItemTemplate: 'filter-csb-selected',
ajaxUrl:'http://{{ request.get_host }}/search-form/', ajaxUrl: 'http://{{ request.get_host }}/search-form/',
autoCompleteUrl:'http://{{ request.get_host }}/search-form/autocomplete/', autoCompleteUrl: 'http://{{ request.get_host }}/search-form/autocomplete/',
getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/', getParentUrl: 'http://{{ request.get_host }}/search-form/get-parent/',
autoCompleteId:'filter-place-complete-block', autoCompleteId: 'filter-place-complete-block',
filterInputId:'filter-place-filter-input', filterInputId: 'filter-place-filter-input',
modalTrigger:'filter-place-modal-trigger', modalTrigger: 'filter-place-modal-trigger',
selectedItemsContainer:'filter-csb-selected-items', selectedItemsContainer: 'filter-csb-selected-items',
clearAllButtonClass:'clear-all-button', clearAllButtonClass: 'clear-all-button',
applyBtnClass:'modal-approve', applyBtnClass: 'modal-approve',
tagsBoxId:'filter-places-tags', tagsBoxId: 'filter-places-tags',
deleteTagClass:'csbs-del', deleteTagClass: 'csbs-del',
bodyId:'events-filter-wrap', bodyId: 'events-filter-wrap',
prefix:'f-p-', prefix: 'f-p-',
deleteId:'place-tag-remove', deleteId: 'place-tag-remove',
labelId:'filter-place-label' labelId: 'filter-place-label'
}, },
subject:{ subject: {
id:'filter-pwSubj', id: 'filter-pwSubj',
selectedItemTemplate:'filter-subj-selected', selectedItemTemplate: 'filter-subj-selected',
autoCompleteId:'filter-subj-complete-block', autoCompleteId: 'filter-subj-complete-block',
ajaxUrl:'http://{{ request.get_host }}/search-form/', ajaxUrl: 'http://{{ request.get_host }}/search-form/',
autoCompleteUrl:'http://{{ request.get_host }}/search-form/autocomplete/', autoCompleteUrl: 'http://{{ request.get_host }}/search-form/autocomplete/',
filterInputId:'filter-subj-fliter-input', filterInputId: 'filter-subj-fliter-input',
modalTrigger:'fiter-subj-modal-trigger', modalTrigger: 'fiter-subj-modal-trigger',
getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/', getParentUrl: 'http://{{ request.get_host }}/search-form/get-parent/',
selectedItemsContainer:'filter-csb-subj-selected-items', selectedItemsContainer: 'filter-csb-subj-selected-items',
subjectTriggerWrapId:'filter-subj-checks', subjectTriggerWrapId: 'filter-subj-checks',
//switched by default //switched by default
defaultOn:['f-s-exhibition-check','f-s-conference-check'], defaultOn: ['f-s-exhibition-check', 'f-s-conference-check'],
clearAllButtonClass:'clear-all-button', clearAllButtonClass: 'clear-all-button',
applyBtnClass:'modal-approve', applyBtnClass: 'modal-approve',
tagsBoxId:'filter-subject-tags', tagsBoxId: 'filter-subject-tags',
deleteTagClass:'csbs-del', deleteTagClass: 'csbs-del',
bodyId:'events-filter-wrap', bodyId: 'events-filter-wrap',
prefix:'f-s-', prefix: 'f-s-',
deleteId:'subject-tag-remove', deleteId: 'subject-tag-remove',
labelId:'filter-subject-label' labelId: 'filter-subject-label'
}, },
filter: { filter: {
wrapperId:'"events-filter-wrap"', wrapperId:'"events-filter-wrap"',
bodyId:'events-filter', bodyId:'events-filter',
buttonId:'filter-show-button' buttonId:'filter-show-button',
hintId:'filter-hint-block'
},
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 %} {% endblock %}

2
templates/client/popups/place.html
Unescape View File

@ -108,7 +108,7 @@
</div> </div>
</div> </div>
<div class="pwf-buttons-line"> <div class="pwf-buttons-line">
<button class="icon-check modal-approve" type="submit">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a> <button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %} {% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
</div> </div>
</div> </div>

2
templates/client/popups/theme.html
Unescape View File

@ -76,7 +76,7 @@
</div> </div>
</div> </div>
<div class="pwf-buttons-line"> <div class="pwf-buttons-line">
<button class="icon-check modal-approve" type="submit">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a> <button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %} {% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
</div> </div>
</div> </div>

15
templates/client/static_client/css/main.css
Unescape View File

@ -12064,6 +12064,7 @@ hr + .rq-note {
.events-feed-page{ .events-feed-page{
margin-top: -14px; margin-top: -14px;
margin-bottom: 2em;
} }
.events-feed-page h2{ .events-feed-page h2{
font-size: 16px; font-size: 16px;
@ -12157,6 +12158,7 @@ hr + .rq-note {
.events-filter-wrap{ .events-filter-wrap{
position: relative; position: relative;
overflow: visible; overflow: visible;
margin-bottom: 1em;
} }
.events-filter-wrap .button{ .events-filter-wrap .button{
margin-top: -40px; margin-top: -40px;
@ -12223,6 +12225,19 @@ hr + .rq-note {
.button.apply-filter.icon-check:hover:before{ .button.apply-filter.icon-check:hover:before{
background-position: -106px -16px; 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;
}

8
templates/client/static_client/js/_modules/page.events.feed.js
Unescape View File

@ -638,6 +638,7 @@ if (EXPO.events.feed) {
self._refreshLabel(); self._refreshLabel();
if(getObjectLength(self.itemsSelected)){ if(getObjectLength(self.itemsSelected)){
$(EXPO.events.feed.DOMapplyButton).show(); $(EXPO.events.feed.DOMapplyButton).show();
$(EXPO.events.feed.DOMhint).hide();
} }
}, },
/** /**
@ -1353,6 +1354,8 @@ if (EXPO.events.feed) {
this._refreshLabel(); this._refreshLabel();
if(getObjectLength(self.itemsSelected)){ if(getObjectLength(self.itemsSelected)){
$(EXPO.events.feed.DOMapplyButton).show(); $(EXPO.events.feed.DOMapplyButton).show();
$(EXPO.events.feed.DOMhint).hide();
} }
}, },
@ -1604,6 +1607,7 @@ if (EXPO.events.feed) {
} }
this.DOMform = document.getElementById(this.opt.formId); this.DOMform = document.getElementById(this.opt.formId);
this.DOMhint = document.getElementById(this.opt.filter.hintId);
$(this.DOMform).on('submit', function () { $(this.DOMform).on('submit', function () {
submitHandler(); submitHandler();
}); });
@ -1647,7 +1651,8 @@ if (EXPO.events.feed) {
}; };
// заполнение полей предыдущими значениями // заполнение полей предыдущими значениями
$(function () { $(function () {
if(self.previousSearch){ if(self.previousSearch.inputs.length){
$(self.DOMhint).hide();
for (var i = 0; i < self.previousSearch.inputs.length; i++) { for (var i = 0; i < self.previousSearch.inputs.length; i++) {
// окно выбора тематики // окно выбора тематики
if (self.previousSearch.inputs[i].name == 'th'){ if (self.previousSearch.inputs[i].name == 'th'){
@ -1681,6 +1686,7 @@ if (EXPO.events.feed) {
//Если выбраны фильтры то появляется кнопка "применить" //Если выбраны фильтры то появляется кнопка "применить"
if(getObjectLength(self.placesModal.itemsSelected) || getObjectLength(self.subjModal.itemsSelected) ){ if(getObjectLength(self.placesModal.itemsSelected) || getObjectLength(self.subjModal.itemsSelected) ){
$(self.DOMapplyButton).show(); $(self.DOMapplyButton).show();
} }
}); });

Write Preview
Loading…
Cancel
Save