Remove testing red lines from tables
- Author
- Maarten Vangeneugden
- Date
- July 26, 2018, 9:14 p.m.
- Hash
- ed815ee93652b3db38a69833b17404be8b1eb389
- Parent
- 772cda75afcf0a6c78307cfbaad8b814a267364e
- Modified files
- administration/templates/administration/roster_t.djhtml
- static/css/base.scss
administration/templates/administration/roster_t.djhtml ¶
2 additions and 2 deletions.
View changes Hide changes
1 |
1 |
This is the roster template. You can use this to display a hourly roster, |
2 |
2 |
spread over a series of days. To function properly, this template requires |
3 |
3 |
the following variables: |
4 |
4 |
- days :: A list of all days for which a column must be made. |
5 |
5 |
- time_blocks :: A list of all rows with their respective timings, that must |
6 |
6 |
be displayed in the roster. These elements must *not* contain |
7 |
7 |
any unsafe elements! |
8 |
8 |
- conflicts :: A dictionary with all conflicting events that need to be listed. |
9 |
9 |
{% endcomment %} |
10 |
10 |
|
11 |
11 |
<style> |
12 |
- | table td { |
+ |
12 |
table td { |
13 |
13 |
border-width: 0px 0px 1px 0px; |
14 |
14 |
border-bottom-style: solid; |
15 |
15 |
border-style: solid; |
16 |
16 |
border-color: red; |
17 |
17 |
} |
18 |
18 |
</style> |
19 |
- | <table> |
+ |
19 |
<table> |
20 |
20 |
<th> |
21 |
21 |
{#<td></td> {# Empty row for hours #} {# Apparantly this isn't necessary with <th /> #} |
22 |
22 |
{% for day in days %} |
23 |
23 |
<td>{{ day|date:"l (d/m)" }}</td> |
24 |
24 |
{% endfor %} |
25 |
25 |
</th> |
26 |
26 |
{% for element in time_blocks %} |
27 |
27 |
{{ element|safe }} |
28 |
28 |
{% endfor %} |
29 |
29 |
</table> |
30 |
30 |
{% for number, conflict_list in conflicts.items %} |
31 |
31 |
<h2 id="Conflict {{ number }}">Conflict {{ number }}</h2> |
32 |
32 |
{% for conflict in conflict_list %} |
33 |
33 |
{% if conflict.recently_created %} |
34 |
34 |
<div class="event-new"> |
35 |
35 |
{% elif conflict.recently_updated %} |
36 |
36 |
<div class="event-update"> |
37 |
37 |
{% endif %} |
38 |
38 |
<a href="{% url "courses-course-index" conflict.course.course.slug_name %}"> |
39 |
39 |
{{ conflict.course }}</a><br /> |
40 |
40 |
{# FIXME Temporarily disabled until all users have an associated user_data #} |
41 |
41 |
{#<a href="{% url "administration-user" conflict.docent.user_data.slug_name %}">#} |
42 |
42 |
{#{{ conflict.docent }}</a><br />#} |
43 |
43 |
{{ conflict.docent }}<br /> |
44 |
44 |
{{ conflict.begin_time|date:"H:i" }} - {{ conflict.end_time|date:"H:i" }}<br /> |
45 |
45 |
<a href="{% url "administration-room-detail" conflict.room %}"> |
46 |
46 |
{{ conflict.room }}</a> ({{ conflict.subject }}) |
47 |
47 |
</div> |
48 |
48 |
{% endfor %} |
49 |
49 |
{% endfor %} |
50 |
50 |
static/css/base.scss ¶
4 additions 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: 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 |
} |
16 |
16 |
|
17 |
17 |
dl dt { |
18 |
18 |
margin: 5px; |
19 |
19 |
} |
20 |
20 |
|
21 |
21 |
.event { |
22 |
22 |
padding: 5px; |
23 |
23 |
} |
24 |
24 |
|
25 |
25 |
.event-update { |
+ |
26 |
padding-right: 1em; |
+ |
27 |
} |
+ |
28 |
|
+ |
29 |
.event-update { |
26 |
30 |
padding: 5px; |
27 |
31 |
background-color: yellow; |
28 |
32 |
color: red; |
29 |
33 |
border: medium dotted red; |
30 |
34 |
} |
31 |
35 |
.event-new { |
32 |
36 |
padding: 5px; |
33 |
37 |
background-color: white; |
34 |
38 |
color: black; |
35 |
39 |
border: medium dashed black; |
36 |
40 |
} |
37 |
41 |
.event-note { |
38 |
42 |
padding: 5px; |
39 |
43 |
color: purple; |
40 |
44 |
border: medium double purple; |
41 |
45 |
} |
42 |
46 |
.event-conflict { |
43 |
47 |
padding: 5px; |
44 |
48 |
background-color: red; |
45 |
49 |
color: white; |
46 |
50 |
border: medium dashed; |
47 |
51 |
border-color: inherit; |
48 |
52 |
} |
49 |
53 |
.event a { |
50 |
54 |
text-decoration: none; |
51 |
55 |
color: inherit; |
52 |
56 |
} |
53 |
57 |