Merge branch 'master' into date-time-helpers

aleksis/apps/chronos/templates/chronos/edit_substitution.html

@@ -12,7 +12,7 @@
 
     {% form form=edit_substitution_form %}{% endform %}
 
-    {% include "core/save_button.html" %}
+    {% include "core/partials/save_button.html" %}
     {% if substitution %}
       {# FIXME Respect year as well #}
       <a href="{% url 'delete_substitution' substitution.lesson_period.id substitution.week %}"

aleksis/apps/chronos/templates/chronos/my_timetable.html

@@ -26,7 +26,7 @@
 
   <div class="row nomargin">
     <div class="col m12 s12 l6 xl4">
-      {% include "core/announcements.html" with announcements=announcements %}
+      {% include "core/partials/announcements.html" with announcements=announcements %}
     </div>
   </div>
 

aleksis/apps/chronos/templates/chronos/substitutions.html

@@ -28,7 +28,7 @@
     <div class="col s12 m6 l8">
       {% include "chronos/partials/headerbox.html" %}
 
-      {% include "core/announcements.html" with announcements=announcements show_recipients=1 %}
+      {% include "core/partials/announcements.html" with announcements=announcements show_recipients=1 %}
     </div>
     <div class="col s12 m6 l4 no-padding">
       {% include "chronos/partials/datepicker.html" %}

aleksis/apps/chronos/templates/chronos/substitutions_print.html

@@ -16,7 +16,7 @@
   {% for day, c in days.items %}
     <h4>{% trans "Substitutions" %} {{ c.day|date:"l" }} {{ c.day }}</h4>
 
-    {% include "core/announcements.html" with announcements=announcements show_recipients=1 %}
+    {% include "core/partials/announcements.html" with announcements=announcements show_recipients=1 %}
 
     {% include "chronos/partials/headerbox.html" with affected_teachers=c.affected_teachers affected_groups=c.affected_groups absent_teachers=c.absent_teachers absent_groups=c.absent_groups print=1 %}
 

aleksis/apps/chronos/templates/chronos/timetable.html

@@ -69,7 +69,7 @@
     {% endif %}
   </div>
 
-  {% include "core/announcements.html" with announcements=announcements show_interval=1 %}
+  {% include "core/partials/announcements.html" with announcements=announcements show_interval=1 %}
 
   {# show full timetable on tablets, laptops and pcs #}
   <div class="timetable-plan hide-on-small-and-down">