diff options
| -rw-r--r-- | public/static/js/travelynx-actions.js | 8 | ||||
| -rw-r--r-- | templates/_connections.html.ep | 12 | ||||
| -rw-r--r-- | templates/departures.html.ep | 6 |
3 files changed, 16 insertions, 10 deletions
diff --git a/public/static/js/travelynx-actions.js b/public/static/js/travelynx-actions.js index 7558e69..a1fa685 100644 --- a/public/static/js/travelynx-actions.js +++ b/public/static/js/travelynx-actions.js @@ -65,7 +65,13 @@ function odelay(sched, rt) { function tvly_run(link, req, err_callback) { var error_icon = '<i class="material-icons">error</i>'; - var progressbar = $('<div class="progress"><div class="indeterminate"></div></div>'); + var progressbar; + if (link.data('tr')) { + progressbar = $('<tr><td colspan="' + link.data('tr') + '"><div class="progress"><div class="indeterminate"></div></div></td></tr>'); + } + else { + progressbar = $('<div class="progress"><div class="indeterminate"></div></div>'); + } link.hide(); link.after(progressbar); $.post('/action', req, function(data) { diff --git a/templates/_connections.html.ep b/templates/_connections.html.ep index d09f0c0..9b009df 100644 --- a/templates/_connections.html.ep +++ b/templates/_connections.html.ep @@ -7,10 +7,10 @@ % $td_class = 'cancelled'; % $link_class = 'action-cancelled-from'; % } - <tr> + <tr class="<%= $link_class %>" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"> <td class="<%= $td_class %>"> % if ($checkin_from) { - <a class="<%= $link_class %>" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $train->line %></a> + <a><%= $train->line %></a> % } % else { %= $train->line @@ -18,7 +18,7 @@ </td> <td class="<%= $td_class %>"> % if ($checkin_from) { - <a class="<%= $link_class %>" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $via %></a> + <a><%= $via %></a> % } % else { %= $via @@ -70,10 +70,10 @@ % $td_class = 'cancelled'; % $link_class = 'action-cancelled-from'; % } - <tr> + <tr class="<%= $link_class %>" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>" data-tr="4"> <td class="<%= $td_class %>"> % if ($checkin_from) { - <a class="<%= $link_class %>" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $train->line %></a> + <a><%= $train->line %></a> % } % else { %= $train->line @@ -81,7 +81,7 @@ </td> <td class="<%= $td_class %>"> % if ($checkin_from) { - <a class="<%= $link_class %>" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $via %></a> + <a><%= $via %></a> % } % else { %= $via diff --git a/templates/departures.html.ep b/templates/departures.html.ep index 91b3331..220d951 100644 --- a/templates/departures.html.ep +++ b/templates/departures.html.ep @@ -86,14 +86,14 @@ </td> </tr> % } - <tr> + <tr class="<%= $link_class %>" data-station="<%= $result->station_uic %>" data-train="<%= $result->train_id %>" data-tr="3"> <td> - <a class="<%= $link_class %>" data-station="<%= $result->station_uic %>" data-train="<%= $result->train_id %>"> + <a> <%= $result->line %> </a> </td> <td class="<%= $td_class %>"> - <a class="<%= $link_class %>" data-station="<%= $result->station_uic %>" data-train="<%= $result->train_id %>"> + <a> <%= $result->destination %> </a> </td> |