diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2019-08-11 20:14:55 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2019-08-11 20:14:55 +0200 |
| commit | 75d5a9234353d50d90f853175bf9af5b41d42044 (patch) | |
| tree | d0c252cb8ca989e39717e01770911f4944298175 | |
| parent | 661f3d079c7643acac16ffa372c20d80ee42244b (diff) | |
use asset versioning
| -rw-r--r-- | public/static/502.html | 20 | ||||
| -rw-r--r-- | public/static/504.html | 20 | ||||
| -rw-r--r-- | public/static/css/display.css (renamed from public/static/display.css) | 2 | ||||
| -rw-r--r-- | public/static/css/infoscreen.css (renamed from public/static/infoscreen.css) | 0 | ||||
| -rw-r--r-- | public/static/css/main.css (renamed from public/static/main.css) | 0 | ||||
| -rw-r--r-- | public/static/css/mobile.css (renamed from public/static/mobile.css) | 0 | ||||
| -rw-r--r-- | public/static/fonts/VRRR.ttf (renamed from public/static/VRRR.ttf) | bin | 139372 -> 139372 bytes | |||
| -rw-r--r-- | public/static/js/collapse.js (renamed from public/static/collapse.js) | 0 | ||||
| -rw-r--r-- | public/static/js/image.js (renamed from public/static/image.js) | 0 | ||||
| -rw-r--r-- | public/static/js/jquery-2.1.1.min.js (renamed from public/static/jquery-2.1.1.min.js) | 0 | ||||
| l--------- | public/static/v1 | 1 | ||||
| -rw-r--r-- | templates/display.html.ep | 5 | ||||
| -rw-r--r-- | templates/exception.html.ep | 3 | ||||
| -rw-r--r-- | templates/infoscreen.html.ep | 9 | ||||
| -rw-r--r-- | templates/main.html.ep | 7 | ||||
| -rw-r--r-- | templates/not_found.html.ep | 3 |
16 files changed, 58 insertions, 12 deletions
diff --git a/public/static/502.html b/public/static/502.html new file mode 100644 index 0000000..7702a87 --- /dev/null +++ b/public/static/502.html @@ -0,0 +1,20 @@ +<!DOCTYPE html> +<html> +<head> + <title>vrr-infoscreen: 502 Bad Gateway</title> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link href="/static/main.css" rel="stylesheet"> +</head> +<body> + +<div class="container"> +<div class="error"> +<strong>502 Bad Gateway</strong> +Das Backend konnte die Anfrage nicht bearbeiten.<br/> +Mögliche Gründe dafür sind Programmierfehler oder Nichterreichbarkeit der +Nameserver von <a href="http://vrr.de">vrr.de</a>. +</div> <!-- error --> +</div> <!-- container --> +</body> +</html> diff --git a/public/static/504.html b/public/static/504.html new file mode 100644 index 0000000..2298cd0 --- /dev/null +++ b/public/static/504.html @@ -0,0 +1,20 @@ +<!DOCTYPE html> +<html> +<head> + <title>vrr-infoscreen: 504 Gateway Timeout</title> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link href="/static/main.css" rel="stylesheet"> +</head> +<body> + +<div class="container"> +<div class="error"> +<strong>504 Gateway Timeout</strong> +Das Backend konnte die Anfrage nicht rechtzeitig bearbeiten.<br/> +Mögliche Gründe dafür sind Programmierfehler oder Nichterreichbarkeit der +Nameserver von <a href="http://vrr.de">vrr.de</a>. +</div> <!-- error --> +</div> <!-- container --> +</body> +</html> diff --git a/public/static/display.css b/public/static/css/display.css index f874bf2..76280c5 100644 --- a/public/static/display.css +++ b/public/static/css/display.css @@ -1,6 +1,6 @@ @font-face { font-family: VRRR; - src: url('/static/VRRR.ttf'); + src: url('/static/v1/fonts/VRRR.ttf'); } body { diff --git a/public/static/infoscreen.css b/public/static/css/infoscreen.css index c2415be..c2415be 100644 --- a/public/static/infoscreen.css +++ b/public/static/css/infoscreen.css diff --git a/public/static/main.css b/public/static/css/main.css index 7eee1f3..7eee1f3 100644 --- a/public/static/main.css +++ b/public/static/css/main.css diff --git a/public/static/mobile.css b/public/static/css/mobile.css index efa6023..efa6023 100644 --- a/public/static/mobile.css +++ b/public/static/css/mobile.css diff --git a/public/static/VRRR.ttf b/public/static/fonts/VRRR.ttf Binary files differindex e532b93..e532b93 100644 --- a/public/static/VRRR.ttf +++ b/public/static/fonts/VRRR.ttf diff --git a/public/static/collapse.js b/public/static/js/collapse.js index d38b30a..d38b30a 100644 --- a/public/static/collapse.js +++ b/public/static/js/collapse.js diff --git a/public/static/image.js b/public/static/js/image.js index 40bc37d..40bc37d 100644 --- a/public/static/image.js +++ b/public/static/js/image.js diff --git a/public/static/jquery-2.1.1.min.js b/public/static/js/jquery-2.1.1.min.js index e5ace11..e5ace11 100644 --- a/public/static/jquery-2.1.1.min.js +++ b/public/static/js/jquery-2.1.1.min.js diff --git a/public/static/v1 b/public/static/v1 new file mode 120000 index 0000000..945c9b4 --- /dev/null +++ b/public/static/v1 @@ -0,0 +1 @@ +.
\ No newline at end of file diff --git a/templates/display.html.ep b/templates/display.html.ep index 4cf52a2..5a98e1a 100644 --- a/templates/display.html.ep +++ b/templates/display.html.ep @@ -3,8 +3,9 @@ <head> <title><%= $title %></title> <meta charset="utf-8"> - %= stylesheet '/static/display.css' - %= javascript '/static/jquery-2.1.1.min.js' + % my $av = 'v1'; # asset version + %= stylesheet "/static/${av}/css/display.css" + %= javascript '/static/js/jquery-2.1.1.min.js' </head> <body style="color: #<%= join(q{}, map { sprintf('%02x', $_) } @{$color} ) %>; font-size: <%= $scale * 100 %>%;"> diff --git a/templates/exception.html.ep b/templates/exception.html.ep index 2312586..aea4c40 100644 --- a/templates/exception.html.ep +++ b/templates/exception.html.ep @@ -4,7 +4,8 @@ <title>vrr-infoscreen</title> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - %= stylesheet '/static/main.css' + % my $av = 'v1'; # asset version + %= stylesheet "/static/${av}/css/main.css" </head> <body> diff --git a/templates/infoscreen.html.ep b/templates/infoscreen.html.ep index d634a93..a2f92e6 100644 --- a/templates/infoscreen.html.ep +++ b/templates/infoscreen.html.ep @@ -8,12 +8,13 @@ <meta http-equiv="refresh" content="<%= $self->stash('refresh_interval') %>"/> % } - %= stylesheet '/static/infoscreen.css' + % my $av = 'v1'; # asset version + %= stylesheet "/static/${av}/css/infoscreen.css" % if ($self->browser->mobile) { - %= stylesheet '/static/mobile.css' + %= stylesheet "/static/${av}/css/mobile.css" % } - %= javascript '/static/jquery-2.1.1.min.js' - %= javascript '/static/collapse.js' + %= javascript '/static/js/jquery-2.1.1.min.js' + %= javascript "/static/${av}/js/collapse.js" </head> <body> diff --git a/templates/main.html.ep b/templates/main.html.ep index 1c539fb..3c18b49 100644 --- a/templates/main.html.ep +++ b/templates/main.html.ep @@ -4,9 +4,10 @@ <title><%= $title %></title> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - %= stylesheet '/static/main.css' - %= javascript '/static/jquery-2.1.1.min.js' - %= javascript '/static/image.js' + % my $av = 'v1'; # asset version + %= stylesheet "/static/${av}/css/main.css" + %= javascript '/static/js/jquery-2.1.1.min.js' + %= javascript "/static/${av}/js/image.js" </head> <body> diff --git a/templates/not_found.html.ep b/templates/not_found.html.ep index 1fada6c..98bb664 100644 --- a/templates/not_found.html.ep +++ b/templates/not_found.html.ep @@ -4,7 +4,8 @@ <title>vrr-infoscreen</title> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - %= stylesheet '/static/main.css' + % my $av = 'v1'; # asset version + %= stylesheet "/static/${av}/css/main.css" </head> <body> |