From f2b9a0f0ccc9b4c0dbcb941325c51c6cbcb03965 Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Tue, 21 Apr 2015 11:11:19 +0000
Subject: [PATCH] EXPO-25 modules

---
 templates/client/blank.html                   |  14 +-
 templates/client/includes/catalog_search.html | 128 ++++++++----------
 2 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/templates/client/blank.html b/templates/client/blank.html
index f9bd4241..92137730 100644
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@@ -41,11 +41,11 @@ This template include basic anf main styles and js files,
 	<script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script>
 	<script src="{% static 'client/js/vendor/jquery-1.10.1.min.js' %}"></script>
 	<script src="{% static 'client/js/jquery-ui-1.10.4.custom.min.js' %}"  type="text/javascript"></script>
-    {% if request.GET.debug == '1' %}
-        <script src="{% static 'client/js/_modules/block.common.js' %}"></script>
-    {% else %}
-        <script src="{% static 'client/js_min/_modules/block.common.min.js' %}"></script>
-    {% endif %}
+	{% if request.GET.debug == '1' %}
+		<script src="{% static 'client/js/_modules/block.common.js' %}"></script>
+	{% else %}
+		<script src="{% static 'client/js_min/_modules/block.common.min.js' %}"></script>
+	{% endif %}
 	<script type="text/javascript">
 		EXPO.common.init({
 			activeClass:"active",
@@ -139,9 +139,9 @@ This template include basic anf main styles and js files,
 {# js libs #}
 	<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=places"></script>
 {% if request.GET.debug == '1' %}
-    <script src="{% static 'client/js/vendor.js' %}"></script>
+	<script src="{% static 'client/js/vendor.js' %}"></script>
 {% else %}
-    <script src="{% static 'client/js_min/vendor.min.js' %}"></script>
+	<script src="{% static 'client/js_min/vendor.min.js' %}"></script>
 {% endif %}
 <div id="wait-ajax" class="wait-ajax" style="display:none;"><img src="{% static 'client/img/ajax-loader.gif' %}" alt=""/></div>
 </body>
diff --git a/templates/client/includes/catalog_search.html b/templates/client/includes/catalog_search.html
index 4e7ba16a..8da880e7 100644
--- a/templates/client/includes/catalog_search.html
+++ b/templates/client/includes/catalog_search.html
@@ -1,82 +1,78 @@
 {% load static %}
 {% load i18n %}
-
 <div class="in-search-form mp-search">
-    <form action="{{ search_form.search_url }}" class="search_form" id="search-block-form">
-        <div class="s-title">{{ search_form.title }}</div>
-            <div class="search-form-wrap">
-                <div class="search-line">
-                    <div class="sf-field-wrap">
-                        <div class="sf-field">
-                            <label for="search">{% trans 'Я ищу:' %}</label>
-                            <div class="input-text">{{ search_form.q }}</div>
-                        </div>
+	<form action="{{ search_form.search_url }}" class="search_form" id="search-block-form">
+		<div class="s-title">{{ search_form.title }}</div>
+			<div class="search-form-wrap">
+				<div class="search-line">
+					<div class="sf-field-wrap">
+						<div class="sf-field">
+							<label for="search">{% trans 'Я ищу:' %}</label>
+							<div class="input-text">{{ search_form.q }}</div>
+						</div>
 						<div class="sf-autocomplete main-field-complete visible">
 							<div class="sfa-wrap q-field-complete-wrap"  id="q-field-complete-wrap">
-
 							</div>
 						</div>
-
-                    </div>
-                    <div class="sf-field-wrap">
-                        <div class="sf-field">
-                            <label for="where">{% trans 'Где:' %}</label>
-                            <div class="input-text">{{ search_form.w }}</div>
-                        </div>
+					</div>
+					<div class="sf-field-wrap">
+						<div class="sf-field">
+							<label for="where">{% trans 'Где:' %}</label>
+							<div class="input-text">{{ search_form.w }}</div>
+						</div>
 						<div class="sf-autocomplete main-field-complete visible">
 							<div class="sfa-wrap w-field-complete-wrap"  id="w-field-complete-wrap">
-
 							</div>
 						</div>
-                    </div>
-                    <div class="sf-field-wrap">
-                        <button class="search_submit" type="submit"><span>{% trans 'найти' %}</span></button>
-                    </div>
-                </div>
-                <div class="search-line sl-options">
-                    {% if search_form.th %}
-                        <div class="sf-field-wrap no-wrap">{% trans 'Тематика: ' %}
-                            <a class="search-modal-open" href="#pwSubj" id="subj-modal-trigger" data-default="{% trans 'Не важно' %}">
+					</div>
+					<div class="sf-field-wrap">
+						<button class="search_submit" type="submit"><span>{% trans 'найти' %}</span></button>
+					</div>
+				</div>
+				<div class="search-line sl-options">
+					{% if search_form.th %}
+						<div class="sf-field-wrap no-wrap">{% trans 'Тематика: ' %}
+							<a class="search-modal-open" href="#pwSubj" id="subj-modal-trigger" data-default="{% trans 'Не важно' %}">
 								{# search_form.get_themes_display #}{% trans 'Не важно' %}
 							</a>
 							<span class="clear-all-button">&nbsp;</span>
-                        </div>
-                    {% endif %}
-                    {% if search_form.place_type %}
-                        <div class="sf-field-wrap">{% trans 'Тип: ' %}
-                            <a class="search-modal-open" href="#pw-place_type" id="subj-modal-trigger" data-default="{% trans 'Не важно' %}">
+						</div>
+					{% endif %}
+					{% if search_form.place_type %}
+						<div class="sf-field-wrap">{% trans 'Тип: ' %}
+							<a class="search-modal-open" href="#pw-place_type" id="subj-modal-trigger" data-default="{% trans 'Не важно' %}">
 								{% trans 'Не важно' %}
 							</a>
-                        </div>
-                    {% endif %}
-                    {% if search_form.area %}
-                    <div class="sf-field-wrap no-wrap">{% trans 'Место: ' %}
-                        <a class="search-modal-open" href="#pwPlace" id="place-modal-trigger" data-default="{% trans 'Не важно' %}">
-                        {# search_form.get_places_display #}{% trans 'Не важно' %}
-                        </a>
+						</div>
+					{% endif %}
+					{% if search_form.area %}
+					<div class="sf-field-wrap no-wrap">{% trans 'Место: ' %}
+						<a class="search-modal-open" href="#pwPlace" id="place-modal-trigger" data-default="{% trans 'Не важно' %}">
+						{# search_form.get_places_display #}{% trans 'Не важно' %}
+						</a>
 						<span class="clear-all-button">&nbsp;</span>
 					</div>
-                    {% endif %}
+					{% endif %}
 
-                    {% if search_form.fr %}
-                        <div class="sf-field-wrap no-wrap"><span class="trigger-label">{% trans 'Период: ' %}</span>
-                            <a class="search-modal-open" href="#pwPeriod"  id="period-modal-trigger" data-default="Не важно" data-lng-from="с" data-lng-to="по">
-                            {% if search_form.fr.value or search_form.to.value %}
-                                {% if search_form.fr.value %}
-                                    c {{ search_form.fr.value }}
-                                {% endif %}
-                                {% if search_form.to.value %}
-                                    по {{ search_form.to.value }}
-                                {% endif %}
-                            {% else %}
+					{% if search_form.fr %}
+						<div class="sf-field-wrap no-wrap"><span class="trigger-label">{% trans 'Период: ' %}</span>
+							<a class="search-modal-open" href="#pwPeriod"  id="period-modal-trigger" data-default="Не важно" data-lng-from="с" data-lng-to="по">
+							{% if search_form.fr.value or search_form.to.value %}
+								{% if search_form.fr.value %}
+									c {{ search_form.fr.value }}
+								{% endif %}
+								{% if search_form.to.value %}
+									по {{ search_form.to.value }}
+								{% endif %}
+							{% else %}
 								{% trans 'Не важно' %}
-                            {% endif %}
-                            </a>
+							{% endif %}
+							</a>
 							<span class="clear-all-button">&nbsp;</span>
-                        </div>
-                    {% endif %}
-                </div>
-        </div>
+						</div>
+					{% endif %}
+				</div>
+		</div>
 		<div class="modals">
 			<div class="search-modal-overlay" id="search-modal">
 				<div class="search-modal-wrap fancybox-skin">
@@ -96,14 +92,15 @@
 					<div class="a modal-close fancybox-close">&nbsp;</div>
 				</div>
 			</div>
-
 		</div>
-
-    </form>
+	</form>
 	{% block scripts %}
 	<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
-	<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.search{% if debug %}{% else %}.min{% endif %}.js"></script>-->
+	{% if request.GET.debug == '1' %}
 	<script src="{% static 'client/js/_modules/block.search.js' %}"></script>
+	{% else %}
+	<script src="{% static 'client/js_min/_modules/block.search.min.js' %}"></script>
+	{% endif %}
 	<script>
 		var closerTextSingle = "{% trans ' и еще _ позиция' %}",
 			closerText = "{% trans ' и еще _ позиции' %}";
@@ -111,7 +108,6 @@
 			closerTextSingle = "{% trans ' и еще _' %}";
 			closerText = "{% trans ' и еще _' %}";
 		}
-
 	EXPO.searchBlock.init({
 		formId: 'search-block-form',
 		modalTriggerClass:'search-modal-open',
@@ -143,10 +139,8 @@
 			getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
 			selectedItemsContainer:'csb-subj-selected-items',
 			subjectTriggerWrapId:'subj-checks',
-			//switched by default
 			defaultOn:['exhibition-check','conference-check'],
 			clearAllButtonClass:'clear-all-button',
-
 			applyBtnClass:'modal-approve'
 		},
 		period:{
@@ -188,12 +182,8 @@
 					height:460
 				}
 			}
-
 		}
-
 	});
-
 	</script>
-
 	{% endblock %}
 </div>