Move all admin forms to new template tags

misago/admin/templatetags/misago_admin_form.py

@@ -5,7 +5,7 @@ register = template.Library()
 
 
 @register.inclusion_tag("misago/admin/form/row.html")
-def admin_form_row(field, label_class, field_class):
+def form_row(field, label_class=None, field_class=None):
     return {
         "field": field,
         "label_class": label_class,
@@ -14,7 +14,7 @@ def admin_form_row(field, label_class, field_class):
 
 
 @register.inclusion_tag("misago/admin/form/input.html")
-def admin_form_input(field):
+def form_input(field):
     attrs = field.field.widget.attrs
     context = field.field.widget.get_context(field.html_name, field.value(), attrs)
     context["attrs"] = attrs

misago/templates/misago/admin/agreements/form.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/agreements/list.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load i18n misago_capture misago_admin_forms %}
+{% load i18n misago_capture misago_admin_form %}
 
 
 {% block page-actions %}

misago/templates/misago/admin/attachments/list.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load i18n misago_capture misago_admin_forms %}
+{% load i18n misago_capture misago_admin_form %}
 
 
 {% block table-header %}

misago/templates/misago/admin/attachmenttypes/form.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/bans/form.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/bans/list.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block page-actions %}

misago/templates/misago/admin/categories/delete.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load crispy_forms_filters i18n %}
+{% load misago_admin_form i18n %}
 
 
 {% block title %}
@@ -19,7 +19,7 @@ Delete category: {{ category }}
 {% block form-header %}
 <h1>
   {% blocktrans with category=target.name %}
-  Delete category: {{ category }}
+    Delete category: {{ category }}
   {% endblocktrans %}
 </h1>
 {% endblock %}
@@ -31,9 +31,9 @@ Delete category: {{ category }}
     <legend>{% trans "Category contents" %}</legend>
 
     {% if not form.instance.is_leaf_node %}
-    {{ form.move_children_to|as_crispy_field }}
+      {% form_row form.move_children_to %}
     {% endif %}
-    {{ form.move_threads_to|as_crispy_field }}
+    {% form_row form.move_threads_to %}
 
   </fieldset>
 </div>

misago/templates/misago/admin/categories/form.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/categoryroles/categoryroles.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load crispy_forms_field i18n %}
+{% load misago_admin_form i18n %}
 
 
 {% block title %}
@@ -36,7 +36,7 @@
           {{ form.role }}
         </td>
         <td>
-          {% crispy_field form.category_role %}
+          {% form_input form.category_role %}
         </td>
       </tr>
       {% endfor %}

misago/templates/misago/admin/categoryroles/form.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/categoryroles/rolecategories.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load crispy_forms_field i18n %}
+{% load misago_admin_form i18n %}
 
 
 {% block title %}
@@ -39,7 +39,7 @@
           {{ form.category }}
         </td>
         <td>
-          {% crispy_field form.role %}
+          {% form_input form.role %}
         </td>
       </tr>
       {% endfor %}

misago/templates/misago/admin/conf/group.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/conf/index.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}{% trans active_group.name %} | {{ block.super }}{% endblock %}

misago/templates/misago/admin/datadownloads/form.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/datadownloads/list.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load i18n misago_avatars misago_admin_forms %}
+{% load i18n misago_avatars misago_admin_form %}
 
 
 {% block page-actions %}

misago/templates/misago/admin/form/radio_select.html

@@ -1,7 +1,7 @@
 {% load misago_admin_form %}
 {% for option in field|get_options %}
   <label class="radio">
-    <input {% render_attrs widget %} id="{{ option.attrs.id }}" name="{{ widget.name }}" type="radio"{% if option.value is not None %} value="{{ option.value }}"{% endif %}{% if option.selected %} checked{% endif %}>
+    <input {% render_attrs widget class_name="form-control" %} id="{{ option.attrs.id }}" name="{{ widget.name }}" type="radio"{% if option.value is not None %} value="{{ option.value }}"{% endif %}{% if option.selected %} checked{% endif %}>
     {{ option.label }}
   </label>
 {% endfor %}

misago/templates/misago/admin/form/row.html

@@ -3,8 +3,8 @@
   <label for="{{ field.id_for_label }}" class="control-label{% if label_class %} {{ label_class }}{% endif %}">
     {{ field.label }}:
   </label>
-  <div class="{% if field|is_radio_select_field %}controls control-radioselect {% endif %}{% if field|is_multiple_choice_field %}controls control-checkboxselect {% endif %}{{ field_class }}">
-    {% admin_form_input field %}
+  <div class="{% if field|is_radio_select_field %}controls control-radioselect {% endif %}{% if field|is_multiple_choice_field %}controls control-checkboxselect {% endif %}{% if field_class %}{{ field_class }}{% endif %}">
+    {% form_input field %}
     {% for error in field.errors %}
       <div class="text-danger">
         <strong>{{ error }}</strong>

misago/templates/misago/admin/permissions_table.html

@@ -1,4 +1,4 @@
-{% load crispy_forms_field crispy_forms_tags i18n %}
+{% load misago_admin_form i18n %}
 <fieldset>
   <legend>{{ form.legend }}</legend>
 
@@ -16,16 +16,12 @@
       </td>
       <td>
         <div class="form-group{% if field.errors %} has-error{% endif %}">
-          {% if field|is_checkboxselectmultiple %}
-            {% include 'bootstrap3/layout/checkboxselectmultiple.html' %}
-          {% endif %}
-
-          {% if field|is_radioselect %}
-            {% include 'bootstrap3/layout/radioselect.html' with hide_help_text=1 %}
-          {% endif %}
-
-          {% if not field|is_checkboxselectmultiple and not field|is_radioselect %}
-          {% crispy_field field %}
+          {% if field|is_radio_select_field %}
+            <div class="controls control-radioselect">
+              {% form_input field %}
+            </div>
+          {% else %}
+            {% form_input field %}
           {% endif %}
         </div>
       </td>

misago/templates/misago/admin/ranks/form.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/roles/form.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/users/ban.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_avatars misago_capture misago_admin_forms %}
+{% load i18n misago_avatars misago_capture misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/users/delete.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_avatars misago_capture misago_admin_forms %}
+{% load i18n misago_avatars misago_capture misago_admin_form %}
 
 
 {% block title %}

misago/templates/misago/admin/users/edit.html

@@ -30,17 +30,17 @@ class="form-horizontal"
   <fieldset>
     <legend>{% trans "Basic account settings" %}</legend>
 
-    {% admin_form_row form.username label_class field_class %}
+    {% form_row form.username label_class field_class %}
 
     {% if 'rank' in form.fields %}
-      {% admin_form_row form.rank label_class field_class %}
+      {% form_row form.rank label_class field_class %}
     {% endif %}
 
-    {% admin_form_row form.title label_class field_class %}
-    {% admin_form_row form.roles label_class field_class %}
+    {% form_row form.title label_class field_class %}
+    {% form_row form.roles label_class field_class %}
 
     {% if 'staff_level' in form.fields %}
-      {% admin_form_row form.staff_level label_class field_class %}
+      {% form_row form.staff_level label_class field_class %}
     {% endif %}
 
   </fieldset>
@@ -48,8 +48,8 @@ class="form-horizontal"
     <legend>{% trans "Administrator status" %}</legend>
 
     {% if 'is_staff' in form.fields %}
-      {% admin_form_row form.is_staff label_class field_class %}
-      {% admin_form_row form.is_superuser label_class field_class %}
+      {% form_row form.is_staff label_class field_class %}
+      {% form_row form.is_superuser label_class field_class %}
     {% else %}
       <div id="div_id_is_staff" class="form-group">
         <label for="id_is_staff_0" class="control-label {{ label_class }}">
@@ -95,8 +95,8 @@ class="form-horizontal"
   <fieldset>
     <legend>{% trans "Sign-in credentials" %}</legend>
 
-    {% admin_form_row form.email label_class field_class %}
-    {% admin_form_row form.new_password label_class field_class %}
+    {% form_row form.email label_class field_class %}
+    {% form_row form.new_password label_class field_class %}
 
     {% if not target.has_usable_password %}
       <div id="div_id_has_usable_password" class="form-group">
@@ -112,18 +112,18 @@ class="form-horizontal"
   <fieldset>
     <legend>{% trans "Avatar" %}</legend>
 
-    {% admin_form_row form.is_avatar_locked label_class field_class %}
-    {% admin_form_row form.avatar_lock_user_message label_class field_class %}
-    {% admin_form_row form.avatar_lock_staff_message label_class field_class %}
+    {% form_row form.is_avatar_locked label_class field_class %}
+    {% form_row form.avatar_lock_user_message label_class field_class %}
+    {% form_row form.avatar_lock_staff_message label_class field_class %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Signature" %}</legend>
 
-    {% admin_form_row form.signature label_class field_class %}
-    {% admin_form_row form.is_signature_locked label_class field_class %}
-    {% admin_form_row form.signature_lock_user_message label_class field_class %}
-    {% admin_form_row form.signature_lock_staff_message label_class field_class %}
+    {% form_row form.signature label_class field_class %}
+    {% form_row form.is_signature_locked label_class field_class %}
+    {% form_row form.signature_lock_user_message label_class field_class %}
+    {% form_row form.signature_lock_staff_message label_class field_class %}
 
   </fieldset>
   {% for group in form.get_profile_fields_groups %}
@@ -131,7 +131,7 @@ class="form-horizontal"
       <legend>{% trans group.name %}</legend>
 
       {% for field in group.fields %}
-        {% admin_form_row field label_class field_class %}
+        {% form_row field label_class field_class %}
       {% endfor %}
 
     </fieldset>
@@ -139,15 +139,15 @@ class="form-horizontal"
   <fieldset>
     <legend>{% trans "Forum options" %}</legend>
 
-    {% admin_form_row form.is_hiding_presence label_class field_class %}
-    {% admin_form_row form.limits_private_thread_invites_to label_class field_class %}
+    {% form_row form.is_hiding_presence label_class field_class %}
+    {% form_row form.limits_private_thread_invites_to label_class field_class %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Automatic subscription preferences" %}</legend>
 
-    {% admin_form_row form.subscribe_to_started_threads label_class field_class %}
-    {% admin_form_row form.subscribe_to_replied_threads label_class field_class %}
+    {% form_row form.subscribe_to_started_threads label_class field_class %}
+    {% form_row form.subscribe_to_replied_threads label_class field_class %}
 
   </fieldset>
   <fieldset>
@@ -171,8 +171,8 @@ class="form-horizontal"
       </div>
     {% else %}
       {% if 'is_active' in form.fields %}
-        {% admin_form_row form.is_active label_class field_class %}
-        {% admin_form_row form.is_active_staff_message label_class field_class %}
+        {% form_row form.is_active label_class field_class %}
+        {% form_row form.is_active_staff_message label_class field_class %}
       {% else %}
         <div id="div_id_is_active" class="form-group">
           <label for="id_is_active_0" class="control-label {{ label_class }}">

misago/templates/misago/admin/users/list.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load i18n misago_avatars misago_admin_forms %}
+{% load i18n misago_avatars misago_admin_form %}
 
 
 {% block page-actions %}

misago/templates/misago/admin/users/new.html

@@ -30,25 +30,25 @@ class="form-horizontal"
   <fieldset>
     <legend>{% trans "Basic account settings" %}</legend>
 
-    {% admin_form_row form.username label_class field_class %}
+    {% form_row form.username label_class field_class %}
 
     {% if 'rank' in form.fields %}
-      {% admin_form_row form.rank label_class field_class %}
+      {% form_row form.rank label_class field_class %}
     {% endif %}
 
-    {% admin_form_row form.title label_class field_class %}
-    {% admin_form_row form.roles label_class field_class %}
+    {% form_row form.title label_class field_class %}
+    {% form_row form.roles label_class field_class %}
 
     {% if 'staff_level' in form.fields %}
-      {% admin_form_row form.staff_level label_class field_class %}
+      {% form_row form.staff_level label_class field_class %}
     {% endif %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Sign-in credentials" %}</legend>
 
-    {% admin_form_row form.email label_class field_class %}
-    {% admin_form_row form.new_password label_class field_class %}
+    {% form_row form.email label_class field_class %}
+    {% form_row form.new_password label_class field_class %}
 
   </fieldset>
   {% endwith %}

misago/templates/misago/admin/warnings/form.html

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load i18n misago_admin_forms %}
+{% load i18n misago_admin_form %}
 
 
 {% block title %}