Browse Source

Update ranks and datadownloads admin forms

rafalp 6 years ago
parent
commit
ec0647ccab

+ 4 - 16
misago/templates/misago/admin/datadownloads/form.html

@@ -8,24 +8,12 @@
 
 
 {% block form-header %}
-<h1>{% trans "Request new data downloads" %}</h1>
+{% trans "Request new data downloads" %}
 {% endblock %}
 
 
-{% block form-extra %}
-class="form-horizontal"
-{% endblock form-extra %}
-
-
 {% block form-body %}
-<div class="form-body">
-  <fieldset>
-    {% form_row form.user_identifiers %}
-  </fieldset>
-</div>
+<fieldset>
+  {% form_row form.user_identifiers %}
+</fieldset>
 {% endblock form-body %}
-
-
-{% block form-footer-class %}
-col-md-offset-3
-{% endblock form-footer-class %}

+ 45 - 33
misago/templates/misago/admin/ranks/form.html

@@ -11,51 +11,63 @@
 {% endblock title %}
 
 
-{% block form-header %}
-<h1>
-  {% if target.pk %}
+{% block page-header %}
+{{ block.super }}
+{% if target.pk %}
+  <small>
     {{ target }}
-  {% else %}
-    {% trans "New rank" %}
-  {% endif %}
-</h1>
+  </small>
+{% endif %}
+{% endblock page-header %}
+
+
+{% block page-actions %}
+{% if target.pk and target.is_tab %}
+  <div class="col-auto page-action">
+    <a href="{{ target.get_absolute_url }}" class="btn btn-primary btn-sm">
+      <span class="fas fa-external-link-alt"></span>
+      {% trans "View on site" %}
+    </a>
+  </div>
+{% endif %}
 {% endblock %}
 
 
-{% block form-extra %}
-class="form-horizontal"
-{% endblock form-extra %}
+{% block form-header %}
+{% if target.pk %}
+  {% trans "Edit rank" %}
+{% else %}
+  {% trans "New rank" %}
+{% endif %}
+{% endblock %}
 
 
 {% 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>
+<div class="form-fieldset">
+  <fieldset>
+    <legend>{% trans "Name and description" %}</legend>
 
-      {% form_row form.name label_class field_class %}
-      {% form_row form.title label_class field_class %}
-      {% form_row form.description label_class field_class %}
+    {% form_row form.name %}
+    {% form_row form.title %}
+    {% form_row form.description %}
 
-    </fieldset>
-    <fieldset>
-      <legend>{% trans "Permissions" %}</legend>
+  </fieldset>
+</div>
+<div class="form-fieldset">
+  <fieldset>
+    <legend>{% trans "Permissions" %}</legend>
 
-      {% form_row form.roles label_class field_class %}
+    {% form_row form.roles %}
 
-    </fieldset>
-    <fieldset>
-      <legend>{% trans "Display and visibility" %}</legend>
+  </fieldset>
+</div>
+<div class="form-fieldset">
+  <fieldset>
+    <legend>{% trans "Display and visibility" %}</legend>
 
-      {% form_row form.css_class label_class field_class %}
-      {% form_row form.is_tab "col-md-3" field_class %}
+    {% form_row form.css_class %}
+    {% form_row form.is_tab %}
 
-    </fieldset>
-  {% endwith %}
+  </fieldset>
 </div>
 {% endblock form-body %}
-
-
-{% block form-footer-class %}
-col-md-offset-3
-{% endblock form-footer-class %}