Update edit/create category/user role admin forms

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

@@ -6,40 +6,38 @@
 {% if target.pk %}
   {{ target }}
 {% else %}
-  {% trans "New role" %}
+  {% trans "New category role" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
 {% endblock title %}
 
 
-{% block form-header %}
-<h1>
-  {% if target.pk %}
+{% block page-header %}
+{{ block.super }}
+{% if target.pk %}
+  <small>
     {{ target }}
-  {% else %}
-    {% trans "New role" %}
-  {% endif %}
-</h1>
-{% endblock %}
+  </small>
+{% endif %}
+{% endblock page-header %}
 
 
-{% block form-extra %}
-class="form-horizontal"
-{% endblock form-extra %}
+{% block form-header %}
+{% if target.pk %}
+  {% trans "Edit category role" %}
+{% else %}
+  {% trans "New category role" %}
+{% endif %}
+{% endblock %}
 
 
 {% block form-body %}
-<div class="form-body">
+<div class="form-fieldset">
   <fieldset>
     <legend>{% trans "Basic settings" %}</legend>
-    {% form_row form.name "col-md-3" "col-md-9" %}
+    {% form_row form.name %}
   </fieldset>
-  {% for form in perms_forms %}
-    {% include "misago/admin/permissions_table.html" %}
-  {% endfor %}
 </div>
+{% for form in perms_forms %}
+  {% include "misago/admin/permissions_table.html" %}
+{% endfor %}
 {% endblock form-body %}
-
-
-{% block form-footer-class %}
-col-md-offset-3
-{% endblock form-footer-class %}

misago/templates/misago/admin/permissions_table.html

@@ -1,32 +1,9 @@
 {% load i18n misago_admin_form %}
-<fieldset>
-  <legend>{{ form.legend }}</legend>
-
-  <table class="table table-striped table-permissions">
+<div class="form-fieldset">
+  <fieldset>
+    <legend>{{ form.legend }}</legend>
     {% for field in form %}
-      <tr{% if field.errors %} class="text-danger"{% endif %}>
-        <td class="col-md-8">
-          <label>{{ field.label }}:</label>
-          {% for error in field.errors %}
-            <p class="small"><strong>{{ error }}</strong></p>
-          {% endfor %}
-          {% if field.help_text %}
-            <p class="text-muted small">{{ field.help_text }}</p>
-          {% endif %}
-        </td>
-        <td>
-          <div class="form-group{% if field.errors %} has-error{% endif %}">
-            {% if field|is_radio_select_field %}
-              <div class="controls control-radioselect">
-                {% form_input field %}
-              </div>
-            {% else %}
-              {% form_input field %}
-            {% endif %}
-          </div>
-        </td>
-      </tr>
+      {% form_row field %}
     {% endfor %}
-  </table>
-
-</fieldset>
+  </fieldset>
+</div>

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

@@ -11,35 +11,33 @@
 {% endblock title %}
 
 
-{% block form-header %}
-<h1>
-  {% if target.pk %}
+{% block page-header %}
+{{ block.super }}
+{% if target.pk %}
+  <small>
     {{ target }}
-  {% else %}
-    {% trans "New role" %}
-  {% endif %}
-</h1>
-{% endblock %}
+  </small>
+{% endif %}
+{% endblock page-header %}
 
 
-{% block form-extra %}
-class="form-horizontal"
-{% endblock form-extra %}
+{% block form-header %}
+{% if target.pk %}
+  {% trans "Edit role" %}
+{% else %}
+  {% trans "New role" %}
+{% endif %}
+{% endblock %}
 
 
 {% block form-body %}
-<div class="form-body">
+<div class="form-fieldset">
   <fieldset>
     <legend>{% trans "Basic settings" %}</legend>
-    {% form_row form.name "col-md-3" "col-md-9" %}
+    {% form_row form.name %}
   </fieldset>
-  {% for form in perms_forms %}
-    {% include "misago/admin/permissions_table.html" %}
-  {% endfor %}
 </div>
+{% for form in perms_forms %}
+  {% include "misago/admin/permissions_table.html" %}
+{% endfor %}
 {% endblock form-body %}
-
-
-{% block form-footer-class %}
-col-md-offset-3
-{% endblock form-footer-class %}