Moved more admin forms to misago_forms

misago/core/migrations/0002_basic_settings.py

@@ -27,7 +27,7 @@ def create_basic_settings_group(apps, schema_editor):
                 },
                 {
                     'setting': 'forum_index_title',
-                    'name': _("Forum index title"),
+                    'name': _("Index title"),
                     'description': _("You may set custon title on "
                                      "forum index by typing it here."),
                     'legend': _("Forum index"),
@@ -37,7 +37,7 @@ def create_basic_settings_group(apps, schema_editor):
                 },
                 {
                     'setting': 'forum_index_meta_description',
-                    'name': _("Forum index Meta Description"),
+                    'name': _("Meta Description"),
                     'description': _("Short description of your forum "
                                      "for internet crawlers."),
                     'field_extra': {

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

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load crispy_forms_filters i18n %}
+{% load i18n misago_forms %}
 
 
 {% block title %}
@@ -31,27 +31,39 @@
 {% endblock %}
 
 
+{% block form-extra %}
+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 "Ban settings" %}</legend>
 
-    {{ form.test|as_crispy_field }}
-    {{ form.banned_value|as_crispy_field }}
-    {{ form.valid_until|as_crispy_field }}
+    {% form_row form.test label_class field_class %}
+    {% form_row form.banned_value label_class field_class %}
+    {% form_row form.valid_until label_class field_class %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Messages" %}</legend>
 
-    {{ form.user_message|as_crispy_field }}
-    {{ form.staff_message|as_crispy_field }}
+    {% form_row form.user_message label_class field_class %}
+    {% form_row form.staff_message label_class field_class %}
 
   </fieldset>
+  {% endwith %}
 </div>
 {% endblock form-body %}
 
 
+{% block form-footer-class %}
+col-md-offset-3
+{% endblock form-footer-class %}
+
+
 {% block javascripts %}
 <script type="text/javascript">
   $(function() {

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

@@ -1,5 +1,5 @@
 {% extends "misago/admin/conf/index.html" %}
-{% load crispy_forms_filters i18n %}
+{% load i18n misago_forms %}
 
 
 {% block title %}{% trans active_group.name %} | {{ block.super }}{% endblock %}
@@ -19,7 +19,7 @@
 
 {% block action %}
 <div class="form-panel">
-  <form role="form" method="post">
+  <form role="form" method="post" class="form-horizontal">
     {% csrf_token %}
 
     <div class="form-header">
@@ -29,32 +29,40 @@
       {% endif %}
     </div>
 
-    {% if use_single_form_template %}
-    <div class="form-body no-fieldsets">
-      {% for field in fieldsets.0.form %}
-      {{ field|as_crispy_field }}
-      {% endfor %}
-    </div>
-    {% else %}
-    <div class="form-body">
-      {% for fieldset in fieldsets %}
-      <fieldset>
-        {% if fieldset.legend %}
-        <legend>{% trans fieldset.legend %}</legend>
-        {% endif %}
-
-        {% for field in fieldset.form %}
-        {{ field|as_crispy_field }}
+    {% with label_class="col-md-3" field_class="col-md-9" %}
+      {% if use_single_form_template %}
+      <div class="form-body no-fieldsets">
+        {% for field in fieldsets.0.form %}
+        {% form_row field label_class field_class %}
         {% endfor %}
+      </div>
+      {% else %}
+      <div class="form-body">
+        {% for fieldset in fieldsets %}
+        <fieldset>
+          {% if fieldset.legend %}
+          <legend>{% trans fieldset.legend %}</legend>
+          {% endif %}
 
-      </fieldset>
-      {% endfor %}
-    </div>
-    {% endif %}
+          {% for field in fieldset.form %}
+          {% form_row field label_class field_class %}
+          {% endfor %}
+
+        </fieldset>
+        {% endfor %}
+      </div>
+      {% endif %}
+    {% endwith %}
 
     <div class="form-footer">
-      <button class="btn btn-primary">{% trans "Change settings" %}</button>
-      <a href="{% url 'misago:admin:settings:index' %}" class="btn btn-default">{% trans "Cancel" %}</a>
+      <div class="row">
+        <div class="col-md-offset-3">
+
+          <button class="btn btn-primary">{% trans "Change settings" %}</button>
+          <a href="{% url 'misago:admin:settings:index' %}" class="btn btn-default">{% trans "Cancel" %}</a>
+
+        </div>
+      </div>
     </div>
 
   </form>

misago/templates/misago/admin/forums/form.html

@@ -73,3 +73,8 @@ class="form-horizontal"
   {% endwith %}
 </div>
 {% endblock form-body %}
+
+
+{% block form-footer-class %}
+col-md-offset-3
+{% endblock form-footer-class %}

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

@@ -1,5 +1,5 @@
 {% extends "misago/admin/generic/form.html" %}
-{% load crispy_forms_filters i18n %}
+{% load i18n misago_forms %}
 
 
 {% block title %}
@@ -31,29 +31,41 @@
 {% endblock %}
 
 
+{% block form-extra %}
+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 "Name and description" %}</legend>
 
-    {{ form.name|as_crispy_field }}
-    {{ form.title|as_crispy_field }}
-    {{ form.description|as_crispy_field }}
+    {% form_row form.name label_class field_class %}
+    {% form_row form.title label_class field_class %}
+    {% form_row form.description label_class field_class %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Permissions" %}</legend>
 
-    {{ form.roles|as_crispy_field }}
+    {% form_row form.roles label_class field_class %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Display and visibility" %}</legend>
 
-    {{ form.css_class|as_crispy_field }}
-    {{ form.is_tab|as_crispy_field }}
-    {{ form.is_on_index|as_crispy_field }}
+    {% form_row form.css_class label_class field_class %}
+    {% form_row form.is_tab label_class field_class %}
+    {% form_row form.is_on_index 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/warnings/form.html

@@ -42,21 +42,21 @@ class="form-horizontal"
   <fieldset>
     <legend>{% trans "Name and description" %}</legend>
 
-      {% form_row form.name label_class field_class %}
-      {% form_row form.description label_class field_class %}
+    {% form_row form.name label_class field_class %}
+    {% form_row form.description label_class field_class %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Expiration time" %}</legend>
 
-      {% form_row form.expires_after_minutes label_class field_class %}
+    {% form_row form.expires_after_minutes label_class field_class %}
 
   </fieldset>
   <fieldset>
     <legend>{% trans "Restrictions" %}</legend>
 
-      {% form_row form.restricts_posting_replies label_class field_class %}
-      {% form_row form.restricts_posting_threads label_class field_class %}
+    {% form_row form.restricts_posting_replies label_class field_class %}
+    {% form_row form.restricts_posting_threads label_class field_class %}
 
   </fieldset>
   {% endwith %}

misago/users/forms/admin.py

@@ -223,7 +223,7 @@ class RankForm(forms.ModelForm):
     roles = forms.ModelMultipleChoiceField(
         label=_("User roles"), queryset=Role.objects.order_by('name'),
         required=False,  widget=forms.CheckboxSelectMultiple,
-        help_text=_('Rank can give users with it additional roles.'))
+        help_text=_('Rank can give additional roles to users with it.'))
     css_class = forms.CharField(
         label=_("CSS class"), required=False,
         help_text=_("Optional css class added to content belonging to this "
@@ -275,19 +275,21 @@ class BanForm(forms.ModelForm):
             'max_length': _("Banned value can't be longer than 250 characters.")
         })
     user_message = forms.CharField(
-        label=_("Optional message for user"), required=False, max_length=1000,
+        label=_("User message"), required=False, max_length=1000,
+        help_text=_("Optional message displayed instead of default one."),
         widget=forms.Textarea(attrs={'rows': 3}),
         error_messages={
             'max_length': _("Message can't be longer than 1000 characters.")
         })
     staff_message = forms.CharField(
-        label=_("Optional message for team"), required=False, max_length=1000,
+        label=_("Team message"), required=False, max_length=1000,
+        help_text=_("Optional ban message for moderators and administrators."),
         widget=forms.Textarea(attrs={'rows': 3}),
         error_messages={
             'max_length': _("Message can't be longer than 1000 characters.")
         })
     valid_until = forms.DateField(
-        label=_("Optional expiration date for this ban"),
+        label=_("Expiration date"),
         required=False, input_formats=['%m-%d-%Y'],
         widget=forms.DateInput(
             format='%m-%d-%Y', attrs={'data-date-format': 'MM-DD-YYYY'}),

misago/users/migrations/0002_users_settings.py

@@ -43,7 +43,8 @@ def create_users_settings_group(apps, schema_editor):
                 },
                 {
                     'setting': 'username_length_min',
-                    'name': _("Minimal allowed username length"),
+                    'name': _("Minimum length"),
+                    'description': _("Minimum allowed username length."),
                     'legend': _("User names"),
                     'python_type': 'int',
                     'value': 3,
@@ -54,7 +55,8 @@ def create_users_settings_group(apps, schema_editor):
                 },
                 {
                     'setting': 'username_length_max',
-                    'name': _("Maximal allowed username length"),
+                    'name': _("Maximum length"),
+                    'description': _("Maximum allowed username length."),
                     'python_type': 'int',
                     'value': 14,
                     'field_extra': {
@@ -64,7 +66,8 @@ def create_users_settings_group(apps, schema_editor):
                 },
                 {
                     'setting': 'password_length_min',
-                    'name': _("Minimum user password length"),
+                    'name': _("Minimum length"),
+                    'description': _("Minimum allowed user password length."),
                     'legend': _("Passwords"),
                     'python_type': 'int',
                     'value': 5,
@@ -114,7 +117,7 @@ def create_users_settings_group(apps, schema_editor):
                 },
                 {
                     'setting': 'subscribe_start',
-                    'name': _("Subscribe to started threads"),
+                    'name': _("Started threads"),
                     'legend': _("Default subscriptions settings"),
                     'value': 'watch_email',
                     'form_field': 'select',
@@ -130,7 +133,7 @@ def create_users_settings_group(apps, schema_editor):
                 },
                 {
                     'setting': 'subscribe_reply',
-                    'name': _("Subscribe to replied threads"),
+                    'name': _("Replied threads"),
                     'value': 'watch_email',
                     'form_field': 'select',
                     'field_extra': {