Merge branch 'develop' of gitlab.com:OldminTeam/expomap into develop

static/client/css/main.css

@@ -14386,10 +14386,20 @@ h1 .preview_toggle:hover{
     position: fixed;
     right: 20px;
     bottom: 20px;
-    max-width: 360px;
+    max-width: 326px;
     z-index: 101;
 }
 
+.site_review_block .recaptcha_field{
+    margin-bottom: 10px;
+}
+
+.site_review_block .text_error {
+    display: block;
+    text-align: center;
+    color: #d80000;
+}
+
 .review_trigger{
     display: block;
     color: #fff;

static/client/js/_modules/block.common.js

@@ -406,6 +406,7 @@ if (EXPO.common){
                 event.preventDefault();
 
                 $form.find('.error').removeClass('error');
+                $form.find('.text_error').remove();
 
                 $.ajax({
                     url: $form.attr('action'),
@@ -421,14 +422,20 @@ if (EXPO.common){
                                 $form.fadeOut(300, function(){
                                     $form.find('.form_data').show();
                                     $form.find('.success_message').hide();
+                                    grecaptcha.reset();
                                 });
                             }, 2000);
                         }
                     },
                     error: function (response) {
-                        $.each(response.responseJSON, function (field) {
-                            $('#id_' + field).addClass('error');
-                        })
+                        $.each(response.responseJSON, function (field, error) {
+                            if (field == 'captcha'){
+                                $form.find('.recaptcha_field').append('<span class="text_error">' + error + '</span>');
+                            } else {
+                                $('#id_' + field).addClass('error');
+                                grecaptcha.reset();
+                            }
+                        });
                     }
                 })
             })

templates/client/blank.html

@@ -226,7 +226,9 @@ This template include basic anf main styles and js files,
                     <p>{% trans 'Оставьте отзыв о работе сайта или предложение об его улучшении' %}.</p>
                     {% site_review_form as sr_form %}
                     {{ sr_form.review }}
-                    {{ sr_form.captcha }}
+                    <div class="recaptcha_field">
+                        {{ sr_form.captcha }}
+                    </div>
                     <button class="button">{% trans 'Отправить' %}</button>
                 </div>