Merge branch 'master' into dev

biscuit/apps/chronos/templates/timetable/latex/substitutions.tex

@@ -125,10 +125,10 @@ Stand: {% now "j. F Y H:i" %}\\
         {# Display badge (for cancellations) #}     {# Display notice and new line #}
         {% if sub.badge %}
         \normalsize\badge{ {{ sub.badge }} }
-        {% endif %} \color{ {{c}}} \large\textit{ {{sub.text|default:""}} } \\
+        {% endif %} \color{ {{c}}} \large\textit{ {{sub.text|default:""|safe}} } \\
 
     {% endwith %}
     {% endfor %}
     \end{longtable}
 
-\end{document}
\ No newline at end of file
+\end{document}

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

@@ -16,7 +16,6 @@
                 <p>
                     {% if element_container.substitution %}
                         {# SUBSTITUTION #}
-
                         {% if type == 1 and element_container.is_old %}
                             {# When it's the old room, let it empty #}
 

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

@@ -98,11 +98,9 @@
                     <em>{{ sub.text|default:"" }}</em>
                 </td>
                 <td class="hide-on-small-and-down">
-
                     {% if sub.badge %}
                         <span class="badge new green darken-2">{{ sub.badge }}</span>
                     {% endif %}
-
                 </td>
             </tr>
         {% endfor %}