Skip to content

Commit 780f544

Browse files
zeegomozeegomo
committed
fix report frontend
1 parent 0ff8ddf commit 780f544

File tree

4 files changed

+44
-59
lines changed

4 files changed

+44
-59
lines changed

‎assets/report.css

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,26 @@ div.category div.header {
139139
padding: 0.5em 0.8em;
140140
border-radius: 0.2em;
141141
box-shadow: 0 0.1em 0.2em rgba(0, 0, 0, 0.5);
142+
}
142143

144+
.flex {
145+
display: flex;
143146
position: -webkit-sticky;
144147
position: sticky;
145148
top: 0.5em;
146149
}
147150

148-
div.category div.header.header-background {
149-
background: #292929;
151+
div.category div.subheader.header {
152+
border-radius: 0.2em 0 0 0.2em;
150153
}
151154

155+
div.category div.subheader + div.header {
156+
flex-grow: 1;
157+
border-radius: 0 0.2em 0.2em 0;
158+
}
152159

153-
div.category div.subheader.header {
154-
margin: 10px;
155-
top: 2em;
160+
div.category div.header.header-background {
161+
background: #292929;
156162
}
157163

158164
div.category div.crate {

‎src/report/display.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub trait ResultName {
99
impl ResultName for FailureReason {
1010
fn name(&self) -> String {
1111
match self {
12-
FailureReason::Unknown => "failed".into(),
12+
FailureReason::Unknown => "failed (unknown)".into(),
1313
FailureReason::Timeout => "timed out".into(),
1414
FailureReason::OOM => "OOM".into(),
1515
FailureReason::ICE => "ICE".into(),

‎templates/macros.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,20 @@
1919
{{ date | date(format="%H:%M:%S") }}
2020
UTC
2121
{% endmacro %}
22+
23+
{% macro crate_div(crate) %}
24+
<div class="crate">
25+
<a href="{{ crate.url|safe }}" target="_blank" rel="noopener">{{ crate.name }}</a>
26+
{% for run in crate.runs %}
27+
<span class="run">
28+
{% if run %}
29+
<b class="r{{ run.res }}"></b>
30+
<a href="{{ run.log|safe }}/log.txt">{{ result_names[run.res] }}</a>
31+
{% else %}
32+
<b class="c{{ crate.res }}"></b>
33+
{{ crate.res }}
34+
{% endif %}
35+
</span>
36+
{% endfor %}
37+
</div>
38+
{% endmacro %}

‎templates/report/results.html

Lines changed: 15 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% extends "report/layout.html" %}
2+
{% import "macros.html" as macros %}
23

34
{% block title %} {{ ex.name }} - Crater report {% endblock %}
45

@@ -38,52 +39,25 @@
3839
</div>
3940
<div class="crates hidden" id="crt-{{ name }}">
4041
{% for crate in crates.Plain %}
41-
<div class="crate">
42-
<a href="{{ crate.url|safe }}" target="_blank" rel="noopener">{{ crate.name }}</a>
43-
{% for run in crate.runs %}
44-
<span class="run">
45-
{% if run %}
46-
<b class="r{{ run.res }}"></b>
47-
<a href="{{ run.log|safe }}/log.txt">
48-
{{ result_names[run.res] }}
49-
</a>
50-
{% else %}
51-
<b class="c{{ crate.res }}"></b>
52-
{{ crate.res }}
53-
{% endif %}
54-
</span>
55-
{% endfor %}
56-
</div>
42+
{{ macros::crate_div(crate=crate) }}
5743
{% endfor %}
5844
</div>
5945
{% elif crates.Tree and crates.Tree.count > 0 %}
6046
<div class="header c{{ name }} toggle" data-toggle="#crt-{{ name }}-tr">
61-
{{ name }}: tree ({{ crates.Tree.count }} root crates, {{info[name]}} {{ name }} crates in total)
47+
{{ name }}: dependencies ({{ crates.Tree.count }} root crates, {{info[name]}} {{ name }} crates in total)
6248
</div>
6349
<div class="crates hidden" id="crt-{{ name }}-tr">
6450
{% for root, subcrates in crates.Tree.tree %}
6551
<div class="category">
66-
<div class="header header-background subheader toggle" data-toggle="#{{ name }}-tr{{ loop.index }}">
67-
{{ root }} ({{ subcrates|length }})
52+
<div class="flex toggle" data-toggle="#{{ name }}-tr{{ loop.index }}">
53+
<div class="header c{{ name}} subheader">{{ name}}</div>
54+
<div class="header header-background">
55+
{{ root }} ({{ subcrates|length }})
56+
</div>
6857
</div>
6958
<div class="crates" id="{{ name }}-tr{{ loop.index }}">
7059
{% for crate in subcrates %}
71-
<div class="crate">
72-
<a href="{{ crate.url|safe }}" target="_blank" rel="noopener">{{ crate.name }}</a>
73-
{% for run in crate.runs %}
74-
<span class="run">
75-
{% if run %}
76-
<b class="r{{ run.res }}"></b>
77-
<a href="{{ run.log|safe }}/log.txt">
78-
{{ result_names[run.res] }}
79-
</a>
80-
{% else %}
81-
<b class="c{{ crate.res }}"></b>
82-
{{ crate.res }}
83-
{% endif %}
84-
</span>
85-
{% endfor %}
86-
</div>
60+
{{ macros::crate_div(crate=crate) }}
8761
{% endfor %}
8862
</div>
8963
</div>
@@ -96,27 +70,15 @@
9670
<div class="crates hidden" id="crt-{{ name }}-rt">
9771
{% for result, subcrates in crates.RootResults.results %}
9872
<div class="category">
99-
<div class="header header-background subheader toggle" data-toggle="#{{ name }}-rt{{ loop.index }}">
100-
{{ result }} ({{ subcrates|length }})
73+
<div class="flex toggle" data-toggle="#{{ name }}-rt{{ loop.index }}">
74+
<div class="header c{{ name}} subheader">{{ name}}</div>
75+
<div class="header header-background">
76+
{{ result }} ({{ subcrates|length }})
77+
</div>
10178
</div>
10279
<div class="crates" id="{{ name }}-rt{{ loop.index }}">
10380
{% for crate in subcrates %}
104-
<div class="crate">
105-
<a href="{{ crate.url|safe }}" target="_blank" rel="noopener">{{ crate.name }}</a>
106-
{% for run in crate.runs %}
107-
<span class="run">
108-
{% if run %}
109-
<b class="r{{ run.res }}"></b>
110-
<a href="{{ run.log|safe }}/log.txt">
111-
{{ result_names[run.res] }}
112-
</a>
113-
{% else %}
114-
<b class="c{{ crate.res }}"></b>
115-
{{ crate.res }}
116-
{% endif %}
117-
</span>
118-
{% endfor %}
119-
</div>
81+
{{ macros::crate_div(crate=crate) }}
12082
{% endfor %}
12183
</div>
12284
</div>

0 commit comments

Comments
 (0)