From d6725d4fbe2cbc16fd5ed330038f6125220f696f Mon Sep 17 00:00:00 2001 From: Patrick O'Carroll Date: Mon, 18 Sep 2017 14:04:55 +0200 Subject: [PATCH] updated error page html+css, added ds_store to ignore (#9285) --- .gitignore | 1 + public/app/partials/error.html | 48 +++++++++++++++++++- public/img/graph404.svg | 73 +++++++++++++++++++++++++++++++ public/sass/_grafana.scss | 2 +- public/sass/pages/_errorpage.scss | 60 +++++++++++++++++++++++++ public/views/500.html | 20 +++++++-- 6 files changed, 197 insertions(+), 7 deletions(-) create mode 100644 public/img/graph404.svg create mode 100644 public/sass/pages/_errorpage.scss diff --git a/.gitignore b/.gitignore index 0e6affc6120..f14b48eb248 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ public/css/*.min.css .idea/ *.iml *.tmp +.DS_Store .vscode/ /data/* diff --git a/public/app/partials/error.html b/public/app/partials/error.html index 16a5815295d..b1ae05e7e93 100644 --- a/public/app/partials/error.html +++ b/public/app/partials/error.html @@ -4,8 +4,52 @@

- Page not found (404) -

+ Page not found (404) + +
+
+
+
+
+
+
+

100%

+

80%

+

60%

+

40%

+

20%

+

0%

+
+
+ +
+

Then

+

Now

+
+
+
+
+
+
+

current

+
+
+ +
+
+

Chance your are one the page your'e looking for.

+

0%

+
+
+

Sorry for the inconvenience

+

Please go back to your home dashboard and try again.

+

If the error persists, seek help att the community site.

+
+
+
+
+ +
diff --git a/public/img/graph404.svg b/public/img/graph404.svg new file mode 100644 index 00000000000..c9d29fdd049 --- /dev/null +++ b/public/img/graph404.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss index 81ed198be73..77afde21e37 100644 --- a/public/sass/_grafana.scss +++ b/public/sass/_grafana.scss @@ -89,6 +89,6 @@ @import "pages/plugins"; @import "pages/signup"; @import "pages/styleguide"; - +@import "pages/errorpage"; @import "old_responsive"; @import "components/view_states.scss"; diff --git a/public/sass/pages/_errorpage.scss b/public/sass/pages/_errorpage.scss new file mode 100644 index 00000000000..63676417274 --- /dev/null +++ b/public/sass/pages/_errorpage.scss @@ -0,0 +1,60 @@ + +// +// Layout +// + +.error-row { + display: flex; + flex-direction: row; +} + +.error-column { + display: flex; + flex-direction: column; +} + +.error-space-between {justify-content: space-between;} + +.graph-box { + width: 62%; + padding: 2rem 1rem; +} + +.info-box { + width: 38%; + padding: 2rem 1rem 6rem; +} + +.graph-percentage {padding: 0 0 1.5rem;} + +.image-box {padding: .5rem} + +.left-margin{padding: 0 0 0 5rem;} + +.current-box {justify-content: flex-end;} + +// +// Text +// + +.current-text { + color: $blue; + font-weight: bold; + line-height: 1rem; +} + +.error-link {color: $yellow;} + +.error-minus { + color: #7eb26d; + padding: 0 .5rem; + line-height: 1.5rem; +} + +.graph-percentage p { + text-align: right; + margin: 0; + line-height: 1rem; +} + +.graph-text {margin: 0;} \ No newline at end of file diff --git a/public/views/500.html b/public/views/500.html index dca1245535f..5b0150a4654 100644 --- a/public/views/500.html +++ b/public/views/500.html @@ -15,10 +15,22 @@

Server side error :(

-

[[.Title]]

- [[if .ErrorMsg]] - 
[[.ErrorMsg]]
- [[end]] +
+
+
+
+
[[.Title]]
+
+ [[if .ErrorMsg]] + 
[[.ErrorMsg]]
+ [[end]] +
+
+
+
+

Check the Grafana server logs for the detailed error message.

+
+