5 files changed, 36 insertions, 1 deletions
diff --git a/ishtar_common/templates/ishtar/forms/document.html b/ishtar_common/templates/ishtar/forms/document.html
index b3a9a8e15..ed5a39daf 100644
--- a/ishtar_common/templates/ishtar/forms/document.html
+++ b/ishtar_common/templates/ishtar/forms/document.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n inline_formset table_form %}
+{% load i18n inline_formset table_form from_dict %}
 {% block extra_head %}
 {{form.media}}
 {% endblock %}
@@ -11,9 +11,19 @@
 {% block content %}
 <h2>{{page_name}}</h2>
 <div class='form{% if not form.SEARCH_AND_SELECT %} container{% endif %}'>
+    {% if form.non_field_errors or form.errors %}
+    <div class="alert alert-danger">
+    <div><i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+        {% trans "Error on validation. Check all your fields. Modification not saved." %}
+    </div>
     {% for error in form.non_field_errors %}
     <p>{{ error }}</p>
     {% endfor %}
+    {% for key, error_details in form.errors.items %}
+    {% with field=key|from_dict:form.fields %}<strong>{{ field.label }}</strong>{{error_details}}{% endwith %}
+    {% endfor %}
+</div>
+    {% endif %}
     {% bs_form form %}
 </div>
 {% endblock %}
diff --git a/ishtar_common/templates/blocks/CentimeterMeterWidget.html b/ishtar_common/templates/widgets/CentimeterMeterWidget.html
index 00c1614b5..00c1614b5 100644
--- a/ishtar_common/templates/blocks/CentimeterMeterWidget.html
+++ b/ishtar_common/templates/widgets/CentimeterMeterWidget.html
diff --git a/ishtar_common/templates/widgets/CheckTextWidget.html b/ishtar_common/templates/widgets/CheckTextWidget.html
new file mode 100644
index 000000000..593fcbb5b
--- /dev/null
+++ b/ishtar_common/templates/widgets/CheckTextWidget.html
@@ -0,0 +1,25 @@
+<div class="input-group">
+    <input class="area_widget form-control" type="text"{{final_attrs|safe}}>
+    <div class="input-group-append">
+        <div class="input-group-text" id="check-{{id}}">
+            <i class="text-success fa fa-check"></i>
+            <i class="text-danger fa fa-times"></i>
+        </div>
+    </div>
+</div>
+<script type="text/javascript"><!--//
+    $("#check-{{id}} .text-danger").hide();
+    $("#check-{{id}} .text-success").hide();
+    function evaluate_{{safe_id}}(){
+        value = $("#{{id}}").val();
+        if ({{validator}}(value)){
+            $("#check-{{id}} .text-danger").hide();
+            $("#check-{{id}} .text-success").show();
+        } else {
+            $("#check-{{id}} .text-danger").show();
+            $("#check-{{id}} .text-success").hide();
+        }
+    }
+    $("#{{id}}").keyup(evaluate_{{safe_id}});
+    $(document).ready(evaluate_{{safe_id}}());
+//--></script>
diff --git a/ishtar_common/templates/blocks/GramKilogramWidget.html b/ishtar_common/templates/widgets/GramKilogramWidget.html
index 27c066d13..27c066d13 100644
--- a/ishtar_common/templates/blocks/GramKilogramWidget.html
+++ b/ishtar_common/templates/widgets/GramKilogramWidget.html
diff --git a/ishtar_common/templates/blocks/SquareMeterWidget.html b/ishtar_common/templates/widgets/SquareMeterWidget.html
index 09e93b425..09e93b425 100644
--- a/ishtar_common/templates/blocks/SquareMeterWidget.html
+++ b/ishtar_common/templates/widgets/SquareMeterWidget.html