First pass on admin page headers

misago/legal/models.py

@@ -1,5 +1,6 @@
 from django.core.cache import cache
 from django.db import models
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
@@ -70,6 +71,18 @@ class Agreement(models.Model):
 
     objects = AgreementManager()
 
+    def get_absolute_url(self):
+        if not self.is_active:
+            return None
+
+        if self.link:
+            return self.link
+
+        if self.type == self.TYPE_TOS:
+            return reverse("misago:terms-of-service")
+
+        return reverse("misago:privacy-policy")
+
     def get_final_title(self):
         return self.title or self.get_type_display()
 

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

@@ -11,23 +11,24 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% if target.pk %}
-{% trans target.get_final_title %}
-{% else %}
-{% trans "New agreement" %}
+{% block page-actions %}
+{% if target.get_absolute_url %}
+  <div class="col-auto page-action">
+    <a href="{{ target.get_absolute_url }}" class="btn btn-primary">
+      <span class="fas fa-external-link-alt"></span>
+      {% trans "View on site" %}
+    </a>
+  </div>
 {% endif %}
-{% endblock page-target %}
+{% endblock %}
 
 
 {% block form-header %}
-<h1>
-  {% if target.pk %}
+{% if target.pk %}
   {% trans target.get_final_title %}
-  {% else %}
+{% else %}
   {% trans "New agreement" %}
-  {% endif %}
-</h1>
+{% endif %}
 {% endblock %}
 
 

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

@@ -11,23 +11,12 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% if target.pk %}
-{{ target }}
-{% else %}
-{% trans "New type" %}
-{% endif %}
-{% endblock page-target %}
-
-
 {% block form-header %}
-<h1>
-  {% if target.pk %}
+{% if target.pk %}
   {{ target }}
-  {% else %}
+{% else %}
   {% trans "New type" %}
-  {% endif %}
-</h1>
+{% endif %}
 {% endblock %}
 
 

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

@@ -11,15 +11,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% if target.pk %}
-{% trans target.banned_value %}
-{% else %}
-{% trans "New ban" %}
-{% endif %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% if target.pk %}

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

@@ -9,13 +9,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% blocktrans trimmed with category=target.name %}
-  Delete category: {{ category }}
-{% endblocktrans %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% blocktrans with category=target.name %}

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

@@ -11,13 +11,22 @@
 {% endblock title %}
 
 
-{% block page-target %}
+{% block page-actions %}
 {% if target.pk %}
-  {{ target }}
-{% else %}
-  {% trans "New category" %}
+  <div class="col-auto page-action">
+    <a href="{% url 'misago:admin:categories:nodes:permissions' pk=target.pk %}" class="btn btn-primary">
+      <span class="fa fa-adjust"></span>
+      {% trans "Edit permissions" %}
+    </a>
+  </div>
+  <div class="col-auto page-action">
+    <a href="{{ target.get_absolute_url }}" class="btn btn-primary">
+      <span class="fas fa-external-link-alt"></span>
+      {% trans "View on site" %}
+    </a>
+  </div>
 {% endif %}
-{% endblock page-target %}
+{% endblock %}
 
 
 {% block form-header %}

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

@@ -9,6 +9,24 @@
 {% endblock title%}
 
 
+{% block page-actions %}
+{% if target.pk %}
+  <div class="col-auto page-action">
+    <a href="{% url 'misago:admin:categories:nodes:edit' pk=target.pk %}" class="btn btn-primary">
+      <span class="fa fa-edit"></span>
+      {% trans "Edit category" %}
+    </a>
+  </div>
+  <div class="col-auto page-action">
+    <a href="{{ target.get_absolute_url }}" class="btn btn-primary">
+      <span class="fas fa-external-link-alt"></span>
+      {% trans "View on site" %}
+    </a>
+  </div>
+{% endif %}
+{% endblock %}
+
+
 {% block page-header %}
 {{ block.super }}
 <div class="sub">
@@ -17,7 +35,8 @@
     {{ category }}: Permissions
   {% endblocktrans %}
 </div>
-{% endblock page-header %}
+{% endif %}
+{% endblock %}
 
 
 {% block view %}
@@ -26,7 +45,7 @@
   <div class="table-panel">
     <table class="table">
       <tr>
-        <th>{% trans "Category" %}</ht>
+        <th>{% trans "Role" %}</ht>
         <th class="col-md-6">{% trans "Permissions" %}</ht>
       </tr>
       {% for form in forms %}

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

@@ -11,15 +11,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% if target.pk %}
-  {{ target }}
-{% else %}
-  {% trans "New role" %}
-{% endif %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% if target.pk %}

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

@@ -7,11 +7,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% trans "Request new data downloads" %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>{% trans "Request new data downloads" %}</h1>
 {% endblock %}

misago/templates/misago/admin/generic/form.html

@@ -2,24 +2,18 @@
 {% load i18n %}
 
 
-{% block page-header %}
-{{ block.super }}
-<span class="fa fa-chevron-right"></span>
-{% block page-target %}{% endblock page-target %}
-{% endblock page-header %}
-
-
 {% block view %}
 <div class="row">
   <div class="col-xs-12 {% block form-main-col-class %}col-md-8 col-md-offset-2{% endblock form-main-col-class %}">
 
-    <div class="form-panel">
+    <div class="card card-form">
       <form role="form" method="post" {% block form-extra %}{% endblock form-extra %}>
         {% csrf_token %}
 
-        <div class="form-header">
+        <h5 class="card-header">
           {% block form-header %}{% endblock %}
-        </div>
+        </h5>
+        <div class="card-body">
 
         {% if form.is_bound and not form.is_valid %}
           <div class="form-errors-block">
@@ -36,7 +30,8 @@
 
         {% block form-body %}{% endblock %}
 
-        <div class="form-footer">
+        </div>
+        <div class="card-footer">
           <div class="row">
             <div class="{% block form-footer-class %}col-xs-12{% endblock form-footer-class %}">
 
@@ -59,7 +54,6 @@
 
       </form>
     </div><!-- /.form-panel -->
-
   </div>
 </div>
 {% endblock view %}

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

@@ -11,15 +11,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% if target.pk %}
-  {{ target }}
-{% else %}
-  {% trans "New rank" %}
-{% endif %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% if target.pk %}

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

@@ -11,15 +11,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% if target.pk %}
-  {{ target }}
-{% else %}
-  {% trans "New role" %}
-{% endif %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% if target.pk %}

misago/templates/misago/admin/themes/assets/css-editor-form.html

@@ -26,13 +26,6 @@
 {% endblock extra-head %}
 
 
-{% block page-target %}
-<a href="{% url 'misago:admin:appearance:themes:assets' pk=theme.pk %}">
-  {{ theme }}
-</a>
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% if target.pk %}

misago/templates/misago/admin/themes/assets/css-link-form.html

@@ -11,13 +11,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-<a href="{% url 'misago:admin:appearance:themes:assets' pk=theme.pk %}">
-  {{ theme }}
-</a>
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% if target.pk %}

misago/templates/misago/admin/themes/form.html

@@ -11,15 +11,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% if target.pk %}
-  {{ target }}
-{% else %}
-  {% trans "New theme" %}
-{% endif %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% if target.pk %}

misago/templates/misago/admin/themes/import.html

@@ -7,11 +7,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% trans "Import theme" %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% trans "Import theme" %}

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

@@ -7,11 +7,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% trans "Ban users" %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>{% trans "Ban selected users:" %}</h1>
 {% endblock %}

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

@@ -7,11 +7,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% trans "Delete users with content" %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>{% trans "Deleting users..." %}</h1>
 {% endblock %}

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

@@ -7,11 +7,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{{ target }}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {{ target }}

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

@@ -7,11 +7,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% trans "New user" %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>{% trans "New user" %}</h1>
 {% endblock %}

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

@@ -11,15 +11,6 @@
 {% endblock title %}
 
 
-{% block page-target %}
-{% if target.pk %}
-  {{ target }}
-{% else %}
-  {% trans "New warning level" %}
-{% endif %}
-{% endblock page-target %}
-
-
 {% block form-header %}
 <h1>
   {% if target.pk %}