Skip to content
Snippets Groups Projects
Verified Commit 1ebeb00d authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Fix some design issues

parent ede9d945
No related branches found
No related tags found
1 merge request!31Biscuit merge. Closes #53.
...@@ -6,9 +6,21 @@ ...@@ -6,9 +6,21 @@
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block page_title %}{% blocktrans %}Lessons {{ day }}{% endblocktrans %}{% endblock %} {% block no_page_title %}{% endblock %}
{% block content %} {% 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 %} {% render_table lessons_table %}
{% endblock %} {% endblock %}
...@@ -6,9 +6,11 @@ ...@@ -6,9 +6,11 @@
<link rel="stylesheet" href="{% static 'css/chronos/timetable.css' %}"> <link rel="stylesheet" href="{% static 'css/chronos/timetable.css' %}">
{% endblock %} {% endblock %}
{% block no_page_title %}{% endblock %}
{% block content %} {% block content %}
<div class="row nomargin"> <div class="row no-margin">
<div class="col m12 s12 l6"> <div class="col m12 s12 l6 xl4">
<h4> <h4>
{% trans "My timetable" %} <i>{{ el }}</i> {% trans "My timetable" %} <i>{{ el }}</i>
<span class="badge new primary-color ">{% trans "SMART PLAN" %}</span> <span class="badge new primary-color ">{% trans "SMART PLAN" %}</span>
...@@ -20,7 +22,7 @@ ...@@ -20,7 +22,7 @@
</div> </div>
<div class="row nomargin"> <div class="row nomargin">
<div class="col m12 s12 l6"> <div class="col m12 s12 l6 xl4">
{# {% include "timetable/hintsinplan.html" %}#} {# {% include "timetable/hintsinplan.html" %}#}
</div> </div>
</div> </div>
...@@ -30,7 +32,7 @@ ...@@ -30,7 +32,7 @@
</script> </script>
<div class="row"> <div class="row">
<div class="timetable-plan col s12 m12 l6"> <div class="timetable-plan col s12 m12 xl4">
{# Date #} {# Date #}
......
...@@ -6,13 +6,15 @@ ...@@ -6,13 +6,15 @@
<link rel="stylesheet" href="{% static 'css/chronos/timetable.css' %}"> <link rel="stylesheet" href="{% static 'css/chronos/timetable.css' %}">
{% endblock %} {% endblock %}
{% block no_page_title %}{% endblock %}
{% block content %} {% block content %}
<script type="text/javascript"> <script type="text/javascript">
var dest = Urls.substitutions(); var dest = Urls.substitutions();
</script> </script>
<div class="row no-margin"> <div class="row no-margin">
<div class="col s10 m6"> <div class="col s10 m6 no-padding">
<h4>{% trans "Substitutions" %}</h4> <h4>{% trans "Substitutions" %}</h4>
</div> </div>
<div class="col s2 m6 right align-right print-icon"> <div class="col s2 m6 right align-right print-icon">
...@@ -30,7 +32,7 @@ ...@@ -30,7 +32,7 @@
</div> </div>
<div class="row no-print"> <div class="row no-print">
<div class="col s12 m6 l8 xl9"> <div class="col s12 m6 l8">
{% if header_info.is_box_needed %} {% if header_info.is_box_needed %}
<div class="card"> <div class="card">
<div class="card-content"> <div class="card-content">
...@@ -50,7 +52,7 @@ ...@@ -50,7 +52,7 @@
{# {% include "chronos/hintsinsub.html" %}#} {# {% include "chronos/hintsinsub.html" %}#}
</div> </div>
<div class="col s12 m6 l4 xl3"> <div class="col s12 m6 l4 no-padding">
{% include "chronos/partials/datepicker.html" %} {% include "chronos/partials/datepicker.html" %}
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment