From 4b9ca3f13ef692bfab6dcdc83047e15bca813e9f Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Fri, 27 Jul 2018 14:55:32 -0400 Subject: [PATCH] recenter errors and missing locales --- app/assets/stylesheets/application.scss | 4 --- .../application/migration_error.html.erb | 26 ++++++++----------- app/views/errors/internal_error.html.erb | 18 +++++-------- app/views/errors/not_found.html.erb | 18 +++++-------- app/views/errors/unprocessable.html.erb | 18 +++++-------- config/locales/en.yml | 2 ++ 6 files changed, 34 insertions(+), 52 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 60b489b9..e04b5ee3 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -51,10 +51,6 @@ a { min-height: calc(100% - #{$header-height} - #{$footer-height}); } -.flex-center { - transform: translateY(25%); -} - .footer { height: $footer-height; width: 100%; diff --git a/app/views/application/migration_error.html.erb b/app/views/application/migration_error.html.erb index 06d9d420..b1e90fc1 100644 --- a/app/views/application/migration_error.html.erb +++ b/app/views/application/migration_error.html.erb @@ -1,16 +1,12 @@ -
-
-
- -

<%= t("errors.migration_error.notice") %>

-

<%= t("errors.migration_error.contact_admin") %>

-

<%= t("errors.migration_error.version") %>

- - <%= t("errors.migration_error.upgrade") %> - - - <%= t("errors.migration_error.continue") %> - -
-
+
+ +

<%= t("errors.migration_error.notice").html_safe %>

+

<%= t("errors.migration_error.contact_admin") %>

+

<%= t("errors.migration_error.version") %>

+ + <%= t("errors.migration_error.upgrade") %> + + + <%= t("errors.migration_error.continue") %> +
diff --git a/app/views/errors/internal_error.html.erb b/app/views/errors/internal_error.html.erb index ddf4c539..32419b57 100644 --- a/app/views/errors/internal_error.html.erb +++ b/app/views/errors/internal_error.html.erb @@ -1,12 +1,8 @@ -
-
-
-
500
-

<%= t("errors.internal.message") %>

-

<%= t("errors.internal.help") %>

- - <%= t("go_back") %> - -
-
+
+
500
+

<%= t("errors.internal.message") %>

+

<%= t("errors.internal.help") %>

+ + <%= t("go_back") %> +
diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb index 82f6b7f1..fae449dc 100644 --- a/app/views/errors/not_found.html.erb +++ b/app/views/errors/not_found.html.erb @@ -1,12 +1,8 @@ -
-
-
-
404
-

<%= t("errors.not_found.message") %>

-

<%= t("errors.not_found.help") %>

- - <%= t("go_back") %> - -
-
+
+
404
+

<%= t("errors.not_found.message") %>

+

<%= t("errors.not_found.help") %>

+ + <%= t("go_back") %> +
diff --git a/app/views/errors/unprocessable.html.erb b/app/views/errors/unprocessable.html.erb index 67958f07..9aac5bd7 100644 --- a/app/views/errors/unprocessable.html.erb +++ b/app/views/errors/unprocessable.html.erb @@ -1,12 +1,8 @@ -
-
-
-
422
-

<%= t("errors.unprocessable.message") %>

-

<%= t("errors.unprocessable.help") %>

- - <%= t("go_back") %> - -
-
+
+
422
+

<%= t("errors.unprocessable.message") %>

+

<%= t("errors.unprocessable.help") %>

+ + <%= t("go_back") %> +
diff --git a/config/locales/en.yml b/config/locales/en.yml index 6b49b999..ae3c6332 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -18,6 +18,8 @@ en: notice: > Greenlight encountered a database migration error.
This may be because you haven't updated to Greenlight 2.0. + upgrade: Show me how to upgrade to 2.0! + version: We've released a new version of Greenlight, but your database isn't compatible. not_found: message: Whoops! Looks like we can't find that. help: Is it possible its been removed?