From 38340e01ff8bec3c1a89b9bd294c49f78a73e411 Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Sat, 22 Jun 2019 22:07:29 +0000 Subject: [PATCH] Fix delay calcs when times are from two different days (i.e. 23:59-00:00) --- index.html | 122 +++++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 45 deletions(-) diff --git a/index.html b/index.html index 88c5547..eb69a99 100644 --- a/index.html +++ b/index.html @@ -1,56 +1,76 @@ <!DOCTYPE html> -<html lang="en"> +<html lang="pl"> <head> - <title>TTSS Kraków - Real-time tram departures</title> + <title>TTSS Kraków - Odjazdy tramwajów na żywo</title> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <link rel="stylesheet" type="text/css" href="index.css"> + <style type="text/css" id="vehicle-data-style"></style> </head> <body> <nav class="navbar navbar-default"> <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">TTSS Kraków</a> - </div> + <ul class="nav navbar-nav"> + <li class="navbar-header"> + <a class="navbar-brand" href="" data-translate="page_name">TTSS Kraków</a> + </li> + <li> + <form class="navbar-form navbar-left"> + <select class="form-control" id="lang-select"> + <option value="pl">PL</option> + <option value="en">EN</option> + </select> + </form> + </li> + <li> + <a href="/map.html" data-translate="map">Mapa</a> + </li> + </ul> + + <form class="navbar-form navbar-left"> <div class="input-group"> <span class="input-group-btn"> - <input type="text" class="form-control form-round-left" id="stop-name" placeholder="Stop name" /> + <input type="text" class="form-control form-round-left" id="stop-name" placeholder="Nazwa przystanku" autofocus="autofocus" /> </span> <select class="form-control" id="stop-name-autocomplete"> </select> <span class="input-group-btn"> - <button type="submit" class="btn btn-default">Go</button> + <button type="submit" class="btn btn-default" data-translate="go_button">Dalej</button> </span> </div> </form> - <button type="button" class="btn btn-default navbar-btn pull-right" id="refresh" disabled="disabled">⟳ Refresh</button> - - <p class="navbar-text pull-right" id="refresh-text">Initializing...</p> + <button type="button" class="btn btn-default navbar-btn pull-right" id="refresh" disabled="disabled" data-translate="refresh_button">⟳ Odśwież</button> + <p class="navbar-text pull-right" id="refresh-text">Ładowanie...</p> </div> </nav> + <div class="container-fluid"> <div id="alert" class="alert alert-danger alert-dismissible" style="display:none"> <a href="#" class="close" id="alert-close" aria-label="close">×</a> - <strong>Error occured!</strong> <span id="alert-text"></span> + <strong data-translate="error_title">Wystąpił błąd!</strong> <span id="alert-text"></span> </div> <div class="row"> <div class="col-md-6"> - <h2 id="times-stop-name"></h2> + <h2 id="times-stop"><small id="times-stop-type"></small><br /><span id="times-stop-name"></span></h2> <div id="times-alerts"></div> <table class="table table-striped table-condensed"> <thead> <tr> - <th>Line</th> - <th>Direction</th> - <th>Time</th> - <th>Delay</th> + <th data-translate="header_line">Linia</th> + <th> + <span data-translate="header_direction">Kierunek</span> + <a id="vehicle-data" data-translate="header_vehicle">Pojazd</span> + </th> + <th data-translate="header_vehicle" class="vehicleData">Pojazd</th> + <th data-translate="header_time">Czas</th> + <th data-translate="header_delay">Opóźn.</th> </tr> </thead> <tbody id="times-table"> @@ -58,52 +78,64 @@ </table> </div> <div class="col-md-6"> - <h3>Lines</h3> + <!-- + <h3 data-translate="header_lines">Linie</h3> <table class="table table-condensed"> <thead> <tr> - <th>Line</th> - <th>Route</th> - <th>Carrier</th> + <th data-translate="header_line">Linia</th> + <th data-translate="header_route">Trasa</th> + <th data-translate="header_carrier">Przewoźnik</th> </tr> </thead> <tbody id="times-lines"> - - </tbody> - </table> - - <!-- - <h3 id="route-line"></h3> - - <table class="table table-condensed"> - <thead> - <tr> - <th>Stop</th> - </tr> - </thead> - <tbody id="route-table"> - </tbody> </table> --> + <p data-translate="help_click_for_schedule">Kliknij na wpis w tabeli odjazdów by zobaczyć rozkład jazdy danego pojazdu.</p> + + <h3 id="route-line"></h3> + + <p id="route-vehicle"></p> + + <table class="table table-condensed"> + <thead> + <tr> + <th data-translate="header_time">Czas</th> + <th data-translate="header_stop">Przystanek</th> + </tr> + </thead> + <tbody id="route-table"> + </tbody> + </table> + <p class="small"> - Legend: - <span class="label bg-active">Departed</span> - <span class="label bg-success">At stop</span> - <span class="label bg-default">En route</span> - <span class="label bg-warning">Delayed 4′+</span> - <span class="label bg-danger">Delayed 10′+</span> + <span data-translate="help_legend">Legenda:</span> + <span class="label bg-active" data-translate="status_departed">Odjechał</span> + <span class="label bg-success" data-translate="status_stopped">Na przystanku</span> + <span class="label bg-default" data-translate="status_default">W trasie</span> + <span class="label bg-warning" data-translate="status_delayed_4">Opóźniony 4′+</span> + <span class="label bg-danger" data-translate="status_delayed_10">Opóźniony 10′+</span> </p> - <p class="small">Relative times (eg. 3 min) are real-time arrivals based on tram location data. Absolute times (eg. 8:01) are scheduled departures, shown when the tram cannot be located. "?" means unknown delay.</p> + <p class="small"> + <span class="bigger" title="Bombardier NGT6, Bombardier NGT8, PESA 2014N Krakowiak, Newag Nevelo 126N" data-translate="low_floor_sign">♿</span> - <span data-translate="low_floor_description">pojazd niskopodłogowy</span>. + <span class="bigger" title="Düwag/Man/MPK N8C-NF, Düwag/MPK GT8C, Bombardier-Rotax/MPK EU8N, Protram 405N-Kr" data-translate="partially_low_floor_sign">*♿</span> - <span data-translate="partially_low_floor_description">pojazd częściowo niskopodłogowy</span>. + <span class="bigger" title="other tram types" data-translate="high_floor_sign">‐</span> - <span data-translate="high_floor_description">pojazd wysokopodłogowy</span>. + <span data-translate="help_hover_for_more">Najedź na ikonę, by uzyskać więcej informacji.</span> + </p> - <p class="small">© 2016 Jacek Kowalski - <a href="https://github.com/jacekkow/mpk-ttss">Source</a> - <a href="https://raw.githubusercontent.com/jacekkow/mpk-ttss/master/LICENSE">License</a></p> + <p class="small" data-translate="help_text">Względne czasy (np. 3 min) są podawane na podstawie faktycznej lokalizacji pojazdów. Czasy bezwzględne (np. 8:01) to odjazdy rozkładowe, pokazywane gdy pojazd nie może być zlokalizowany. "?" oznacza nieznane opóźnienie.</p> + + <p class="small">© 2016-2019 Jacek Kowalski - <a href="https://github.com/jacekkow/mpk-ttss" data-translate="help_source">Źródło</a> - <a href="https://raw.githubusercontent.com/jacekkow/mpk-ttss/master/LICENSE" data-translate="help_license">Licencja</a></p> </div> </div> </div> - <script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7" crossorigin="anonymous"></script> - <script type="text/javascript" src="index.js"></script> + <script src="https://polyfill.io/v3/polyfill.min.js?features=Promise,XMLHttpRequest"></script> + <script type="text/javascript" src="lang_pl.js?v9" id="lang_script"></script> + <script type="text/javascript" src="common.js?v10"></script> + <script type="text/javascript" src="index.js?v8"></script> </body> </html> -- Gitblit v1.9.1