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

Merge branch 'dima'

Browse Source
remotes/origin/landing
ya_dim4ik 10 years ago
parent c0a3be6714 a7c38f53da
commit 9396e94af0
4 changed files with 38 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      templates/client/includes/catalog_search.html
  2. 16
      templates/client/includes/catalog_search_main.html
  3. 9
      templates/client/popups/place.html
  4. 26
      templates/client/popups/theme.html

16
templates/client/includes/catalog_search.html
Unescape View File

@ -118,9 +118,9 @@
place:{
id:'pwPlace',
selectedItemTemplate:'csb-selected',
ajaxUrl:'https://{{ request.get_host }}/search-form/',
autoCompleteUrl:'https://{{ request.get_host }}/search-form/autocomplete/',
getParentUrl:'https://{{ request.get_host }}/search-form/get-parent/',
ajaxUrl: window.location.protocol + '//{{ request.get_host }}/search-form/',
autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/',
getParentUrl: window.location.protocol + '//{{ request.get_host }}/search-form/get-parent/',
autoCompleteId:'filter-complete-block',
filterInputId:'place-filter-input',
modalTrigger:'place-modal-trigger',
@ -133,11 +133,11 @@
id:'pwSubj',
selectedItemTemplate:'csb-subj-selected',
autoCompleteId:'subj-filter-complete-block',
ajaxUrl:'https://{{ request.get_host }}/search-form/',
autoCompleteUrl:'https://{{ request.get_host }}/search-form/autocomplete/',
ajaxUrl: window.location.protocol + '//{{ request.get_host }}/search-form/',
autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/',
filterInputId:'subj-fliter-input',
modalTrigger:'subj-modal-trigger',
getParentUrl:'https://{{ request.get_host }}/search-form/get-parent/',
getParentUrl: window.location.protocol + '//{{ request.get_host }}/search-form/get-parent/',
selectedItemsContainer:'csb-subj-selected-items',
subjectTriggerWrapId:'subj-checks',
defaultOn:['exhibition-check','conference-check'],
@ -155,14 +155,14 @@
},
firstField:{
id:'id_q',
autoCompleteUrl:'https://{{ request.get_host }}{{ search_form.autocomplete_url }}',
autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}{{ search_form.autocomplete_url }}',
autoCompleteWrapId:'q-field-complete-wrap',
prefix:'tid_',
prefixInner:'tgid_'
},
placeField:{
id:'id_w',
autoCompleteUrl:'https://{{ request.get_host }}/search-form/autocomplete/',
autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/',
autoCompleteWrapId:'w-field-complete-wrap',
prefix:'id_'
},

16
templates/client/includes/catalog_search_main.html
Unescape View File

@ -128,9 +128,9 @@
place:{
id:'pwPlace',
selectedItemTemplate:'csb-selected',
ajaxUrl:'https://{{ request.get_host }}/search-form/',
autoCompleteUrl:'https://{{ request.get_host }}/search-form/autocomplete/',
getParentUrl:'https://{{ request.get_host }}/search-form/get-parent/',
ajaxUrl: window.location.protocol + '//{{ request.get_host }}/search-form/',
autoCompleteUrl:window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/',
getParentUrl: window.location.protocol + '//{{ request.get_host }}/search-form/get-parent/',
autoCompleteId:'filter-complete-block',
filterInputId:'place-filter-input',
modalTrigger:'place-modal-trigger',
@ -142,11 +142,11 @@
id:'pwSubj',
selectedItemTemplate:'csb-subj-selected',
autoCompleteId:'subj-filter-complete-block',
ajaxUrl:'https://{{ request.get_host }}/search-form/',
autoCompleteUrl:'https://{{ request.get_host }}/search-form/autocomplete/',
ajaxUrl: window.location.protocol + '//{{ request.get_host }}/search-form/',
autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/',
filterInputId:'subj-fliter-input',
modalTrigger:'subj-modal-trigger',
getParentUrl:'https://{{ request.get_host }}/search-form/get-parent/',
getParentUrl: window.location.protocol + '//{{ request.get_host }}/search-form/get-parent/',
selectedItemsContainer:'csb-subj-selected-items',
subjectTriggerWrapId:'subj-checks',
defaultOn:['exhibition-check','conference-check'],
@ -163,14 +163,14 @@
},
firstField:{
id:'id_q',
autoCompleteUrl:'https://{{ request.get_host }}{{ search_form.autocomplete_url }}',
autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}{{ search_form.autocomplete_url }}',
autoCompleteWrapId:'q-field-complete-wrap',
prefix:'tid_',
prefixInner:'tgid_'
},
placeField:{
id:'id_w',
autoCompleteUrl:'https://{{ request.get_host }}/search-form/autocomplete/',
autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/',
autoCompleteWrapId:'w-field-complete-wrap',
prefix:'id_'
},

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

@ -19,11 +19,12 @@
<div id="{{autoCompleteId}}" ></div>
</div>
<div class="csb-selected-items" id="{{selectedItemsContainer}}">
<!-- noindex -->
<div class="csb-selected dna-template " id="{{selectedItemTemplate}}">
<div class="csbs-text">~~text~~</div>
<a class="csbs-del" href="#" data-checkbox-id="~~id~~">x</a>
</div>
<!--/ noindex -->
</div>
<div class="scroll-container csb-menu">
<div class="scroll-content clearfix">
@ -47,12 +48,16 @@
<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" >~~text~~</a>
<!-- noindex -->
<a data-sub="~~sub~~" class="trigger" data-name="~~name~~" data-nested="true" data-id="~~id~~" data-template-id="{{prefix}}template{{ value }}-sub" rel="nofollow">~~text~~</a>
<!--/ noindex -->
<ul class='final-tire sublist'>
<li id="{{prefix}}template{{ value }}-sub" class='dna-template level'>
<!-- noindex -->
<label>
<input type="checkbox" id="id_{{ prefix }}~~id~~" name="~~name~~" class="nested-input csb-menu-input" value="~~id~~"/><span class="trigger">~~text~~</span>
</label>
<!--/ noindex -->
</li>
</ul>
</li>

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

@ -37,10 +37,12 @@
</div>
<div class="csb-selected-items" id="{{selectedItemsContainer}}">
<div class="csb-selected dna-template " id="{{selectedItemTemplate}}">
<div class="csbs-text">~~text~~</div>
<a class="csbs-del" href="#" data-checkbox-id="~~id~~">x</a>
</div>
<!-- noindex -->
<div class="csb-selected dna-template " id="{{selectedItemTemplate}}">
<div class="csbs-text">~~text~~</div>
<a class="csbs-del" href="#" data-checkbox-id="~~id~~">x</a>
</div>
<!--/noindex -->
</div>
<div class="scroll-container csb-menu">
<div class="scroll-content clearfix">
@ -55,12 +57,14 @@
<a href="#" data-name="th" data-id="{{ value }}" data-sub="true" data-template-id="{{ prefix }}subj-template{{ value }}" class="trigger">{{ text }}</a>
<ul class="sublist">
<li class="level dna-template" id="{{ prefix }}subj-template{{ value }}">
<label class="custom-radio-check">
<span class="custom-checkbox">
<input type="checkbox" class="csb-menu-input" name="~~name~~" value="~~id~~" id="tgid_{{ prefix }}~~id~~"/>
</span>
<span class="trigger">~~text~~</span>
</label>
<!-- noindex -->
<label class="custom-radio-check">
<span class="custom-checkbox">
<input type="checkbox" class="csb-menu-input" name="~~name~~" value="~~id~~" id="tgid_{{ prefix }}~~id~~"/>
</span>
<span class="trigger">~~text~~</span>
</label>
<!--/ noindex -->
</li>
</ul>
</li>
@ -80,4 +84,4 @@
</div>
</div>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save