--- a/templates/cluster.html Thu Aug 31 21:30:34 2017 +0300
+++ b/templates/cluster.html Sun Sep 03 14:10:38 2017 +0300
@@ -36,10 +36,7 @@
</style>
</head>
<body>
- <h1><img src="../static/pysäkki.png" height="96" /> <span>{{name}}</span></h1>
- <p id="pysäkki-info">
- <a class="pysäkki-sijainti" href="{{link_to_map}}" target="_blank">📌 ({{location}})</a>
- </p>
+<!--
<div class="stops-in-cluster">
<ul>
{% for stop in stops_in_cluster %}
@@ -47,13 +44,29 @@
{% endfor %}
</ul>
</div>
+-->
<table class='aikataulu' cellspacing="0">
+ <thead>
+ <tr>
+ <th class='primary-heading' colspan='5'>
+ <span>{{name}}</span>
+ </th>
+ </tr>
<tr>
<th class='sarake-aika'>{{tr('time', 'headings')}}</th>
+ <th class='sarake-pysäkki'>{{tr('bus-stop', 'headings')}}</th>
<th class='sarake-linja'>{{tr('route', 'headings')}}</th>
<th class='sarake-määränpää'>{{tr('destination', 'headings')}}</th>
- <th class='sarake-pysäkki'>{{tr('bus-stop', 'headings')}}</th>
+ <th>
+ <span class='actions'>
+ <a class="pysäkki-sijainti" href="{{link_to_map}}" target="_blank">📌</a>
+ {% if cluster %}
+ <a href="../stop_cluster/{{cluster}}">🞊</a>
+ {% endif %}
+ </th>
</tr>
+ </thead>
+ <tbody>
{% for halt in schedule %}
<tr class="{% if halt['night'] %} yö {% endif %}">
<td class='sarake-aika'>
@@ -62,17 +75,18 @@
{% endif %}
{{halt['time']}}
</td>
+ <td class='sarake-pysäkki'>
+ <a href="../stop/{{halt['stop_id']}}"><img src="../static/pysäkki.png" height="24" /> {{halt['stop_code']}}</a>
+ </td>
<td class='sarake-linja linja'>
<a href="../trip/{{halt['trip']}}">{{halt['route']}}</a>
</td>
- <td class='sarake-määränpää'>
+ <td class='sarake-määränpää' colspan='2'>
<a href="../trip/{{halt['trip']}}">{{halt['sign']}}</a>
</td>
- <td class='sarake-pysäkki'>
- <a href="../stop/{{halt['stop_id']}}"><img src="../static/pysäkki.png" height="24" /> {{halt['stop_code']}}</a>
- </td>
</tr>
{% endfor %}
+ </tbody>
</table>
</body>
</html>