joeni

Fix wrapping issue with a.btn

Author
Maarten Vangeneugden
Date
July 26, 2018, 10:23 p.m.
Hash
1ef80ccd655dda17d3a900711ddd02b47f301c46
Parent
884292600fbfb4f1fc825646f85bf69fd48342e7
Modified files
administration/templates/administration/roster.djhtml
static/css/base.scss

administration/templates/administration/roster.djhtml

6 additions and 12 deletions.

View changes Hide changes
1
1
{% cycle "hour" "first quarter" "half" "last quarter" as hour silent %}
2
2
{# "silent" blocks the cycle operator from printing the cycler, and in subsequent calls #}
3
3
{% load i18n %}
4
4
5
5
{% block title %}
6
6
    {% trans "Roster" %} | {{ block.super }}
7
7
{% endblock %}
8
8
9
9
{% block main %}
10
10
    <h1>{% trans "Personal timetable" %}</h1>
11
11
    <h2>{% trans "Main hour roster" %}</h2>
12
12
13
13
14
14
    {% include "administration/roster_t.djhtml" %}
15
15
16
16
17
17
        <a class="btn" href="{% url "administration-roster" begin=prev_begin end=prev_end %}">
18
-
            {% trans "Previous week" %}
19
-
        </a>
20
-
        <a class="btn" href="{% url "administration-roster" %}">
21
-
            {% trans "Current week" %}
22
-
        </a>
23
-
        <a class="btn" href="{% url "administration-roster" begin=next_begin end=next_end %}">
24
-
            {% trans "Next week" %}
25
-
        </a>
26
-
        <a class="btn" href="{% url "administration-roster-ics" user_slug=2 %}">
27
-
            {% trans "ICS file" %}
28
-
        </a>
29
-
        {# TODO: Add links to "previous week", "next week" and "current week" with large buttons #}
+
18
        <a class="btn" href="{% url "administration-roster" begin=prev_begin end=prev_end %}">{% trans "Previous&nbsp;week" %}</a>
+
19
        <a class="btn" href="{% url "administration-roster" %}">{% trans "Current&nbsp;week" %}</a>
+
20
        <a class="btn" href="{% url "administration-roster" begin=next_begin end=next_end %}">{% trans "Next&nbsp;week" %}</a>
+
21
        <a class="btn" href="{% url "administration-roster-ics" user_slug=2 %}">{% trans "ICS&nbsp;file" %}</a>
+
22
        </div>
+
23
        {# TODO: Add links to "previous week", "next week" and "current week" with large buttons #}
30
24
31
25
    <h2>{% trans "Explanation" %}</h2>
32
26
    <p>
33
27
        {% trans "Personal roster from" %} {{ begin|date }} {% trans "to" %} {{ end|date }}
34
28
    </p>
35
29
    <p>
36
30
        {% blocktrans %}
37
31
            Some fields may have additional information that might be of interest
38
32
            to you. This information is shown in different ways with colour codes.
39
33
        {% endblocktrans %}
40
34
    </p>
41
35
42
36
    <dl>
43
37
        <dt><span class="event-update">
44
38
            {% trans "Recent event update" %}
45
39
        </span></dt>
46
40
        <dd>
47
41
            {% blocktrans %}
48
42
                This event had one or more of its properties changed
49
43
                in the last five days. This can be the room, the hours, the subject, ...
50
44
                You're encouraged to take note of that.
51
45
            {% endblocktrans %}
52
46
        </dd>
53
47
        <dt><span class="event-new">
54
48
            {% trans "New event" %}
55
49
        </span></dt>
56
50
        <dd>
57
51
            {% blocktrans %}
58
52
                This is a new event, added in the last five days.
59
53
            {% endblocktrans %}
60
54
        </dd>
61
55
        <dt><span class="event-note">
62
56
            {% trans "Notification available" %}
63
57
        </span></dt>
64
58
        <dd>
65
59
            {% blocktrans %}
66
60
                This event has a note attached to it by the docent. Hover over
67
61
                the event to display the note.
68
62
            {% endblocktrans %}
69
63
        </dd>
70
64
    </dl>
71
65
72
66
{% endblock main %}
73
67

static/css/base.scss

4 additions and 2 deletions.

View changes Hide changes
1
1
    font-family: ubuntu;
2
2
    border-style: solid;
3
3
    text-transform: uppercase;
4
4
    border-width: 0.3em;
5
5
    margin: 1em;
6
-
    border-color: $uhasselt-color;
+
6
    border-color: $uhasselt-color;
7
7
    padding: 0.2em;
8
8
    text-decoration: none;
9
9
    color: $uhasselt-color;
10
10
    font-weight: bold;
11
11
}
12
12
a.btn:hover {
13
13
    background-color: $uhasselt-color;
14
14
    color: white;
15
15
}
+
16
}
16
17
17
18
dl dt {
18
19
    margin: 5px;
19
20
}
20
21
21
22
.event {
22
23
    padding: 5px;
23
24
    color: white;
24
25
    a {
25
26
        text-decoration: none;
26
27
        color: inherit;
27
28
        &:hover {
28
29
            text-decoration: white underline dotted;
29
30
            font-style: italic;
30
31
        }
31
32
    }
32
33
}
33
34
34
35
td {
35
36
    padding-right: 1em;
36
37
}
37
38
38
39
.event-update {
39
40
    padding: 5px;
40
41
    background-color: yellow;
41
42
    color: red;
42
43
    border: medium dotted red;
43
44
    a {
44
45
        text-decoration: none;
45
46
        color: inherit;
46
47
        &:hover {
47
48
            text-decoration: red underline dotted;
48
49
            font-style: italic;
49
50
        }
50
51
    }
51
52
}
52
53
.event-new {
53
54
    padding: 5px;
54
55
    background-color: white;
55
56
    color: black;
56
57
    border: medium dashed black;
57
58
    a {
58
59
        text-decoration: none;
59
60
        color: inherit;
60
61
        &:hover {
61
62
            text-decoration: black underline dotted;
62
63
            font-style: italic;
63
64
        }
64
65
    }
65
66
}
66
67
.event-note {
67
68
    padding: 5px;
+
69
    padding: 5px;
68
70
    color: purple;
69
71
    border: medium double purple;
70
-
    a {
+
72
    a {
71
73
        text-decoration: none;
72
74
        color: inherit;
73
75
        &:hover {
74
76
            text-decoration: white underline dotted;
75
77
            font-style: italic;
76
78
        }
77
79
    }
78
80
}
79
81
.event-conflict {
80
82
    padding: 5px;
81
83
    background-color: red;
82
84
    color: white;
83
85
    border: medium dashed;
84
86
    border-color: inherit;
85
87
    a {
86
88
        text-decoration-color: blue;
87
89
        font-style: italic;
88
90
        }
89
91
}
90
92
91
93
p.conflict {
92
94
    width: 50%;
93
95
    @media screen
94
96
    and (max-device-width: 440px)
95
97
    and (max-device-height: 800px) {
96
98
        width: 100%;
97
99
    }
98
100
}
99
101