diff --git a/public/service-worker.js b/public/service-worker.js index 8268bd084f911181c0f44123a4e4871c977211ec..130260916d82ea11dcba456619a088ab6738a2fb 100644 --- a/public/service-worker.js +++ b/public/service-worker.js @@ -1,19 +1,19 @@ -const CACHE_NAME = 'static-cache-v31'; +const CACHE_NAME = 'static-cache-v32'; const FILES_TO_CACHE = [ '/favicon.ico', '/offline.html', - '/static/v31/css/light.min.css', - '/static/v31/css/dark.min.css', - '/static/v31/css/material-icons.css', - '/static/v31/css/local.css', - '/static/v31/fonts/MaterialIcons-Regular.woff2', - '/static/v31/fonts/MaterialIcons-Regular.woff', - '/static/v31/fonts/MaterialIcons-Regular.ttf', - '/static/v31/js/jquery-3.4.1.min.js', - '/static/v31/js/materialize.min.js', - '/static/v31/js/travelynx-actions.min.js', - '/static/v31/js/autocomplete.min.js', - '/static/v31/js/geolocation.min.js', + '/static/v32/css/light.min.css', + '/static/v32/css/dark.min.css', + '/static/v32/css/material-icons.css', + '/static/v32/css/local.css', + '/static/v32/fonts/MaterialIcons-Regular.woff2', + '/static/v32/fonts/MaterialIcons-Regular.woff', + '/static/v32/fonts/MaterialIcons-Regular.ttf', + '/static/v32/js/jquery-3.4.1.min.js', + '/static/v32/js/materialize.min.js', + '/static/v32/js/travelynx-actions.min.js', + '/static/v32/js/autocomplete.min.js', + '/static/v32/js/geolocation.min.js', ]; self.addEventListener('install', (evt) => { diff --git a/public/static/css/local.css b/public/static/css/local.css index 7bb16a36b9d6bc372f4056369db7fdbed7ddb977..2eb14f096260850f3d242a8c57549c5e3b2a128f 100644 --- a/public/static/css/local.css +++ b/public/static/css/local.css @@ -11,6 +11,25 @@ td.cancelled { text-decoration: line-through; } +.wagons span { + margin-right: 0.5ex; + color: #808080; +} + +.wagons .wagonclass { + font-weight: bold; + color: inherit; +} + +.wagons .wagonnum { + margin-right: 0; + color: inherit; +} + +.wagons .checksum:before { + content: "-"; +} + h1 { font-size: 2.92rem; margin: 1.9466666667rem 0 1.168rem 0; diff --git a/public/static/css/material-icons.css b/public/static/css/material-icons.css index d2806ec970114a3fec152749ac0acff359a20b6b..07005de4fc7c54f122c51da71580c83b50f0e0a8 100644 --- a/public/static/css/material-icons.css +++ b/public/static/css/material-icons.css @@ -2,12 +2,12 @@ font-family: 'Material Icons'; font-style: normal; font-weight: 400; - src: url(/static/v31/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */ + src: url(/static/v32/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */ src: local('Material Icons'), local('MaterialIcons-Regular'), - url(/static/v31/fonts/MaterialIcons-Regular.woff2) format('woff2'), - url(/static/v31/fonts/MaterialIcons-Regular.woff) format('woff'), - url(/static/v31/fonts/MaterialIcons-Regular.ttf) format('truetype'); + url(/static/v32/fonts/MaterialIcons-Regular.woff2) format('woff2'), + url(/static/v32/fonts/MaterialIcons-Regular.woff) format('woff'), + url(/static/v32/fonts/MaterialIcons-Regular.ttf) format('truetype'); } .material-icons { diff --git a/public/static/manifest.json b/public/static/manifest.json index 8e67133fd373fcf2264cd066502633df809a95c0..5a44a3fa6aaee05cb995d642f9cd7d43c177d1dd 100644 --- a/public/static/manifest.json +++ b/public/static/manifest.json @@ -3,27 +3,27 @@ "short_name": "Travelynx", "scope": "/", "icons": [{ - "src": "/static/v31/icons/icon-128x128.png", + "src": "/static/v32/icons/icon-128x128.png", "sizes": "128x128", "type": "image/png" }, { - "src": "/static/v31/icons/icon-144x144.png", + "src": "/static/v32/icons/icon-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src": "/static/v31/icons/icon-152x152.png", + "src": "/static/v32/icons/icon-152x152.png", "sizes": "152x152", "type": "image/png" }, { - "src": "/static/v31/icons/icon-192x192.png", + "src": "/static/v32/icons/icon-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/static/v31/icons/icon-256x256.png", + "src": "/static/v32/icons/icon-256x256.png", "sizes": "256x256", "type": "image/png" }, { - "src": "/static/v31/icons/icon-512x512.png", + "src": "/static/v32/icons/icon-512x512.png", "sizes": "512x512", "type": "image/png" }], diff --git a/public/static/v30 b/public/static/v32 similarity index 100% rename from public/static/v30 rename to public/static/v32 diff --git a/templates/journey.html.ep b/templates/journey.html.ep index ff5bc1218a6aa2755070d0260c81cbd88cd4f5fc..976dc4d30a575a30aecee785b46f12b30c24caeb 100644 --- a/templates/journey.html.ep +++ b/templates/journey.html.ep @@ -179,7 +179,7 @@ <%= $station->[0] %> % } % else { - <%= $station->[0] %> + <%= $station->[0] %> % } % if ($journey->{edited} & 0x0010) { ∗ @@ -191,12 +191,12 @@ % if ($journey->{user_data} and $journey->{user_data}{wagons}) { Rollmaterial - + % for my $wagongroup (@{$journey->{user_data}{wagongroups} // []}) { - Gruppe <%= $wagongroup %>
+ Wagenverbund <%= $wagongroup %>
% } % for my $wagon (@{$journey->{user_data}{wagons}}) { - <%= substr($wagon->{id}, 0, 2) %><%= substr($wagon->{id}, 2, 2) %><%= substr($wagon->{id}, 4, 1) %><%= substr($wagon->{id}, 5, 3) %><%= substr($wagon->{id}, 8, 3) %><%= substr($wagon->{id}, 11) %> + <%= substr($wagon->{id}, 0, 2) %><%= substr($wagon->{id}, 2, 2) %><%= substr($wagon->{id}, 4, 1) %><%= substr($wagon->{id}, 5, 3) %><%= substr($wagon->{id}, 8, 3) %><%= substr($wagon->{id}, 11) %> %= $wagon->{type} % if ($wagon->{number}) { – Wagen <%= $wagon->{number} %> diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep index 51ffc462b56965185428e46c5f5b02e2194eb30f..bd9bf8d92940a2f880bf502bc060af470bd2fd1e 100644 --- a/templates/layouts/default.html.ep +++ b/templates/layouts/default.html.ep @@ -10,7 +10,7 @@ % while (my ($key, $value) = each %{stash('twitter') // {}}) { % } - % my $av = 'v31'; # asset version + % my $av = 'v32'; # asset version