All admin forms are misago_forms based now.

misago/core/templatetags/misago_forms.py

@@ -42,8 +42,16 @@ def form_row(parser, token):
 class FormRowNode(template.Node):
     def __init__(self, form_field, label_class, field_class):
         self.form_field = template.Variable(form_field)
-        self.label_class = template.Variable(label_class)
-        self.field_class = template.Variable(field_class)
+
+        if label_class:
+            self.label_class = template.Variable(label_class)
+        else:
+            self.label_class = None
+
+        if field_class:
+            self.field_class = template.Variable(field_class)
+        else:
+            self.field_class = None
 
     def render(self, context):
         field = self.form_field.resolve(context)

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

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load crispy_forms_tags i18n %}
+{% load i18n misago_forms %}
 
 
 {% block page-actions %}
@@ -100,15 +100,15 @@
 {% block modal-body %}
 <div class="row">
   <div class="col-md-6">
-    {{ search_form.test|as_crispy_field }}
+    {% form_row search_form.test %}
   </div>
   <div class="col-md-6">
-    {{ search_form.value|as_crispy_field }}
+    {% form_row search_form.value %}
   </div>
 </div>
 <div class="row">
   <div class="col-md-12">
-    {{ search_form.state|as_crispy_field }}
+    {% form_row search_form.state %}
   </div>
 </div>
 {% endblock modal-body %}

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

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load crispy_forms_tags i18n %}
+{% load i18n misago_forms %}
 
 
 {% block title %}
@@ -23,31 +23,39 @@
 class="form-horizontal"
 {% endblock form-extra%}
 
+
 {% block form-body %}
 <div class="form-body">
+  {% with label_class="col-md-3" field_class="col-md-9" %}
   <fieldset>
     <legend>{% trans "Basic account settings" %}</legend>
 
-    {{ form.username|as_crispy_field }}
+    {% form_row form.username label_class field_class %}
 
     {% if 'rank' in form.fields %}
-    {{ form.rank|as_crispy_field }}
+    {% form_row form.rank label_class field_class %}
     {% endif %}
 
-    {{ form.title|as_crispy_field }}
-    {{ form.roles|as_crispy_field }}
+    {% form_row form.title label_class field_class %}
+    {% form_row form.roles label_class field_class %}
 
     {% if 'staff_level' in form.fields %}
-    {{ form.staff_level|as_crispy_field }}
+    {% form_row form.staff_level label_class field_class %}
     {% endif %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Sign-in credentials" %}</legend>
 
-    {{ form.email|as_crispy_field }}
-    {{ form.new_password|as_crispy_field }}
+    {% form_row form.email label_class field_class %}
+    {% form_row form.new_password label_class field_class %}
 
   </fieldset>
+  {% endwith %}
 </div>
 {% endblock form-body %}
+
+
+{% block form-footer-class %}
+col-md-offset-3
+{% endblock form-footer-class %}

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

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/list.html" %}
-{% load crispy_forms_tags i18n misago_avatars %}
+{% load i18n misago_avatars misago_forms %}
 
 
 {% block page-actions %}
@@ -94,26 +94,26 @@
 {% block modal-body %}
 <div class="row">
   <div class="col-md-6">
-    {{ search_form.username|as_crispy_field }}
+    {% form_row search_form.username %}
   </div>
   <div class="col-md-6">
-    {{ search_form.email|as_crispy_field }}
+    {% form_row search_form.email %}
   </div>
 </div>
 <div class="row">
   <div class="col-md-6">
-    {{ search_form.rank|as_crispy_field }}
+    {% form_row search_form.rank %}
   </div>
   <div class="col-md-6">
-    {{ search_form.role|as_crispy_field }}
+    {% form_row search_form.role %}
   </div>
 </div>
 <div class="row">
   <div class="col-md-6">
-    {{ search_form.inactive|as_crispy_field }}
+    {% form_row search_form.inactive %}
   </div>
   <div class="col-md-6">
-    {{ search_form.is_staff|as_crispy_field }}
+    {% form_row search_form.is_staff %}
   </div>
 </div>
 {% endblock modal-body %}

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

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load crispy_forms_tags i18n %}
+{% load i18n misago_forms %}
 
 
 {% block title %}
@@ -23,36 +23,44 @@
 class="form-horizontal"
 {% endblock form-extra%}
 
+
 {% block form-body %}
 <div class="form-body">
+  {% with label_class="col-md-3" field_class="col-md-9" %}
   <fieldset>
     <legend>{% trans "Basic account settings" %}</legend>
 
-    {{ form.username|as_crispy_field }}
+    {% form_row form.username label_class field_class %}
 
     {% if 'rank' in form.fields %}
-    {{ form.rank|as_crispy_field }}
+    {% form_row form.rank label_class field_class %}
     {% endif %}
 
-    {{ form.title|as_crispy_field }}
-    {{ form.roles|as_crispy_field }}
+    {% form_row form.title label_class field_class %}
+    {% form_row form.roles label_class field_class %}
 
     {% if 'staff_level' in form.fields %}
-    {{ form.staff_level|as_crispy_field }}
+    {% form_row form.staff_level label_class field_class %}
     {% endif %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Sign-in credentials" %}</legend>
 
-    {{ form.email|as_crispy_field }}
-    {{ form.new_password|as_crispy_field }}
+    {% form_row form.email label_class field_class %}
+    {% form_row form.new_password label_class field_class %}
 
   </fieldset>
+  {% endwith %}
 </div>
 {% endblock form-body %}
 
 
+{% block form-footer-class %}
+col-md-offset-3
+{% endblock form-footer-class %}
+
+
 {% block form-footer %}
 <button class="btn btn-primary">{% trans "Save user" %}</button>
 {% endblock form-footer %}

misago/users/forms/admin.py

@@ -92,7 +92,7 @@ def UserFormFactory(FormType, instance):
     extra_fields['roles'] = forms.ModelMultipleChoiceField(
         label=_("Roles"),
         help_text=_('Individual roles of this user. '
-                    'All users have "member" role.'),
+                    'All users must have "member" role.'),
         queryset=roles,
         initial=instance.roles.all() if instance.pk else None,
         widget=forms.CheckboxSelectMultiple)