From 0a6d5b176628aa000c0c3555c0876828090a63e0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 3 Apr 2021 20:51:19 +0200 Subject: [PATCH] Fix error views. --- resources/views/errors/404.twig | 44 ++++++++++++++++++ resources/views/errors/500.twig | 80 +++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 resources/views/errors/404.twig create mode 100644 resources/views/errors/500.twig diff --git a/resources/views/errors/404.twig b/resources/views/errors/404.twig new file mode 100644 index 0000000000..848d6674f5 --- /dev/null +++ b/resources/views/errors/404.twig @@ -0,0 +1,44 @@ + + + + + + + Firefly III | Maintenance Mode + + + + + + + + + +
+
+
+
+

404

+ +
+

404 - Page not found

+

+ {{ trans('errors.404_header') }} +

+

+ {{ trans('errors.404_page_does_not_exist') }} +

+

+ {{ trans('errors.404_send_error') }} +

+

+ {{ trans('errors.404_github_link')|raw }} +

+
+
+
+
+
+ + + diff --git a/resources/views/errors/500.twig b/resources/views/errors/500.twig new file mode 100644 index 0000000000..2844d6d9a6 --- /dev/null +++ b/resources/views/errors/500.twig @@ -0,0 +1,80 @@ + + + + + + + Firefly III | 500 Error + + + + + + + + + +
+
+
+
+

500

+ +
+

{{ trans('errors.error_occurred') }}

+ +

+ {{ trans('errors.error_not_recoverable') }} +

+

+ {{ exception.getMessage |default('General unknown errror') }} +

+ + {% if not debug %} +

+ {{ trans('errors.more_info') }} +

+

+ {{ trans('errors.collect_info')|raw }} + {{ trans('errors.collect_info_more')|raw }} +

+

+ {{ trans('errors.github_help') }} +

+

+ {{ trans('errors.github_instructions')|raw }} +

+
    +
  1. {{ trans('errors.use_search') }}
    2. +
  2. {{ trans('errors.include_info', { link: route('debug') })|raw }}
    3. +
  3. {{ trans('errors.tell_more') }}
    4. +
  4. {{ trans('errors.include_logs') }}
    5. +
  5. {{ trans('errors.what_did_you_do') }}
    6. +
+ {% endif %} + +
+
+
+
+ + {% if debug %} +
+
+

{{ trans('errors.error') }}

+

+ {{ trans('errors.error_location', {file: exception.getFile, line: exception.getLine, code: exception.getCode })|raw }} +

+

+ {{ trans('errors.stacktrace') }} +

+
+ {{ exception.getTraceAsString|nl2br }} +
+
+
+ {% endif %} + +
+ +