Merge branch 'master' into 273-let-apps-add-extra-permissions-to-models

aleksis/core/static/print.css

@@ -38,7 +38,13 @@ header, main, footer {
     height: 0;
 }
 
-.print-layout-table td {
+.print-layout-table, .print-layout-td {
+    width: 190mm;
+    max-width: 190mm;
+    min-width: 190mm;
+}
+
+.print-layout-td {
     padding: 0;
 }
 
@@ -65,6 +71,18 @@ header .row, header .col {
     width: auto;
 }
 
+.page-break {
+    display: block;
+    text-align: center;
+    margin: auto;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    width: 200px;
+    border-top: 1px dashed;
+    color: darkgrey;
+    page-break-after: always;
+}
+
 @media print {
     .header-space {
         height: 35mm;
@@ -87,4 +105,8 @@ header .row, header .col {
         position: fixed;
         bottom: 0;
     }
+
+    .page-break {
+        border: white;
+    }
 }

aleksis/core/templates/403.html

@@ -5,10 +5,16 @@
 {% block content %}
   <div class="container">
     <div class="card red">
-      <div class="card white-text">
-        <i class="material-icons small">error_outline</i>
-        <span class="card-title">{% trans "Error" %} (403): {% blocktrans %}You are not allowed to access the requested page or
-          object.{% endblocktrans %}</span>
+      <div class="card-content white-text">
+        <i class="material-icons small left">error_outline</i>
+        <span class="card-title">
+        {% if exception %}
+          {{ exception }}
+        {% else %}
+          {% trans "Error" %} (403): {% blocktrans %}You are not allowed to access the requested page or
+          object.{% endblocktrans %}
+        {% endif %}
+        </span>
         <p>
           {% blocktrans %}
             If you think this is an error in AlekSIS, please contact your site

aleksis/core/templates/500.html

@@ -6,7 +6,7 @@
   <div class="container">
     <div class="card red">
       <div class="card-content white-text">
-        <div class="material-icons small">error_outline</div>
+        <div class="material-icons small left">error_outline</div>
         <span class="card-title">{% trans "Error" %} (500): {% blocktrans %}An unexpected error has
           occured.{% endblocktrans %}</span>
         <p>

aleksis/core/templates/503.html

@@ -6,7 +6,7 @@
   <div class="container">
     <div class="card red">
       <div class="card-content white-text">
-        <div class="material-icons small">error_outline</div>
+        <div class="material-icons small left">error_outline</div>
         <span class="card-title">{% blocktrans %}The maintenance mode is currently enabled. Please try again
           later.{% endblocktrans %}</span>
         <p>

aleksis/core/templates/core/additional_field/edit.html

@@ -11,7 +11,7 @@
   <form method="post">
     {% csrf_token %}
     {% form form=edit_additional_field_form %}{% endform %}
-    {% include "core/save_button.html" %}
+    {% include "core/partials/save_button.html" %}
   </form>
 
 {% endblock %}

aleksis/core/templates/core/base_print.html

@@ -29,7 +29,7 @@
   <table class="print-layout-table">
     <thead>
     <tr class="no-border">
-      <td>
+      <td class="print-layout-td">
         <div class="header-space">&nbsp;</div>
       </td>
     </tr>
@@ -37,12 +37,14 @@
 
     <tbody>
     <tr class="no-border">
-      <td>
+      <td class="print-layout-td">
         <div class="content">
           <header>
             <div id="print-header" class="row">
               <div class="col s6 logo">
-                <img src="{{ request.site.preferences.theme__logo.url }}" alt="Logo" id="print-logo"/>
+                {% static "img/aleksis-banner.svg" as aleksis_banner %}
+                <img src="{% firstof request.site.preferences.theme__logo.url aleksis_banner %}" alt="Logo"
+                     id="print-logo"/>
               </div>
               <div class="col s6 right-align">
                 <h5>{% block page_title %}{% endblock %}</h5>
@@ -55,7 +57,7 @@
 
           <footer>
             <div class="left">
-              {{ SCHOOL.name }}
+              {{ request.site.preferences.school__name }}
             </div>
 
             <div class="right">
@@ -69,7 +71,7 @@
 
     <tfoot>
     <tr class="no-border">
-      <td>
+      <td class="print-layout-td">
         <div class="footer-space">&nbsp;</div>
       </td>
     </tr>

aleksis/core/templates/core/school_term/create.html

@@ -11,7 +11,7 @@
   <form method="post">
     {% csrf_token %}
     {% form form=form %}{% endform %}
-    {% include "core/save_button.html" %}
+    {% include "core/partials/save_button.html" %}
   </form>
 
 {% endblock %}

aleksis/core/templates/core/school_term/edit.html

@@ -11,7 +11,7 @@
   <form method="post">
     {% csrf_token %}
     {% form form=form %}{% endform %}
-    {% include "core/save_button.html" %}
+    {% include "core/partials/save_button.html" %}
   </form>
 
 {% endblock %}