From d53f6d0e052fb455059170a311640fcd06cad798 Mon Sep 17 00:00:00 2001 From: Andy Staudacher Date: Fri, 12 Feb 2010 16:40:44 -0800 Subject: Fix for tickets 1009 and 603: Show a themed error page to guests / registered users (not to admins though). And show a login form to guests for 404 (incl. insufficient view permissions) errors. --- modules/gallery/views/error.html.php | 12 +++ modules/gallery/views/error_404.html.php | 21 +++++ modules/gallery/views/kohana_error_page.php | 127 ---------------------------- 3 files changed, 33 insertions(+), 127 deletions(-) create mode 100644 modules/gallery/views/error.html.php create mode 100644 modules/gallery/views/error_404.html.php delete mode 100644 modules/gallery/views/kohana_error_page.php (limited to 'modules/gallery/views') diff --git a/modules/gallery/views/error.html.php b/modules/gallery/views/error.html.php new file mode 100644 index 00000000..5d81b651 --- /dev/null +++ b/modules/gallery/views/error.html.php @@ -0,0 +1,12 @@ + +
+

+ +

+

+ +

+

+ +

+
\ No newline at end of file diff --git a/modules/gallery/views/error_404.html.php b/modules/gallery/views/error_404.html.php new file mode 100644 index 00000000..e5846e65 --- /dev/null +++ b/modules/gallery/views/error_404.html.php @@ -0,0 +1,21 @@ + +
+

+ +

+ +

+ +

+

+ + +

+ + +

+ + +

+ +
\ No newline at end of file diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php deleted file mode 100644 index b9fdcc19..00000000 --- a/modules/gallery/views/kohana_error_page.php +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - <?= t("Something went wrong!") ?> - - - - admin ?> -
-

- -

-

- -

- -

- -

- -
- -
-

- -

- - - - - - - getTraceAsString(); ?> - - - - - - -- cgit v1.2.3 From e88e976fc4255d323a1f5919453604ecf467ed0d Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 12 Feb 2010 13:49:14 -0800 Subject: Tighten up the text. --- modules/gallery/views/error_404.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery/views') diff --git a/modules/gallery/views/error_404.html.php b/modules/gallery/views/error_404.html.php index e5846e65..4b037a79 100644 --- a/modules/gallery/views/error_404.html.php +++ b/modules/gallery/views/error_404.html.php @@ -15,7 +15,7 @@

- +

\ No newline at end of file -- cgit v1.2.3 From 36702b1397dcac9ba5a607f62e2a1caeb307ac7a Mon Sep 17 00:00:00 2001 From: Andy Staudacher Date: Fri, 12 Feb 2010 20:59:26 -0800 Subject: Some HTML validation fixes (don't render empty