From ff4bd44ff1c66a8e1edbd15b667f15d562774cd1 Mon Sep 17 00:00:00 2001
From: Kotiuk Nazarii <kotzillla@gmail.com>
Date: Fri, 8 May 2015 03:56:41 +0300
Subject: [PATCH] News

---
 import_xls/export_forms.py                       | 4 ++--
 templates/client/article/news.html               | 3 ++-
 templates/client/includes/article/news_list.html | 4 ++--
 templates/client/includes/index/news.html        | 2 +-
 templates/client/index.html                      | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/import_xls/export_forms.py b/import_xls/export_forms.py
index 6964194b..9984903a 100644
--- a/import_xls/export_forms.py
+++ b/import_xls/export_forms.py
@@ -179,8 +179,8 @@ class ExportEventForm(forms.Form):
                                                                      ('seminar.Seminar', 'Семинар'),
                                                                      ('webinar.Webinar', 'Вебинар')])
     language = forms.ChoiceField(label='Выберите язык', choices=languages)
-    date_from = forms.DateField(label='С')
-    date_to = forms.DateField(label='До')
+    date_from = forms.DateField(label='С', input_formats=settings.CLIENT_DATE_FORMAT)
+    date_to = forms.DateField(label='До', input_formats=settings.CLIENT_DATE_FORMAT)
     theme = forms.ModelMultipleChoiceField(label='Направление', queryset=Theme.objects.all(), required=False)
     country = forms.ModelMultipleChoiceField(label='Страны', queryset=Country.objects.all(), required=False)
 
diff --git a/templates/client/article/news.html b/templates/client/article/news.html
index 8c6e31fb..5fb34f66 100644
--- a/templates/client/article/news.html
+++ b/templates/client/article/news.html
@@ -20,13 +20,14 @@
 
         {% include 'includes/article/article_logo.html' with obj=object %}
         <h1>{{ object.main_title }}</h1>
-        <strong><span>{{ object.published|date:"d E Y" }}</span>{% if object.get_event %}<a class="flag" href="{{ object.get_event.get_permanent_url }}" title="">{{ object.get_event.name }}</a>{% endif %}</strong>
+        <strong><span>{{ object.publish_date|date:"d E Y" }}</span>{% if object.get_event %}<a class="flag" href="{{ object.get_event.get_permanent_url }}" title="">{{ object.get_event.name }}</a>{% endif %}</strong>
         {% if request.user.is_admin %}
             <a target="_blank" class="button green " href="/admin/article/news/{{ object.slug }}/">{% trans 'изменить' %}</a>
         {% endif %}
     </div>
     <div class="content-text">
         {{ object.description|safe }}
+
     </div>
 
     <div class="blog_avtor">
diff --git a/templates/client/includes/article/news_list.html b/templates/client/includes/article/news_list.html
index 2bd1af8e..46851fa2 100644
--- a/templates/client/includes/article/news_list.html
+++ b/templates/client/includes/article/news_list.html
@@ -5,8 +5,8 @@
 			<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 }}
+				<h3><a href="{{ news.get_permanent_url }}" title="">{{ news.main_title|safe  }}</a></h3>
+				{{ news.preview|safe }}
 				<strong><span>{{ news.publish_date|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>
diff --git a/templates/client/includes/index/news.html b/templates/client/includes/index/news.html
index d38c168c..fa1a780b 100644
--- a/templates/client/includes/index/news.html
+++ b/templates/client/includes/index/news.html
@@ -12,7 +12,7 @@
                 </span>
                 <span class="nl-body">
                     <span class="nl-text">{{ news.main_title }}</span>
-                    <span class="nl-date">{{ news.created|date:"d E Y" }}</span>
+                    <span class="nl-date">{{ news.publish_date|date:"d E Y" }}</span>
                 </span>
             </a>
         </li>
diff --git a/templates/client/index.html b/templates/client/index.html
index 9e4c19dc..9dcba80e 100644
--- a/templates/client/index.html
+++ b/templates/client/index.html
@@ -58,7 +58,7 @@
 
 				<div class="abn">
 					{% block menu_banner %}
-                        <a href="/redirect/redirect/10/"><img src="{% static 'client/img/partners/wire_760x70.gif' %}" alt="" /></a>
+                        <a target="_blank" href="/redirect/redirect/10/"><img src="{% static 'client/img/partners/wire_760x70.gif' %}" alt="" /></a>
 					{% endblock %}
 				</div>
 			</div>