Skip to content
Snippets Groups Projects
Commit 761d2ca5 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch '146-use-correct-semantic-html-elements' into 'master'

Resolve "Use correct semantic html elements"

Closes #146

See merge request !184
parents f0f4afb3 e5b82ac1
No related branches found
No related tags found
1 merge request!184Resolve "Use correct semantic html elements"
Pipeline #17813 passed
Pipeline: AlekSIS

#17817

    ......@@ -13,6 +13,7 @@ Changed
    ~~~~~~~
    * Use a more speaking name for preference section ("Timetables" instead of "Chronos").
    * Use semantically correct html elements for headings and alerts.
    Fixed
    ~~~~~
    ......
    ......@@ -14,7 +14,7 @@
    {% block content %}
    <div class="row">
    <div class="col s12 m4">
    <h5>{% trans "Teachers" %}</h5>
    <h2>{% trans "Teachers" %}</h2>
    {% for teacher in teachers %}
    <a class="waves-effect waves-light btn btn-timetable-quicklaunch primary"
    ......@@ -25,7 +25,7 @@
    </div>
    <div class="col s12 m4">
    <h5>{% trans "Groups" %}</h5>
    <h2>{% trans "Groups" %}</h2>
    {% for class in classes %}
    <a class="waves-effect waves-light btn btn-timetable-quicklaunch primary"
    ......@@ -36,7 +36,7 @@
    </div>
    <div class="col s12 m4">
    <h5>{% trans "Rooms" %}</h5>
    <h2>{% trans "Rooms" %}</h2>
    {% for room in rooms %}
    <a class="waves-effect waves-light btn btn-timetable-quicklaunch primary"
    ......
    ......@@ -16,7 +16,7 @@
    <div class="row no-margin">
    <div class="col s12 m6 l8 no-padding">
    <h4>{% blocktrans %}Lessons{% endblocktrans %} {{ day|date:"l" }}, {{ day }}</h4>
    <h1>{% blocktrans %}Lessons{% endblocktrans %} {{ day|date:"l" }}, {{ day }}</h1>
    </div>
    <div class="col s12 m6 l4 no-padding">
    {% include "chronos/partials/datepicker.html" %}
    ......
    ......@@ -14,10 +14,10 @@
    {% block content %}
    <div class="row no-margin">
    <div class="col s12">
    <h4>
    <h1>
    {% trans "My timetable" %} <i>{{ el }}</i>
    <span class="badge new primary-color ">{% trans "SMART PLAN" %}</span>
    </h4>
    </h1>
    <a class="btn-flat waves-effect waves-light" href="{% url "timetable" super.type.value super.el.pk %}">
    {% trans "Show week timetable for" %} {{ super.el.short_name }}
    </a>
    ......
    ......@@ -14,7 +14,7 @@
    {% block content %}
    <div class="row no-margin">
    <div class="col s10 m6 no-padding">
    <h4>{% trans "Substitutions" %}</h4>
    <h1>{% trans "Substitutions" %}</h1>
    </div>
    <div class="col s2 m6 right align-right print-icon">
    <a class="waves-effect waves-teal btn-flat btn-flat-medium right"
    ......@@ -35,7 +35,7 @@
    </div>
    </div>
    <h5 class="hide-on-small-and-down">{{ day|date:"l" }}, {{ day }}</h5>
    <h2 class="hide-on-small-and-down">{{ day|date:"l" }}, {{ day }}</h2>
    <table class="substitutions striped responsive-table">
    <thead>
    ......
    ......@@ -9,6 +9,7 @@
    {% endblock %}
    {% block browser_title %}{% blocktrans %}Timetable{% endblocktrans %}{% endblock %}
    {% block no_page_title %}{% endblock %}
    {% block content %}
    {% if smart %}
    ......@@ -19,20 +20,20 @@
    <div class="row no-margin">
    <div class="col s8 m6 l8 xl9">
    <h4>
    <h1>
    {% trans "Timetable" %} <i>{{ el }}</i>
    </h4>
    </h1>
    {# Show class teacher and deputy class teacher #}
    {% if type.value == "group" and el.owners.all %}
    <h5>{% trans "Group teachers:" %}
    <h2>{% trans "Group teachers:" %}
    {% for teacher in el.owners.all %}
    <span data-position="bottom" class="tooltipped"
    data-tooltip="{{ teacher }}">
    <a href="{% url "timetable" "teacher" teacher.pk %}">
    {{ teacher.short_name }}</a></span>{% if not forloop.last %},{% endif %}
    {% endfor %}
    </h5>
    </h2>
    {% endif %}
    </div>
    <div class="col s4 m6 l4 xl3 right align-right no-print">
    ......
    ......@@ -13,14 +13,12 @@
    {% if has_plan %}
    {% include "chronos/partials/lessons_col.html" with lesson_periods=lesson_periods %}
    {% else %}
    <div class="alert warning">
    <p>
    <i class="material-icons left">info</i>
    {% blocktrans %}
    There is no timetable linked to your person.
    {% endblocktrans %}
    </p>
    </div>
    <figure class="alert warning">
    <i class="material-icons left">info</i>
    {% blocktrans %}
    There is no timetable linked to your person.
    {% endblocktrans %}
    </figure>
    {% endif %}
    </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