Skip to content

Commit d849e21

Browse files
wowasawowasa
committed
issue #282 
1 parent ff8d29b commit d849e21

File tree

2 files changed

+82
-97
lines changed

2 files changed

+82
-97
lines changed

‎curation-app/src/main/resources/xslt/AllLinkcheckerReport2HTML.xsl‎

Lines changed: 74 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -20,85 +20,26 @@
2020
</div>
2121
<div class="clear"/>
2222
</div>
23-
<h3>Overall</h3>
24-
<table class="reportTable">
25-
<thead>
26-
<tr>
27-
<th>Category</th>
28-
<th>Count</th>
29-
<th>Average Response Duration(ms)</th>
30-
<th>Max Response Duration(ms)</th>
31-
</tr>
32-
</thead>
33-
<tbody>
34-
<xsl:for-each select="overall/statistics">
35-
<xsl:variable name="category">
36-
<xsl:value-of select="./@category"/>
37-
</xsl:variable>
38-
<tr class="{$category}">
39-
40-
<td>
41-
<a href="/linkchecker/Overall#{$category}">
42-
<xsl:value-of select="@category"/>
43-
</a>
44-
</td>
45-
<td class='text-right'>
46-
<xsl:value-of select="format-number(@count, '###,##0')"/>
47-
</td>
48-
<td class='text-right'>
49-
<xsl:value-of select="format-number(@avgRespTime, '###,##0.0')"/>
50-
</td>
51-
<td class='text-right'>
52-
<xsl:value-of select="format-number(@maxRespTime, '###,##0.0')"/>
53-
</td>
54-
</tr>
55-
</xsl:for-each>
56-
</tbody>
57-
<tfoot>
58-
<tr>
59-
<td colspan="5">
60-
Total number with response:
61-
<xsl:value-of select="format-number(overall/@totNumOfLinksWithDuration, '###,##0')"/>
62-
&#0183;
63-
Average Response Duration(ms):
64-
<xsl:value-of select="format-number(overall/@avgRespTime,'###,##0.0')"/>
65-
&#0183;
66-
Max Response Duration(ms):
67-
<xsl:value-of select="format-number(overall/@maxRespTime,'###,##0.0')"/>
68-
</td>
69-
</tr>
70-
</tfoot>
71-
</table>
72-
<br />
73-
<img src="/img/linkchecker/Overall.png" alt="timeline of link checking results" width="800" higth="200" />
74-
<br/>
75-
<h3>Metadata Providers:</h3>
76-
77-
<xsl:for-each select="collection">
78-
79-
<xsl:variable name="name" select="@name"/>
80-
81-
<h4>
82-
<xsl:value-of select="replace($name,'_',' ')"/>
83-
</h4>
23+
<article>
24+
<h3>Overall</h3>
8425
<table class="reportTable">
8526
<thead>
8627
<tr>
87-
8828
<th>Category</th>
8929
<th>Count</th>
9030
<th>Average Response Duration(ms)</th>
9131
<th>Max Response Duration(ms)</th>
9232
</tr>
9333
</thead>
9434
<tbody>
95-
<xsl:for-each select="statistics">
35+
<xsl:for-each select="overall/statistics">
9636
<xsl:variable name="category">
9737
<xsl:value-of select="./@category"/>
9838
</xsl:variable>
9939
<tr class="{$category}">
40+
10041
<td>
101-
<a href="/linkchecker/{$name}#{$category}">
42+
<a href="/linkchecker/Overall#{$category}">
10243
<xsl:value-of select="@category"/>
10344
</a>
10445
</td>
@@ -117,27 +58,83 @@
11758
<tfoot>
11859
<tr>
11960
<td colspan="5">
120-
Total Number With Response:
121-
<xsl:value-of select="format-number(@totNumOfLinksWithDuration, '###,##0')"/>
61+
Total number with response:
62+
<xsl:value-of select="format-number(overall/@totNumOfLinksWithDuration, '###,##0')"/>
12263
&#0183;
12364
Average Response Duration(ms):
124-
<xsl:value-of select="format-number(@avgRespTime,'###,##0.0')"/>
65+
<xsl:value-of select="format-number(overall/@avgRespTime,'###,##0.0')"/>
12566
&#0183;
12667
Max Response Duration(ms):
127-
<xsl:value-of select="format-number(@maxRespTime,'###,##0.0')"/>
68+
<xsl:value-of select="format-number(overall/@maxRespTime,'###,##0.0')"/>
12869
</td>
12970
</tr>
13071
</tfoot>
13172
</table>
132-
<br/>
133-
<img alt="timeline of link checking results" width="800" higth="200">
134-
<xsl:attribute name="src">
135-
<xsl:text>/img/linkchecker/</xsl:text>
136-
<xsl:value-of select="$name" />
137-
<xsl:text>.png</xsl:text>
138-
</xsl:attribute>
139-
</img>
140-
<br />
73+
<img class="chart" src="/img/linkchecker/Overall.png" alt="timeline of link checking results" width="800" higth="200" />
74+
</article>
75+
<xsl:for-each select="collection">
76+
<article>
77+
<xsl:variable name="name" select="@name"/>
78+
79+
<h3>
80+
<xsl:value-of select="replace($name,'_',' ')"/>
81+
</h3>
82+
<table class="reportTable">
83+
<thead>
84+
<tr>
85+
86+
<th>Category</th>
87+
<th>Count</th>
88+
<th>Average Response Duration(ms)</th>
89+
<th>Max Response Duration(ms)</th>
90+
</tr>
91+
</thead>
92+
<tbody>
93+
<xsl:for-each select="statistics">
94+
<xsl:variable name="category">
95+
<xsl:value-of select="./@category"/>
96+
</xsl:variable>
97+
<tr class="{$category}">
98+
<td>
99+
<a href="/linkchecker/{$name}#{$category}">
100+
<xsl:value-of select="@category"/>
101+
</a>
102+
</td>
103+
<td class='text-right'>
104+
<xsl:value-of select="format-number(@count, '###,##0')"/>
105+
</td>
106+
<td class='text-right'>
107+
<xsl:value-of select="format-number(@avgRespTime, '###,##0.0')"/>
108+
</td>
109+
<td class='text-right'>
110+
<xsl:value-of select="format-number(@maxRespTime, '###,##0.0')"/>
111+
</td>
112+
</tr>
113+
</xsl:for-each>
114+
</tbody>
115+
<tfoot>
116+
<tr>
117+
<td colspan="5">
118+
Total Number With Response:
119+
<xsl:value-of select="format-number(@totNumOfLinksWithDuration, '###,##0')"/>
120+
&#0183;
121+
Average Response Duration(ms):
122+
<xsl:value-of select="format-number(@avgRespTime,'###,##0.0')"/>
123+
&#0183;
124+
Max Response Duration(ms):
125+
<xsl:value-of select="format-number(@maxRespTime,'###,##0.0')"/>
126+
</td>
127+
</tr>
128+
</tfoot>
129+
</table>
130+
<img class="chart" alt="timeline of link checking results" width="800" higth="200">
131+
<xsl:attribute name="src">
132+
<xsl:text>/img/linkchecker/</xsl:text>
133+
<xsl:value-of select="$name" />
134+
<xsl:text>.png</xsl:text>
135+
</xsl:attribute>
136+
</img>
137+
</article>
141138
</xsl:for-each>
142139
</xsl:template>
143140
</xsl:stylesheet>

‎curation-web/src/main/resources/static/css/curation.css‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -188,26 +188,6 @@ div.markdown table {
188188
div.markdown table, div.markdown th, div.markdown td {
189189
border: 1px solid;
190190
}
191-
/*
192-
.Ok{
193-
background-color: #00FF80;
194-
}
195-
.Undetermined{
196-
background-color: #BFFF00;
197-
}
198-
.Restricted_Access{
199-
background-color: #F4FA58;
200-
}
201-
.Blocked_By_Robots_txt{
202-
background-color: #FE9A2E;
203-
}
204-
.Broken{
205-
background-color: #F78181;
206-
}
207-
.Invalid_URL{
208-
background-color: #FA5858;
209-
}
210-
*/
211191
.alert{
212192
background-color: rgba(250, 88, 88, 0.76);
213193
}
@@ -217,3 +197,11 @@ div.markdown table, div.markdown th, div.markdown td {
217197
#profiles .facetNotCovered{
218198
background-color: lightcoral;
219199
}
200+
img.chart-linkchecker{
201+
margin: 6px;
202+
}
203+
article{
204+
border-bottom-style: solid;
205+
border-bottom-width: 3px;
206+
border-bottom-color: black;
207+
}

0 commit comments

Comments
 (0)