--- a/templates/cluster.html Mon Aug 13 22:56:30 2018 +0300
+++ b/templates/cluster.html Fri Sep 07 00:23:42 2018 +0300
@@ -1,8 +1,9 @@
-{% from "macros.html" import route_rep %}
+{% from "macros.html" import route_rep, bus_stop_rep %}
<html>
<head>
<link rel="icon" type="image/png" href="../static/favicon.png" />
<link rel="stylesheet" type="text/css" href="../static/style.css" />
+ <base href=".." />
<meta charset='UTF-8' />
<meta http-equiv='refresh' content='60'>
<title>{{name}}</title>
@@ -56,7 +57,7 @@
<span class='actions'>
<a class="pysäkki-sijainti" href="{{link_to_map}}" target="_blank">📌</a>
{% if cluster %}
- <a href="../stop_cluster/{{cluster}}">🞊</a>
+ <a href="stop_cluster/{{cluster}}">🞊</a>
{% endif %}
</th>
</tr>
@@ -71,13 +72,14 @@
{{halt['time']}}
</td>
<td class='sarake-pysäkki'>
- <a href="../stop/{{halt['stop_id']}}"><img src="../static/{{halt['typename']}}.png" height="24" /> {{halt['stop_code']}}</a>
+ <!--<a href="../stop/{{halt['stop_id']}}"><img src="../static/{{halt['typename']}}.png" height="24" /> {{halt['stop_code']}}</a>-->
+ {{bus_stop_rep(halt['stop'])}}
</td>
<td class='sarake-linja linja'>
- <a href="../trip/{{halt['trip']}}">{{route_rep(halt['route-splice'])}}</a>
+ <a href="trip/{{halt['trip']}}">{{route_rep(halt['route-splice'])}}</a>
</td>
<td class='sarake-määränpää' colspan='2'>
- <a href="../trip/{{halt['trip']}}">{{halt['sign']}}</a>
+ <a href="trip/{{halt['trip']}}">{{halt['sign']}}</a>
</td>
</tr>
{% endfor %}