Move roster buttons to top of page
- Author
- Maarten Vangeneugden
- Date
- July 26, 2018, 10:25 p.m.
- Hash
- 71efdb0e1df3cffca2a151230e727e726b13b61c
- Parent
-
1ef80ccd655dda17d3a900711ddd02b47f301c46
- Modified files
- administration/templates/administration/roster.djhtml
- static/css/base.scss
administration/templates/administration/roster.djhtml ¶
5 additions and 5 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 |
- | |
14 |
- | {% include "administration/roster_t.djhtml" %} |
15 |
- | |
16 |
- | |
17 |
- | <div style="line-height: 2.5em;"> |
18 |
13 |
<a class="btn" href="{% url "administration-roster" begin=prev_begin end=prev_end %}">{% trans "Previous week" %}</a> |
19 |
14 |
<a class="btn" href="{% url "administration-roster" %}">{% trans "Current week" %}</a> |
20 |
15 |
<a class="btn" href="{% url "administration-roster" begin=next_begin end=next_end %}">{% trans "Next week" %}</a> |
21 |
16 |
<a class="btn" href="{% url "administration-roster-ics" user_slug=2 %}">{% trans "ICS file" %}</a> |
22 |
17 |
</div> |
23 |
18 |
{# TODO: Add links to "previous week", "next week" and "current week" with large buttons #} |
| + |
19 |
|
| + |
20 |
{% include "administration/roster_t.djhtml" %} |
| + |
21 |
|
| + |
22 |
|
| + |
23 |
{# TODO: Add links to "previous week", "next week" and "current week" with large buttons #} |
24 |
24 |
|
25 |
25 |
<h2>{% trans "Explanation" %}</h2> |
26 |
26 |
<p> |
27 |
27 |
{% trans "Personal roster from" %} {{ begin|date }} {% trans "to" %} {{ end|date }} |
28 |
28 |
</p> |
29 |
29 |
<p> |
30 |
30 |
{% blocktrans %} |
31 |
31 |
Some fields may have additional information that might be of interest |
32 |
32 |
to you. This information is shown in different ways with colour codes. |
33 |
33 |
{% endblocktrans %} |
34 |
34 |
</p> |
35 |
35 |
|
36 |
36 |
<dl> |
37 |
37 |
<dt><span class="event-update"> |
38 |
38 |
{% trans "Recent event update" %} |
39 |
39 |
</span></dt> |
40 |
40 |
<dd> |
41 |
41 |
{% blocktrans %} |
42 |
42 |
This event had one or more of its properties changed |
43 |
43 |
in the last five days. This can be the room, the hours, the subject, ... |
44 |
44 |
You're encouraged to take note of that. |
45 |
45 |
{% endblocktrans %} |
46 |
46 |
</dd> |
47 |
47 |
<dt><span class="event-new"> |
48 |
48 |
{% trans "New event" %} |
49 |
49 |
</span></dt> |
50 |
50 |
<dd> |
51 |
51 |
{% blocktrans %} |
52 |
52 |
This is a new event, added in the last five days. |
53 |
53 |
{% endblocktrans %} |
54 |
54 |
</dd> |
55 |
55 |
<dt><span class="event-note"> |
56 |
56 |
{% trans "Notification available" %} |
57 |
57 |
</span></dt> |
58 |
58 |
<dd> |
59 |
59 |
{% blocktrans %} |
60 |
60 |
This event has a note attached to it by the docent. Hover over |
61 |
61 |
the event to display the note. |
62 |
62 |
{% endblocktrans %} |
63 |
63 |
</dd> |
64 |
64 |
</dl> |
65 |
65 |
|
66 |
66 |
{% endblock main %} |
67 |
67 |
static/css/base.scss ¶
1 addition and 0 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-right: 1em; |
6 |
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 |
text-transform: uppercase; |
16 |
16 |
} |
17 |
17 |
|
18 |
18 |
dl dt { |
19 |
19 |
margin: 5px; |
20 |
20 |
} |
21 |
21 |
|
22 |
22 |
.event { |
23 |
23 |
padding: 5px; |
24 |
24 |
color: white; |
25 |
25 |
a { |
26 |
26 |
text-decoration: none; |
27 |
27 |
color: inherit; |
28 |
28 |
&:hover { |
29 |
29 |
text-decoration: white underline dotted; |
30 |
30 |
font-style: italic; |
31 |
31 |
} |
32 |
32 |
} |
33 |
33 |
} |
34 |
34 |
|
35 |
35 |
td { |
36 |
36 |
padding-right: 1em; |
37 |
37 |
} |
38 |
38 |
|
39 |
39 |
.event-update { |
40 |
40 |
padding: 5px; |
41 |
41 |
background-color: yellow; |
42 |
42 |
color: red; |
43 |
43 |
border: medium dotted red; |
44 |
44 |
a { |
45 |
45 |
text-decoration: none; |
46 |
46 |
color: inherit; |
47 |
47 |
&:hover { |
48 |
48 |
text-decoration: red underline dotted; |
49 |
49 |
font-style: italic; |
50 |
50 |
} |
51 |
51 |
} |
52 |
52 |
} |
53 |
53 |
.event-new { |
54 |
54 |
padding: 5px; |
55 |
55 |
background-color: white; |
56 |
56 |
color: black; |
57 |
57 |
border: medium dashed black; |
58 |
58 |
a { |
59 |
59 |
text-decoration: none; |
60 |
60 |
color: inherit; |
61 |
61 |
&:hover { |
62 |
62 |
text-decoration: black underline dotted; |
63 |
63 |
font-style: italic; |
64 |
64 |
} |
65 |
65 |
} |
66 |
66 |
} |
67 |
67 |
.event-note { |
68 |
68 |
/* FIXME This is disabled because of time limitations. |
69 |
69 |
padding: 5px; |
70 |
70 |
color: purple; |
71 |
71 |
border: medium double purple;*/ |
72 |
72 |
a { |
| + |
73 |
a { |
73 |
74 |
text-decoration: none; |
74 |
75 |
color: inherit; |
75 |
76 |
&:hover { |
76 |
77 |
text-decoration: white underline dotted; |
77 |
78 |
font-style: italic; |
78 |
79 |
} |
79 |
80 |
} |
80 |
81 |
} |
81 |
82 |
.event-conflict { |
82 |
83 |
padding: 5px; |
83 |
84 |
background-color: red; |
84 |
85 |
color: white; |
85 |
86 |
border: medium dashed; |
86 |
87 |
border-color: inherit; |
87 |
88 |
a { |
88 |
89 |
text-decoration-color: blue; |
89 |
90 |
font-style: italic; |
90 |
91 |
} |
91 |
92 |
} |
92 |
93 |
|
93 |
94 |
p.conflict { |
94 |
95 |
width: 50%; |
95 |
96 |
@media screen |
96 |
97 |
and (max-device-width: 440px) |
97 |
98 |
and (max-device-height: 800px) { |
98 |
99 |
width: 100%; |
99 |
100 |
} |
100 |
101 |
} |
101 |
102 |