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

---
 templates/client/article/news_list.html | 80 +++++++++++--------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/templates/client/article/news_list.html b/templates/client/article/news_list.html
index 1b73770b..8679e5f9 100644
--- a/templates/client/article/news_list.html
+++ b/templates/client/article/news_list.html
@@ -2,67 +2,60 @@
 {% load static %}
 {% load i18n %}
 {% load template_filters %}
-
 {% block bread_scrumbs %}
-   <div class="bread-crumbs">
+    <div class="bread-crumbs">
         <a href="/">{% trans 'Главная страница' %}</a>
         <strong>{% trans 'Новости' %}</strong>
-   </div>
+    </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 }}
 					</div>
-                </div>
-
-                <div class="mf-field">
-                    <label>{{ article_filter_form.tag.label }}</label>
+				</div>
+				<div class="mf-field">
+					<label>{{ article_filter_form.tag.label }}</label>
 					<div class="custom-select tags">
 					{{ article_filter_form.tag }}
 					</div>
-
-
-                </div>
-            </div>
-
-        </div>
-    </form>
+				</div>
+			</div>
+		</div>
+	</form>
 </div>
 <div class="rq-to-hide">
-    <div class="cat-list sc-comments">
-    {% for news in object_list %}
-        <div class="cl-item">
-            <div class="acticle_list">
-                <a href="{{ news.get_permanent_url }}" title="">
-                    {% include 'includes/article/news_preview.html' with obj=news %}</a>
-                <h3><a href="{{ news.get_permanent_url }}" title="">{{ news.main_title }}</a></h3>
-                {{ news.preview }}
-                <strong><span>{{ news.created|date:"d E Y" }}</span>{% with event=news.get_event %}{% if event %}<a href="{{ event.get_permanent_url }}" title=""><b>{{ event.name }}</b></a>{% endif %}{% endwith %}</strong>
-            </div>
-        </div>
-    {% endfor %}
-    </div>
+	<div class="cat-list sc-comments">
+	{% for news in object_list %}
+		<div class="cl-item">
+			<div class="acticle_list">
+				<a href="{{ news.get_permanent_url }}" title="">
+					{% include 'includes/article/news_preview.html' with obj=news %}</a>
+				<h3><a href="{{ news.get_permanent_url }}" title="">{{ news.main_title }}</a></h3>
+				{{ news.preview }}
+				<strong><span>{{ news.created|date:"d E Y" }}</span>{% with event=news.get_event %}{% if event %}<a href="{{ event.get_permanent_url }}" title=""><b>{{ event.name }}</b></a>{% endif %}{% endwith %}</strong>
+			</div>
+		</div>
+	{% endfor %}
+	</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 'Укажите тематику' %}"
@@ -74,7 +67,6 @@
 	});
 </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 %}