From d941cf7b45b38a33c09f8e5975fea5d5b9e2efd9 Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Tue, 21 Apr 2015 09:54:00 +0000
Subject: [PATCH] EXPO-25 article/blog_list.html

---
 templates/client/article/blog_list.html | 85 +++++++++++--------------
 1 file changed, 38 insertions(+), 47 deletions(-)

diff --git a/templates/client/article/blog_list.html b/templates/client/article/blog_list.html
index e7f3ffd8..8e53acbe 100644
--- a/templates/client/article/blog_list.html
+++ b/templates/client/article/blog_list.html
@@ -3,68 +3,61 @@
 {% load thumbnail %}
 {% load i18n %}
 {% load template_filters %}
-
 {% block bread_scrumbs %}
    <div class="bread-crumbs">
-        <a href="/">{% trans 'Главная страница' %}</a>
-        <strong>{% trans 'Статьи' %}</strong>
+		<a href="/">{% trans 'Главная страница' %}</a>
+		<strong>{% trans 'Статьи' %}</strong>
    </div>
 {% endblock %}
-
 {% block page_title %}
-        <div class="page-title">
-           <h1>{% trans 'Статьи' %}</h1>
-       </div>
+	<div class="page-title">
+	   <h1>{% trans 'Статьи' %}</h1>
+   </div>
 {% endblock %}
-
 {% block content_list %}
 <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>
+	<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>
 					<div class="custom-select theme">
-                		{{ article_filter_form.theme }}
+						{{ article_filter_form.theme }}
 					</div>
-
 				</div>
-                <div class="mf-field">
-                    <label>{{ article_filter_form.tag.label }}</label>
-
+				<div class="mf-field">
+					<label>{{ article_filter_form.tag.label }}</label>
 					<div class="custom-select tags">
-                    	{{ article_filter_form.tag }}
+						{{ article_filter_form.tag }}
 					</div>
-
-
-                </div>
-            </div>
-        </div>
-    </form>
+				</div>
+			</div>
+		</div>
+	</form>
 </div>
 <div class="rq-to-hide">
-    <div class="s-comments">
-        <div class="cat-list sc-comments">
-        {% for blog in object_list %}
-            <div class="cl-item">
-                <div class="acticle_list_big">
-                    {% include 'includes/article/article_preview.html' with obj=blog %}
-
-                    <h3><a href="{{ blog.get_permanent_url }}" title="">{{ blog.main_title }}</a></h3>
-                    {{ blog.preview|safe }}
-                    <strong><span>{{ blog.created|date:"d E Y" }}</span>{% if blog.tag.all.exists %}{% include 'includes/article_tags.html' with obj=blog %}{% endif %}</strong>
-                </div>
-            </div>
-        {% endfor %}
-        </div>
-    </div>
+	<div class="s-comments">
+		<div class="cat-list sc-comments">
+		{% for blog in object_list %}
+			<div class="cl-item">
+				<div class="acticle_list_big">
+					{% include 'includes/article/article_preview.html' with obj=blog %}
+					<h3><a href="{{ blog.get_permanent_url }}" title="">{{ blog.main_title }}</a></h3>
+					{{ blog.preview|safe }}
+					<strong><span>{{ blog.created|date:"d E Y" }}</span>{% if blog.tag.all.exists %}{% include 'includes/article_tags.html' with obj=blog %}{% endif %}</strong>
+				</div>
+			</div>
+		{% endfor %}
+		</div>
+	</div>
 </div>
 
-<!--todo: вернуть минифицированную версию-->
-<script src="{% static 'client/js/_modules/block.newsFilter.js' %}"></script>
+{% if request.GET.debug == '1' %}
+	<script src="{% static 'client/js/_modules/block.newsFilter.js' %}"></script>
+{% else %}
+	<script src="{% static 'client/js_min/_modules/block.newsFilter.min.js' %}"></script>
+{% endif %}
 <script>
-	//js module initialization
 	EXPO.newsFilter.init({
 		theme:{
 			placeholder:"{% trans 'Укажите тематику' %}"
@@ -73,11 +66,9 @@
 			placeholder:"{% trans 'Выберите ключевые теги' %}",
 			url:'http://{{ request.get_host }}/theme/get-tag/'
 		}
-
 	});
 </script>
 {% endblock %}
-
 {% block paginator %}
-    {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
+	{% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
 {% endblock %}
\ No newline at end of file