Merge branch 'develop' of http://git.general-servers.com/expomap/expomap into develop

templates/client/article/blog_list.html

@@ -1,4 +1,5 @@
 {% extends 'base_catalog.html' %}
+{% load static %}
 {% load thumbnail %}
 {% load i18n %}
 {% load template_filters %}
@@ -17,18 +18,25 @@
 {% endblock %}
 
 {% block content_list %}
-<div class="set-sect p-form adm-form">
+<div class="set-sect p-form adm-form news-filter-block">
 
     <form action="#">
         <div class="adm-form-body">
             <div class="mf-line mf-line1 s-subj-tag">
                 <div class="mf-field">
                     <label>{{ article_filter_form.theme.label }}</label>
-                    {{ article_filter_form.theme }}
-                </div>
+					<div class="custom-select theme">
+                		{{ article_filter_form.theme }}
+					</div>
+
+				</div>
                 <div class="mf-field">
                     <label>{{ article_filter_form.tag.label }}</label>
-                    {{ article_filter_form.tag.label }}
+
+					<div class="custom-select tags">
+                    	{{ article_filter_form.tag }}
+					</div>
+
 
                 </div>
             </div>
@@ -52,6 +60,22 @@
         </div>
     </div>
 </div>
+
+<!--todo: вернуть минифицированную версию-->
+<script src="{% static 'client/js/_modules/block.newsFilter.js' %}"></script>
+<script>
+	//js module initialization
+	EXPO.newsFilter.init({
+		theme:{
+			placeholder:"{% trans 'Укажите тематику' %}"
+		},
+		tags:{
+			placeholder:"{% trans 'Выберите ключевые теги' %}",
+			url:'http://{{ request.get_host }}/theme/get-tag/'
+		}
+
+	});
+</script>
 {% endblock %}
 
 {% block paginator %}