From 04fa86898892314fec4ca566c59855391ced8466 Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Thu, 26 Apr 2018 10:59:24 +0300
Subject: [PATCH] LIL-424, 429. Fix None in become author template

---
 apps/user/templates/user/become-author.html | 47 +++++++++------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/apps/user/templates/user/become-author.html b/apps/user/templates/user/become-author.html
index 383b81ab..92e7c054 100644
--- a/apps/user/templates/user/become-author.html
+++ b/apps/user/templates/user/become-author.html
@@ -1,12 +1,5 @@
-{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %} {% if messages %}
-<div class="section section_menu">
-  <div class="section__center center center_xs">
-    {% for message in messages %}
-    <div class="message message_{{ message.tags }}">{{ message }}</div>
-    {% endfor %}
-  </div>
-</div>
-{% endif %}
+{% extends "templates/lilcity/index.html" %} {% load static %} {% block content %}
+{% include 'templates/blocks/messages.html' %}
 <div class="section">
   <div class="section__center center center_xs">
     <form class="form" method="POST">{% csrf_token %}
@@ -16,48 +9,48 @@
           <div class="form__field field{% if form.first_name.errors %} error{% endif %}">
             <div class="field__label">ИМЯ</div>
             <div class="field__wrap">
-              <input name='first_name' class="field__input" type="text" placeholder="Имя" value="{{ form.first_name.value }}">
+              <input name='first_name' class="field__input" type="text" placeholder="Имя" value="{% if form.first_name.value %}{{ form.first_name.value }}{% endif %}">
             </div>
-            {% if form.first_name.errors %}
-            <div class="field__error">Укажите корректно свои данные</div>
-            {% endif %}
+            {% for error in form.first_name.errors %}
+            <div class="field__error">{{ error }}</div>
+            {% endfor %}
           </div>
           <div class="form__field field{% if form.last_name.errors %} error{% endif %}">
             <div class="field__label">ФАМИЛИЯ</div>
             <div class="field__wrap">
-              <input name='last_name' class="field__input" type="text" placeholder="Фамилия" value="{{ form.last_name.value }}">
+              <input name='last_name' class="field__input" type="text" placeholder="Фамилия" value="{% if form.last_name.value %}{{ form.last_name.value }}{% endif %}">
             </div>
-            {% if form.last_name.errors %}
-            <div class="field__error">Укажите корректно свои данные</div>
-            {% endif %}
+            {% for error in form.last_name.errors %}
+            <div class="field__error">{{ error }}</div>
+            {% endfor %}
           </div>
         </div>
         <div class="form__field field{% if form.email.errors %} error{% endif %}">
           <div class="field__label">Почта</div>
           <div class="field__wrap">
-            <input name='email' class="field__input" type="email" placeholder="Почта" value="{{ form.email.value }}">
+            <input name='email' class="field__input" type="email" placeholder="Почта" value="{% if form.email.value %}{{ form.email.value }}{% endif %}">
           </div>
-          {% if form.email.errors %}
-          <div class="field__error">Укажите корректно свои данные</div>
-          {% endif %}
+          {% for error in form.email.errors %}
+          <div class="field__error">{{ error }}</div>
+          {% endfor %}
         </div>
         <div class="form__field field{% if form.about.errors %} error{% endif %}">
           <div class="field__label">О себе</div>
           <div class="field__wrap">
             <textarea name='about' class="field__textarea" placeholder="Расскажите о себе и своем опыте">{% if form.about.value %}{{ form.about.value }}{% endif %}</textarea>
           </div>
-          {% if form.about.errors %}
-          <div class="field__error">Укажите корректно свои данные</div>
-          {% endif %}
+          {% for error in form.about.errors %}
+          <div class="field__error">{{ error }}</div>
+          {% endfor %}
         </div>
         <div class="form__field field{% if form.facebook.errors %} error{% endif %}">
           <div class="field__label">FACEBOOK</div>
           <div class="field__wrap">
             <input name='facebook' class="field__input" type="text" placeholder="https://facebook.com/lilcitycompany" value="{% if form.facebook.value %}{{ form.facebook.value }}{% endif %}">
           </div>
-          {% if form.facebook.errors %}
-          <div class="field__error">Укажите корректно свои данные</div>
-          {% endif %}
+          {% for error in form.facebook.errors %}
+          <div class="field__error">{{ error }}</div>
+          {% endfor %}
         </div>
       </div>
       <div class="form__foot">