From 0080a47bc57ee2b7dfcf771a19e1014fc6eb108a Mon Sep 17 00:00:00 2001
From: Frantisek Holop <fholop@ripe.net>
Date: Fri, 12 Jan 2018 15:13:05 +0100
Subject: [PATCH 1/5] hidden_form_element_wrapper_html_class ->
 form_element_wrapper_hidden_html_class

---
 .../snippets/form_properties_snippet.html          |  2 +-
 .../bootstrap3/snippets/form_snippet.html          |  4 +---
 .../snippets/form_wizard_properties_snippet.html   |  2 --
 .../bootstrap3/snippets/form_wizard_snippet.html   |  2 --
 .../foundation5/snippets/form_wizard_snippet.html  |  2 --
 .../simple/snippets/form_wizard_snippet.html       |  2 --
 .../fobi/generic/snippets/form_snippet.html        | 14 ++++++++------
 .../snippets/form_wizard_properties_snippet.html   |  2 +-
 .../fobi/generic/snippets/form_wizard_snippet.html |  4 ++--
 9 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_properties_snippet.html b/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_properties_snippet.html
index 973d661b..dfebdc45 100644
--- a/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_properties_snippet.html
+++ b/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_properties_snippet.html
@@ -8,7 +8,7 @@
 
 {% block form_element_wrapper_html_class %}form-group{% endblock %}
 
-{% block hidden_form_element_error_html_class%}has-error{% endblock %}
+{% block form_element_wrapper_error_html_class %}has-error{% endblock %}
 
 {% block form_checkbox_element_field_wrapper_html_class %}col-sm-offset-2 col-sm-9{% endblock %}
 
diff --git a/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_snippet.html b/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_snippet.html
index d263d33b..886cbbf2 100644
--- a/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_snippet.html
+++ b/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_snippet.html
@@ -8,7 +8,7 @@
 
 {% block form_element_wrapper_html_class %}form-group{% endblock %}
 
-{% block form_element_wrapper_error_html_class%}has-error{% endblock %}
+{% block form_element_wrapper_error_html_class %}has-error{% endblock %}
 
 {% block form_element_label_html_class %}col-sm-3 control-label{% endblock %}
 
@@ -19,5 +19,3 @@
 {% block form_element_error_html_class %}help-block has-error{% endblock %}
 
 {% block form_element_help_text_html_class %}help-block{% endblock %}
-
-{% block hidden_form_element_wrapper_html_class %}form-group{% endblock %}
diff --git a/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_wizard_properties_snippet.html b/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_wizard_properties_snippet.html
index 3d6b7e9d..91dcdeea 100644
--- a/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_wizard_properties_snippet.html
+++ b/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_wizard_properties_snippet.html
@@ -8,8 +8,6 @@
 
 {% block form_element_wrapper_html_class %}form-group{% endblock %}
 
-{% block hidden_form_element_error_html_class%}has-error{% endblock %}
-
 {% block form_checkbox_element_field_wrapper_html_class %}col-sm-offset-2 col-sm-9{% endblock %}
 
 {% block form_element_label_html_class %}col-sm-3 control-label{% endblock %}
diff --git a/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_wizard_snippet.html b/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_wizard_snippet.html
index 79af05a9..c21629df 100644
--- a/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_wizard_snippet.html
+++ b/src/fobi/contrib/themes/bootstrap3/templates/bootstrap3/snippets/form_wizard_snippet.html
@@ -19,5 +19,3 @@
 {% block form_element_error_html_class %}help-block has-error{% endblock %}
 
 {% block form_element_help_text_html_class %}help-block{% endblock %}
-
-{% block hidden_form_element_wrapper_html_class %}form-group{% endblock %}
diff --git a/src/fobi/contrib/themes/foundation5/templates/foundation5/snippets/form_wizard_snippet.html b/src/fobi/contrib/themes/foundation5/templates/foundation5/snippets/form_wizard_snippet.html
index 79af05a9..c21629df 100644
--- a/src/fobi/contrib/themes/foundation5/templates/foundation5/snippets/form_wizard_snippet.html
+++ b/src/fobi/contrib/themes/foundation5/templates/foundation5/snippets/form_wizard_snippet.html
@@ -19,5 +19,3 @@
 {% block form_element_error_html_class %}help-block has-error{% endblock %}
 
 {% block form_element_help_text_html_class %}help-block{% endblock %}
-
-{% block hidden_form_element_wrapper_html_class %}form-group{% endblock %}
diff --git a/src/fobi/contrib/themes/simple/templates/simple/snippets/form_wizard_snippet.html b/src/fobi/contrib/themes/simple/templates/simple/snippets/form_wizard_snippet.html
index 79af05a9..c21629df 100644
--- a/src/fobi/contrib/themes/simple/templates/simple/snippets/form_wizard_snippet.html
+++ b/src/fobi/contrib/themes/simple/templates/simple/snippets/form_wizard_snippet.html
@@ -19,5 +19,3 @@
 {% block form_element_error_html_class %}help-block has-error{% endblock %}
 
 {% block form_element_help_text_html_class %}help-block{% endblock %}
-
-{% block hidden_form_element_wrapper_html_class %}form-group{% endblock %}
diff --git a/src/fobi/templates/fobi/generic/snippets/form_snippet.html b/src/fobi/templates/fobi/generic/snippets/form_snippet.html
index ea80bf5c..24b87ef8 100644
--- a/src/fobi/templates/fobi/generic/snippets/form_snippet.html
+++ b/src/fobi/templates/fobi/generic/snippets/form_snippet.html
@@ -4,18 +4,18 @@
 <div class="{% block form_required_fields_message_wrapper_class %}{% endblock %}">
   {% blocktrans %}Fields marked with <span class="required-field">*</span> are required{% endblocktrans %}
 </div>
-{% endblock form_required_fields_message_block %}
+{% endblock %}
 
 {% block form_non_field_and_hidden_errors %}
 {% get_form_hidden_fields_errors form as form_hidden_fields_errors %}
 {% if form.non_field_errors or form_hidden_fields_errors %}
   {% include fobi_theme.form_non_field_and_hidden_errors_snippet_template %}
 {% endif %}
-{% endblock form_non_field_and_hidden_errors %}
+{% endblock %}
 
 {% for field in form %}
   {% if field.is_hidden %}
-    <div class="{% block hidden_form_element_wrapper_html_class %}hidden{% endblock %}">
+    <div class="{% block form_element_wrapper_hidden_html_class %}hidden{% endblock %}">
       {{ field }}
     </div>
   {% else %}
@@ -26,9 +26,11 @@
       {% endif %}
     {% endspaceless %}">
 
-      <label class="{% block form_element_label_html_class %}{% endblock %}" for="{{ field.id_for_label }}">
-        {{ field.label }}{% if field.field.required %}<span class="{% block form_element_required_field_sign_html_class %}required-field{% endblock %}">*</span>{% endif %}
-      </label>
+      {% if field.label %}
+        <label class="{% block form_element_label_html_class %}{% endblock %}" for="{{ field.id_for_label }}">
+          {{ field.label }}{% if field.field.required %}<span class="{% block form_element_required_field_sign_html_class %}required-field{% endblock %}">*</span>{% endif %}
+        </label>
+      {% endif %}
 
       <div class="{% block form_element_field_wrapper_html_class %}{% endblock %}">
         {% get_form_field_type field as form_field_type %}
diff --git a/src/fobi/templates/fobi/generic/snippets/form_wizard_properties_snippet.html b/src/fobi/templates/fobi/generic/snippets/form_wizard_properties_snippet.html
index 0853b02a..a2a9b3bf 100644
--- a/src/fobi/templates/fobi/generic/snippets/form_wizard_properties_snippet.html
+++ b/src/fobi/templates/fobi/generic/snippets/form_wizard_properties_snippet.html
@@ -19,7 +19,7 @@
                     {% get_form_field_type field as field_type %}
                     <div class="{% spaceless %}
                                 {% block form_element_wrapper_html_class %}{% endblock %}
-                                {% if field.errors %} {% block hidden_form_element_error_html_class%}{% endblock %}{% endif %}
+                                {% if field.errors %} {% block form_element_wrapper_error_html_class %}{% endblock %}{% endif %}
                                 {% endspaceless %}">
 
                         {% if field_type.is_checkbox %}
diff --git a/src/fobi/templates/fobi/generic/snippets/form_wizard_snippet.html b/src/fobi/templates/fobi/generic/snippets/form_wizard_snippet.html
index 92697434..1a001595 100644
--- a/src/fobi/templates/fobi/generic/snippets/form_wizard_snippet.html
+++ b/src/fobi/templates/fobi/generic/snippets/form_wizard_snippet.html
@@ -18,7 +18,7 @@
             {% for field in form %}
 
                 {% if field.is_hidden %}
-                    <div class="{% block hidden_form_element_wrapper_html_class %}hidden{% endblock %}">{{ field }}</div>
+                    <div class="{% block form_element_wrapper_hidden_html_class %}hidden{% endblock %}">{{ field }}</div>
                 {% else %}
                     <div class="{% spaceless %}
                                 {% block form_element_wrapper_html_class %}form-group{% endblock %}
@@ -70,4 +70,4 @@
                     </div>
                 {% endif %}
 
-            {% endfor %}
\ No newline at end of file
+            {% endfor %}

From b8aea0a2588a37c7e24e3c5bc48224493c3d753c Mon Sep 17 00:00:00 2001
From: Frantisek Holop <fholop@ripe.net>
Date: Fri, 12 Jan 2018 15:43:54 +0100
Subject: [PATCH 2/5] content fields have no labels

---
 .../templates/fobi/generic/snippets/form_snippet.html     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/fobi/templates/fobi/generic/snippets/form_snippet.html b/src/fobi/templates/fobi/generic/snippets/form_snippet.html
index ea80bf5c..e05a8ed5 100644
--- a/src/fobi/templates/fobi/generic/snippets/form_snippet.html
+++ b/src/fobi/templates/fobi/generic/snippets/form_snippet.html
@@ -26,9 +26,11 @@
       {% endif %}
     {% endspaceless %}">
 
-      <label class="{% block form_element_label_html_class %}{% endblock %}" for="{{ field.id_for_label }}">
-        {{ field.label }}{% if field.field.required %}<span class="{% block form_element_required_field_sign_html_class %}required-field{% endblock %}">*</span>{% endif %}
-      </label>
+      {% if field.label %}
+        <label class="{% block form_element_label_html_class %}{% endblock %}" for="{{ field.id_for_label }}">
+          {{ field.label }}{% if field.field.required %}<span class="{% block form_element_required_field_sign_html_class %}required-field{% endblock %}">*</span>{% endif %}
+        </label>
+      {% endif %}
 
       <div class="{% block form_element_field_wrapper_html_class %}{% endblock %}">
         {% get_form_field_type field as form_field_type %}

From 3a8b2ec3077fb72d30b7306bf7ab96519aea96ab Mon Sep 17 00:00:00 2001
From: Artur Barseghyan <artur.barseghyan@gmail.com>
Date: Fri, 12 Jan 2018 16:55:19 +0100
Subject: [PATCH 3/5] bring back endblock block-name

---
 src/fobi/templates/fobi/generic/snippets/form_snippet.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fobi/templates/fobi/generic/snippets/form_snippet.html b/src/fobi/templates/fobi/generic/snippets/form_snippet.html
index 24b87ef8..9c495086 100644
--- a/src/fobi/templates/fobi/generic/snippets/form_snippet.html
+++ b/src/fobi/templates/fobi/generic/snippets/form_snippet.html
@@ -4,14 +4,14 @@
 <div class="{% block form_required_fields_message_wrapper_class %}{% endblock %}">
   {% blocktrans %}Fields marked with <span class="required-field">*</span> are required{% endblocktrans %}
 </div>
-{% endblock %}
+{% endblock form_required_fields_message_block %}
 
 {% block form_non_field_and_hidden_errors %}
 {% get_form_hidden_fields_errors form as form_hidden_fields_errors %}
 {% if form.non_field_errors or form_hidden_fields_errors %}
   {% include fobi_theme.form_non_field_and_hidden_errors_snippet_template %}
 {% endif %}
-{% endblock %}
+{% endblock form_non_field_and_hidden_errors %}
 
 {% for field in form %}
   {% if field.is_hidden %}

From 91d4d72298c5b284688dcfa0727bdbf82e348f3b Mon Sep 17 00:00:00 2001
From: Artur Barseghyan <artur.barseghyan@gmail.com>
Date: Sat, 13 Jan 2018 21:13:43 +0100
Subject: [PATCH 4/5] clean up js and html

---
 src/fobi/static/js/fobi.core.js                         | 9 ---------
 src/fobi/templates/fobi/generic/snippets/form_ajax.html | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/fobi/static/js/fobi.core.js b/src/fobi/static/js/fobi.core.js
index 3deeeb56..5f2bdca9 100644
--- a/src/fobi/static/js/fobi.core.js
+++ b/src/fobi/static/js/fobi.core.js
@@ -87,15 +87,6 @@ FobiCore.prototype = {
 };
 
 
-/**
- * Replaces "-" with "_". For the rest is the jQuery-Slugify-Plugin package is used.
- * @param <string> str:
- * @return <string>
- */
-//var fobiSlugify = function(str) {
-//    return str.replace(/[\-]+/g, '_');
-//};
-
 var fobiCore = new FobiCore();
 
 $(document).ready(function() {
diff --git a/src/fobi/templates/fobi/generic/snippets/form_ajax.html b/src/fobi/templates/fobi/generic/snippets/form_ajax.html
index 7d56a003..66153fd9 100644
--- a/src/fobi/templates/fobi/generic/snippets/form_ajax.html
+++ b/src/fobi/templates/fobi/generic/snippets/form_ajax.html
@@ -6,7 +6,7 @@
 </div>
 {% endblock %}
 
-<form method="{% block form_method %}post{% endblock %}" action="{% block form_action %}{% if form_entry.action %}{{ form_entry.action }}{% else %}{{ request.path }}{% endif %}{% endblock %}" {% block form_enctype %}enctype="multipart/form-data"{% endblock %} class="{% block form_html_class %}{% endblock %}" {% block form_extra_attrs %}{% endblock %}>
+<form method="{% block form_method %}post{% endblock %}" action="{% block form_action %}{{ form_entry.action|default:request.path }}{% endblock %}" {% block form_enctype %}enctype="multipart/form-data"{% endblock %} class="{% block form_html_class %}{% endblock %}" {% block form_extra_attrs %}{% endblock %}>
   {% csrf_token %}
   {% include fobi_theme.form_snippet_template_name %}
   <div class="{% block form_button_outer_wrapper_html_class %}{% endblock %}">

From ed0188ffd0ed2d47f68a6dcd56e38aa8f555c661 Mon Sep 17 00:00:00 2001
From: Artur Barseghyan <artur.barseghyan@gmail.com>
Date: Sat, 13 Jan 2018 21:21:16 +0100
Subject: [PATCH 5/5] changelog updated

---
 CHANGELOG.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2bac723b..67d4155d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -15,6 +15,17 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.12.15
+--------
+2018-mm-dd (not yet released)
+
+- Minor clean up of HTML templates (in some templates
+  ``hidden_form_element_wrapper_html_class`` was used while others
+  ``form_element_wrapper_hidden_html_class``). Now
+  ``form_element_wrapper_hidden_html_class`` is used everywhere. Some HTML
+  files have been re-indented (2 spaces).
+- Minor clean up of JS.
+
 0.12.14
 --------
 2018-01-10