diff --git a/aleksis/apps/chronos/templates/chronos/lessons_day.html b/aleksis/apps/chronos/templates/chronos/lessons_day.html index cd6bcb8e8ebcbcc71ab808fe619bfb1da214ec1a..c498c419f7fe66235ae29502655374f654094883 100644 --- a/aleksis/apps/chronos/templates/chronos/lessons_day.html +++ b/aleksis/apps/chronos/templates/chronos/lessons_day.html @@ -6,9 +6,21 @@ {% load render_table from django_tables2 %} -{% block page_title %}{% blocktrans %}Lessons {{ day }}{% endblocktrans %}{% endblock %} +{% block no_page_title %}{% endblock %} {% block content %} - {% include "core/turnable.html" %} + <script type="text/javascript"> + var dest = Urls.lessonsDay(); + </script> + + <div class="row no-margin"> + <div class="col s12 m6 l8 no-padding"> + <h4>{% blocktrans %}Lessons{% endblocktrans %} {{ day|date:"l, j. F Y" }}</h4> + </div> + <div class="col s12 m6 l4 no-padding" style="margin-top: 10px;"> + {% include "chronos/partials/datepicker.html" %} + </div> + </div> + {% render_table lessons_table %} {% endblock %} diff --git a/aleksis/apps/chronos/templates/chronos/my_timetable.html b/aleksis/apps/chronos/templates/chronos/my_timetable.html index f598165360aa3cd48a86a7d90ba456d89beb267c..70d73c22d52330ec6fbf23c1b401cab2941ffc4b 100644 --- a/aleksis/apps/chronos/templates/chronos/my_timetable.html +++ b/aleksis/apps/chronos/templates/chronos/my_timetable.html @@ -6,9 +6,11 @@ <link rel="stylesheet" href="{% static 'css/chronos/timetable.css' %}"> {% endblock %} +{% block no_page_title %}{% endblock %} + {% block content %} - <div class="row nomargin"> - <div class="col m12 s12 l6"> + <div class="row no-margin"> + <div class="col m12 s12 l6 xl4"> <h4> {% trans "My timetable" %} <i>{{ el }}</i> <span class="badge new primary-color ">{% trans "SMART PLAN" %}</span> @@ -20,7 +22,7 @@ </div> <div class="row nomargin"> - <div class="col m12 s12 l6"> + <div class="col m12 s12 l6 xl4"> {# {% include "timetable/hintsinplan.html" %}#} </div> </div> @@ -30,7 +32,7 @@ </script> <div class="row"> - <div class="timetable-plan col s12 m12 l6"> + <div class="timetable-plan col s12 m12 xl4"> {# Date #} diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html index 7155d6b3759f1eaa848d58ad791ed57766cc7941..f21f2c2fb5fdd741ca5e0c0c41f59d43031f201a 100644 --- a/aleksis/apps/chronos/templates/chronos/substitutions.html +++ b/aleksis/apps/chronos/templates/chronos/substitutions.html @@ -6,13 +6,15 @@ <link rel="stylesheet" href="{% static 'css/chronos/timetable.css' %}"> {% endblock %} +{% block no_page_title %}{% endblock %} + {% block content %} <script type="text/javascript"> var dest = Urls.substitutions(); </script> <div class="row no-margin"> - <div class="col s10 m6"> + <div class="col s10 m6 no-padding"> <h4>{% trans "Substitutions" %}</h4> </div> <div class="col s2 m6 right align-right print-icon"> @@ -30,7 +32,7 @@ </div> <div class="row no-print"> - <div class="col s12 m6 l8 xl9"> + <div class="col s12 m6 l8"> {% if header_info.is_box_needed %} <div class="card"> <div class="card-content"> @@ -50,7 +52,7 @@ {# {% include "chronos/hintsinsub.html" %}#} </div> - <div class="col s12 m6 l4 xl3"> + <div class="col s12 m6 l4 no-padding"> {% include "chronos/partials/datepicker.html" %} </div> </div>