# HG changeset patch # User Teemu Piippo # Date 1497943847 -10800 # Node ID cb423946cf3314ad8062b31465ba0bb8cc9bf1be # Parent e6bdb9c540962b755a6f48da98e1ac0864b2fbab Uudelleennimetty templaatit diff -r e6bdb9c54096 -r cb423946cf33 service.py --- a/service.py Tue Jun 20 10:27:52 2017 +0300 +++ b/service.py Tue Jun 20 10:30:47 2017 +0300 @@ -84,7 +84,7 @@ 'night': is_night_time(schedule_entry['time']), }) return render_template( - 'pysäkki.html', + 'stop.html', schedule = schedule, name = reference + ' ' + tr(bus_stop.name, 'bus_stops'), link_to_map = bus_stop.location.link_to_map, @@ -175,7 +175,7 @@ sign = [sign[0], sign[-1]] for entry in concise_schedule: entry['region'] = tr(entry['region'], 'paikat') - return render_template('ajovuoro.html', + return render_template('trip.html', schedule = schedule, concise_schedule = concise_schedule, trip_reference = trip_reference, diff -r e6bdb9c54096 -r cb423946cf33 templates/ajovuoro-suppea.html --- a/templates/ajovuoro-suppea.html Tue Jun 20 10:27:52 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - - - - - - - {{linja}} {{selite}} - - -

{{linja}} {{selite}}

- - diff -r e6bdb9c54096 -r cb423946cf33 templates/ajovuoro.html --- a/templates/ajovuoro.html Tue Jun 20 10:27:52 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,89 +0,0 @@ - - - - - - - - {{route}} {{description}} - - -

- {% if night %} - 🌙 - {% endif %} - {{route}} {{description}}

- -
Ajomatka: {{'%.1f' % length}}km
-
- - - - - - {% for entry in concise_schedule %} - - - - - {% endfor %} -
AikaAlue
{{entry['time']}}{{entry['region']}}
-
- - - diff -r e6bdb9c54096 -r cb423946cf33 templates/pysäkki.html --- a/templates/pysäkki.html Tue Jun 20 10:27:52 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ - - - - - - {{nimi}} - - {% if tausta %} - - {% endif %} - - -

{{name}}

-

- {{region or ""}} - — - 📌 ({{location}}) -

- {% if cluster %} -

- {{tr('nearby-area-schedule', 'misc-text')}} -

- {% endif %} - - - - - - - {% for halt in schedule %} - - - - - - {% endfor %} -
{{tr('time', 'headings')}}{{tr('route', 'headings')}}{{tr('destination', 'headings')}}
{{halt['time']}} - {{halt['route']}} - - {{halt['sign']}} -
- - diff -r e6bdb9c54096 -r cb423946cf33 templates/stop.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/stop.html Tue Jun 20 10:30:47 2017 +0300 @@ -0,0 +1,54 @@ + + + + + + {{nimi}} + + {% if tausta %} + + {% endif %} + + +

{{name}}

+

+ {{region or ""}} + — + 📌 ({{location}}) +

+ {% if cluster %} +

+ {{tr('nearby-area-schedule', 'misc-text')}} +

+ {% endif %} + + + + + + + {% for halt in schedule %} + + + + + + {% endfor %} +
{{tr('time', 'headings')}}{{tr('route', 'headings')}}{{tr('destination', 'headings')}}
{{halt['time']}} + {{halt['route']}} + + {{halt['sign']}} +
+ + diff -r e6bdb9c54096 -r cb423946cf33 templates/trip.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/trip.html Tue Jun 20 10:30:47 2017 +0300 @@ -0,0 +1,89 @@ + + + + + + + + {{route}} {{description}} + + +

+ {% if night %} + 🌙 + {% endif %} + {{route}} {{description}}

+ +

Ajomatka: {{'%.1f' % length}}km

+
+ + + + + + {% for entry in concise_schedule %} + + + + + {% endfor %} +
AikaAlue
{{entry['time']}}{{entry['region']}}
+
+ + +