From a7c38f53da43fd5695758e814792886982275c7b Mon Sep 17 00:00:00 2001 From: ya_dim4ik Date: Tue, 5 Apr 2016 13:51:09 +0300 Subject: [PATCH] t1202: add noindex, check on production --- templates/client/includes/catalog_search.html | 16 ++++++------ .../client/includes/catalog_search_main.html | 16 ++++++------ templates/client/popups/place.html | 9 +++++-- templates/client/popups/theme.html | 26 +++++++++++-------- 4 files changed, 38 insertions(+), 29 deletions(-) diff --git a/templates/client/includes/catalog_search.html b/templates/client/includes/catalog_search.html index 8772ea5b..5c3410e5 100644 --- a/templates/client/includes/catalog_search.html +++ b/templates/client/includes/catalog_search.html @@ -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_' }, diff --git a/templates/client/includes/catalog_search_main.html b/templates/client/includes/catalog_search_main.html index a010c76e..d69e164e 100644 --- a/templates/client/includes/catalog_search_main.html +++ b/templates/client/includes/catalog_search_main.html @@ -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_' }, diff --git a/templates/client/popups/place.html b/templates/client/popups/place.html index 2b3ab4d4..0a2ce21c 100644 --- a/templates/client/popups/place.html +++ b/templates/client/popups/place.html @@ -19,11 +19,12 @@
+
~~text~~
x
- +
@@ -47,12 +48,16 @@ - ~~text~~ + + ~~text~~ +
  • + +
diff --git a/templates/client/popups/theme.html b/templates/client/popups/theme.html index 452707cc..709d2e3f 100644 --- a/templates/client/popups/theme.html +++ b/templates/client/popups/theme.html @@ -37,10 +37,12 @@
-
-
~~text~~
- x -
+ +
+
~~text~~
+ x +
+
@@ -55,12 +57,14 @@ {{ text }}
  • - + + +
@@ -80,4 +84,4 @@
- \ No newline at end of file +