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

t79: search places modal names fix + remove areas duplicatig

Browse Source
remotes/origin/t79_search_places_modal
Slava Kyrachevsky 9 years ago
parent b8e2ccfe26
commit 9b3e54a490
4 changed files with 2469 additions and 2473 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. 2
      apps/country/manager.py
  2. 4789
      static/client/js/_modules/block.search.js
  3. 2
      static/client/js_min/_modules/block.search.min.js
  4. 149
      templates/client/popups/place.html

2
apps/country/manager.py
Unescape View File

@ -133,7 +133,7 @@ class AreaManager(TranslationManager):
result = cache.get(key) result = cache.get(key)
else: else:
model = self.model model = self.model
result = list(model.objects.language().filter()) result = set(model.objects.language().filter())
#result.sort(key=lambda x: len(x.expos()), reverse=True) #result.sort(key=lambda x: len(x.expos()), reverse=True)
cache.set(key, result, self.cache_time) cache.set(key, result, self.cache_time)
return result return result

4789
static/client/js/_modules/block.search.js
View File

File diff suppressed because it is too large Load Diff

2
static/client/js_min/_modules/block.search.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -3,76 +3,75 @@
{% load template_filters %} {% load template_filters %}
<script> <script>
function updateTextFields(elem){ function updateTextFields(elem){
if ($(elem).data('insertedText')) if ($(elem).data('insertedText'))
elem.text($(this).data('insertedText')) elem.text($(this).data('insertedText'))
}; };
</script> </script>
<div id="{{formId}}" class="popup-window pw-place"> <div id="{{formId}}" class="popup-window pw-place">
<header class="clearfix"> <header class="clearfix">
<div class="pw-title">{% trans 'Место' %}</div> <div class="pw-title">{% trans 'Место' %}</div>
</header> </header>
<div class="pw-body clearfix"> <div class="pw-body clearfix">
<div class="pw-form search_form"> <div class="pw-form search_form">
<div class="c-select-box-wrap place-box"> <div class="c-select-box-wrap place-box">
<div class="wait-ajax absolute"><img src="{% static 'client/img/ajax-loader.gif' %}" alt=""/></div> <div class="wait-ajax absolute"><img src="{% static 'client/img/ajax-loader.gif' %}" alt=""/></div>
<div class="c-select-box places"> <div class="c-select-box places">
<div class="csb-title"> <div class="csb-title">
<input type="text" class="filter-input" id="{{filterInputId}}" data-form="place" autocomplete="on" placeholder="Введите или выберите страну из списка" /> <input type="text" class="filter-input" id="{{filterInputId}}" data-form="place" autocomplete="on" placeholder="Введите или выберите страну из списка" />
<!-- <!--
<div class="ac-custom-message" id="ac_animes"><span>Этот регион уже выбран.</span></div> <div class="ac-custom-message" id="ac_animes"><span>Этот регион уже выбран.</span></div>
--> -->
<div id="{{autoCompleteId}}" ></div> <div id="{{autoCompleteId}}" ></div>
</div> </div>
<div class="csb-selected-items" id="{{selectedItemsContainer}}"> <div class="csb-selected-items" id="{{selectedItemsContainer}}">
<div class="csb-selected dna-template " id="{{selectedItemTemplate}}"> <div class="csb-selected dna-template " id="{{selectedItemTemplate}}">
<div class="csbs-text" data-inserted-text="~~text~~" data-callback="updateTextFields">{# ~~text~~ #}</div> <div class="csbs-text" data-inserted-text="~~text~~" data-callback="updateTextFields">{# ~~text~~ #}</div>
<a class="csbs-del" href="#" data-checkbox-id="~~id~~">x</a> <a class="csbs-del" href="#" data-checkbox-id="~~id~~">x</a>
</div> </div>
</div> </div>
<div class="scroll-container csb-menu"> <div class="scroll-container csb-menu">
<div class="scroll-content clearfix"> <div class="scroll-content clearfix">
<div class="places-list"> <div class="places-list">
<!-- id for dna.js template, layout is in catalog_search.html--> <!-- id for dna.js template, layout is in catalog_search.html-->
<ul class="sublist parent"> <ul class="sublist parent">
{% for value, text in search_form.area.field.choices %}
{% for value, text in search_form.area.field.choices %} <li class="level1 level">
{% comment %}<span class="custom-radio-check">&nbsp;</span> {% endcomment %}
<label>
<input type="checkbox" name="area" id="id_{{ prefix }}{{ value }}" class="csb-menu-input" value="{{ value }}" {% for option in search_form.area.value %}{% if option == value|slugify %}checked="checked"{% endif %}{% endfor %}/>
{# <span class="hidden">{{ text }}</span> #}
</label>
<a href="#" data-name="area" data-id="{{ value }}" data-nested="false" data-template-id="{{prefix}}template{{ value }}" data-sub="true" class="trigger">{{ text }}</a>
<li class="level1 level"> <ul class="sublist middle-tire">
{% comment %}<span class="custom-radio-check">&nbsp;</span> {% endcomment %} <li class="level2 dna-template level" id="{{prefix}}template{{ value }}">
<label> <label>
<input type="checkbox" name="area" id="id_{{ prefix }}{{ value }}" class="csb-menu-input" value="{{ value }}" {% for option in search_form.area.value %}{% if option == value|slugify %}checked="checked"{% endif %}{% endfor %}/> <input type="checkbox" id="id_{{ prefix }}~~id~~" name="~~name~~" value="~~id~~" class="csb-menu-input"/>
{# <span class="hidden">{{ text }}</span> #} {# <span class="hidden">~~text~~</span>--> #}
</label> </label>
<a href="#" data-name="area" data-id="{{ value }}" data-nested="false" data-template-id="{{prefix}}template{{ value }}" data-sub="true" class="trigger">{{ text }}</a> <a data-sub="~~sub~~" class="trigger" data-name="~~name~~" data-nested="true" data-id="~~id~~" data-template-id="{{prefix}}template{{ value }}-sub" rel="nofollow" data-inserted-text="~~text~~" data-callback="updateTextFields">{# ~~text~~ #}</a>
<ul class='final-tire sublist'>
<li id="{{prefix}}template{{ value }}-sub" class='dna-template level'>
<label>
<input type="checkbox" id="id_{{ prefix }}~~id~~" name="~~name~~" class="nested-input csb-menu-input" value="~~id~~"/><span class="trigger" data-inserted-text="~~text~~" data-callback="updateTextFields">{# ~~text~~ #}</span>
</label>
</li>
</ul>
</li>
</ul>
<ul class="sublist middle-tire"> </li>
<li class="level2 dna-template level" id="{{prefix}}template{{ value }}"> {% endfor %}
<label>
<input type="checkbox" id="id_{{ prefix }}~~id~~" name="~~name~~" value="~~id~~" class="csb-menu-input"/>
{# <span class="hidden">~~text~~</span>--> #}
</label>
<a data-sub="~~sub~~" class="trigger" data-name="~~name~~" data-nested="true" data-id="~~id~~" data-template-id="{{prefix}}template{{ value }}-sub" rel="nofollow" data-inserted-text="~~text~~" data-callback="updateTextFields">{# ~~text~~ #}</a>
<ul class='final-tire sublist'>
<li id="{{prefix}}template{{ value }}-sub" class='dna-template level'>
<label>
<input type="checkbox" id="id_{{ prefix }}~~id~~" name="~~name~~" class="nested-input csb-menu-input" value="~~id~~"/><span class="trigger" data-inserted-text="~~text~~" data-callback="updateTextFields">{# ~~text~~ #}</span>
</label>
</li>
</ul>
</li>
</ul>
</li> </ul>
{% endfor %}
</ul> </div>
<div class="q-sel">
</div> <div class="q-sel-title">{% trans 'Быстрый выбор' %}:</div>
<div class="q-sel"> <ul>
<div class="q-sel-title">{% trans 'Быстрый выбор' %}:</div>
<ul>
<li><a href="#" data-name="ci" data-id="-2960561">{% trans 'Москва' %}</a></li> <li><a href="#" data-name="ci" data-id="-2960561">{% trans 'Москва' %}</a></li>
<li><a href="#" data-name="ci" data-id="-2996338">{% trans 'Санкт-Петербург' %}</a></li> <li><a href="#" data-name="ci" data-id="-2996338">{% trans 'Санкт-Петербург' %}</a></li>
<li><a href="#" data-name="co" data-id="159">{% trans 'Россия' %}</a></li> <li><a href="#" data-name="co" data-id="159">{% trans 'Россия' %}</a></li>
@ -81,20 +80,20 @@
<li><a href="#" data-name="co" data-id="47">{% trans 'Германия' %}</a></li> <li><a href="#" data-name="co" data-id="47">{% trans 'Германия' %}</a></li>
<li><a href="#" data-name="co" data-id="40">{% trans 'Китай' %}</a></li> <li><a href="#" data-name="co" data-id="40">{% trans 'Китай' %}</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="pwf-buttons-line"> <div class="pwf-buttons-line">
<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button> <button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button>
<button class="gray modal-clear" type="submit">{% trans 'Очистить' %}</button> <button class="gray modal-clear" type="submit">{% trans 'Очистить' %}</button>
<a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a> <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>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save