Merge remote-tracking branch 'origin/dev' into dev

biscuit/apps/chronos/templates/timetable/hintsinplan.html

@@ -39,9 +39,9 @@
                     {% endif %}
                     {{ hints_b|length }}
                     {% if hints %}
-                        weitere(n)
+                        weitere{{ hints_b|pluralize:"n," }}
                     {% endif %}
-                    Hinweis(e).
+                    Hinweis{{ hints_b|pluralize:"e" }}.
                     <i class="material-icons right collapsible-trigger"></i>
                 </div>
             </div>
@@ -50,12 +50,10 @@
                     {% if not hint.teachers %}
                         <div>
                             <strong>
-                                {{ hint.classes.all|join:", " }},
+                                {{ hint.classes_formatted }},
                             </strong>
-                            {{ hint.from_date|date:"D, d.m." }},
-                            {% if hint.from_date != hint.to_date %}
-                                bis {{ hint.to_date|date:"D, d.m." }}
-                            {% endif %}:
+                            {{ hint.from_date|date:"D, d.m." }}{% if hint.from_date != hint.to_date %}, bis
+                                {{ hint.to_date|date:"D, d.m." }}{% endif %}:
                             {{ hint.text|safe_markdown }}
                         </div>
                     {% endif %}

biscuit/apps/chronos/templates/timetable/hintsinsub.html

@@ -4,7 +4,8 @@
         <li>
             <div class="collapsible-header " style="font-size: 16px;">
                 <div class="col s12">
-                    <i class="material-icons left">announcement</i>Es gibt {{ hints|length }} Hinweis(e) für diesen Tag.
+                    <i class="material-icons left">announcement</i>Es gibt {{ hints|length }}
+                    Hinweis{{ hints|pluralize:"e" }} für diesen Tag.
                     <i class="material-icons right collapsible-trigger"></i>
                 </div>
             </div>
@@ -12,7 +13,7 @@
                 {% for hint in hints %}
                     <div>
                         <strong>
-                            {{ hint.classes.all|join:", " }}{% if hint.teachers and hint.classes.all %},{% endif %}
+                            {{ hint.classes_formatted }}{% if hint.teachers and hint.classes.all %},{% endif %}
                         </strong>
                         {% if hint.teachers %}
                             <span class="badge new green no-float no-margin">Lehrkräfte</span>

biscuit/apps/chronos/templates/timetable/substitution.html

@@ -7,10 +7,10 @@
 
 <main>
     <div class="row no-margin">
-        <div class="col s12 m6">
+        <div class="col s10 m6">
             <h4>Vertretungen</h4>
         </div>
-        <div class="col s12 m6 right align-right">
+        <div class="col s2 m6 right align-right print-icon">
             <a class="waves-effect waves-teal btn-flat btn-flat-medium right"
                href="
                     {% if debug %}
@@ -32,7 +32,7 @@
                         {% for row in header_info.rows %}
                             <div class="row no-margin">
                                 <div class="col s3">
-                                    <strong>{{ row.0 }}</strong>
+                                    <strong class="truncate">{{ row.0 }}</strong>
                                 </div>
                                 <div class="col s9">
                                     {{ row.1 }}
@@ -50,7 +50,7 @@
         </div>
     </div>
 
-    <h5>{{ date|date:"l, j. F Y" }}</h5>
+    <h5 class="hide-on-small-and-down">{{ date|date:"l, j. F Y" }}</h5>
 
     <table class="substitutions striped">
         <thead>