From 0d2237979a2cc92d707a47115e492bff57fa9c5d Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 8 Aug 2010 01:48:09 -0700 Subject: Make the error page more informative, and include platform information. --- modules/gallery/views/error_admin.html.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'modules/gallery/views/error_admin.html.php') diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php index 40eb7374..5afaa0fe 100644 --- a/modules/gallery/views/error_admin.html.php +++ b/modules/gallery/views/error_admin.html.php @@ -102,6 +102,10 @@ .number { padding-right: 1em; } + + #g-platform h2 { + font-size: 1.1em; + } <?= t("Something went wrong!") ?> @@ -144,6 +148,17 @@

+

+ There's an error message below and you can find more details + in gallery3/var/logs (look for the file with the most recent + date on it). Stuck? Stop by the Gallery 3 + Forums and ask for help. You can also look at our list + of open + tickets to see if the problem you're seeing has been + reported. If you post a request, here's some useful + information to include: +

-- cgit v1.2.3 From cc43c37a1c71c54d03979489ee7f1d5884a648af Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 8 Aug 2010 02:06:50 -0700 Subject: Add a sad face on the dang page. Just cause. --- modules/gallery/views/error_admin.html.php | 32 +++++++++++++++++++------ modules/gallery/views/error_user.html.php | 38 ++++++++++++++++++++++-------- 2 files changed, 53 insertions(+), 17 deletions(-) (limited to 'modules/gallery/views/error_admin.html.php') diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php index 5afaa0fe..512a0d88 100644 --- a/modules/gallery/views/error_admin.html.php +++ b/modules/gallery/views/error_admin.html.php @@ -20,8 +20,21 @@ margin: 20px auto; } - div#framework_error { + #framework_error { + height: 6em; + } + + #framework_error .crashlogo { + position: relative; + top: .3em; + font-size: 6.0em; + } + + #framework_error .title { + position: relative; + top: -3em; text-align: center; + margin: 0 auto; } div#error_details { @@ -137,12 +150,17 @@
-

- -

-

- -

+ +
+

+ +

+

+ +

+

diff --git a/modules/gallery/views/error_user.html.php b/modules/gallery/views/error_user.html.php index 74c6a8fb..b64cfb53 100644 --- a/modules/gallery/views/error_user.html.php +++ b/modules/gallery/views/error_user.html.php @@ -19,8 +19,21 @@ margin: 20px auto; } - div#framework_error { + #framework_error { + height: 8em; + } + + #framework_error .crashlogo { + position: relative; + top: .3em; + font-size: 6em; + } + + #framework_error .title { + position: relative; + top: -3em; text-align: center; + margin: 0 auto; } @@ -28,15 +41,20 @@
-

- -

-

- -

-

- -

+ +
+

+ +

+

+ +

+

+ +

+
-- cgit v1.2.3 From 371a2ff7d29f50dde5ff23ca45188d0eac365481 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 8 Aug 2010 13:39:27 -0700 Subject: Adjust the vertical placement of the "Dang" message. --- modules/gallery/views/error_admin.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/gallery/views/error_admin.html.php') diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php index 512a0d88..28776e60 100644 --- a/modules/gallery/views/error_admin.html.php +++ b/modules/gallery/views/error_admin.html.php @@ -32,9 +32,9 @@ #framework_error .title { position: relative; - top: -3em; + top: -2.5em; + padding: 0px; text-align: center; - margin: 0 auto; } div#error_details { -- cgit v1.2.3 From bd541342b9b56db00b8d24db1da43b9693e9849a Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 8 Aug 2010 17:07:13 -0700 Subject: Add gallery stats in addition to platform stats. --- modules/gallery/views/error_admin.html.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/gallery/views/error_admin.html.php') diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php index 28776e60..f5004eae 100644 --- a/modules/gallery/views/error_admin.html.php +++ b/modules/gallery/views/error_admin.html.php @@ -116,7 +116,7 @@ padding-right: 1em; } - #g-platform h2 { + #g-platform h2, #g-stats h2 { font-size: 1.1em; } @@ -174,8 +174,9 @@ of open tickets to see if the problem you're seeing has been reported. If you post a request, here's some useful - information to include: + information to include: + +

-- cgit v1.2.3 From ff1d8aea2f2805f85ce3cc7e4079d04fb9f1bac4 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 15 Aug 2010 01:59:54 -0700 Subject: We use UTF-8 everywhere. Fixes ticket #1285. --- modules/gallery/controllers/user_profile.php | 2 +- modules/gallery/tests/Sendmail_Test.php | 4 ++-- modules/gallery/views/error_admin.html.php | 2 +- modules/gallery/views/error_user.html.php | 2 +- modules/notification/helpers/notification.php | 6 +++--- modules/rest/helpers/rest.php | 2 +- modules/user/controllers/password.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'modules/gallery/views/error_admin.html.php') diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php index 726d3e51..e992655b 100644 --- a/modules/gallery/controllers/user_profile.php +++ b/modules/gallery/controllers/user_profile.php @@ -56,7 +56,7 @@ class User_Profile_Controller extends Controller { ->to($user->email) ->subject(html::clean($form->message->subject->value)) ->header("Mime-Version", "1.0") - ->header("Content-type", "text/html; charset=iso-8859-1") + ->header("Content-type", "text/html; charset=UTF-8") ->reply_to($form->message->reply_to->value) ->message(html::purify($form->message->message->value)) ->send(); diff --git a/modules/gallery/tests/Sendmail_Test.php b/modules/gallery/tests/Sendmail_Test.php index b20543d1..b9406047 100644 --- a/modules/gallery/tests/Sendmail_Test.php +++ b/modules/gallery/tests/Sendmail_Test.php @@ -65,14 +65,14 @@ class Sendmail_Test extends Gallery_Unit_Test_Case { "From: from@gallery3.com\n" . "Reply-To: public@gallery3.com\n" . "MIME-Version: 1.0\n" . - "Content-type: text/html; charset=iso-8859-1\r\n" . + "Content-Type: text/html; charset=UTF-8\r\n" . "Subject: Test Email Unit test\r\n\r\n" . "

This is an html msg

"; $result = Sendmail_For_Test::factory() ->to("receiver@someemail.com") ->subject("Test Email Unit test") ->header("MIME-Version", "1.0") - ->header("Content-type", "text/html; charset=iso-8859-1") + ->header("Content-Type", "text/html; charset=UTF-8") ->message("

This is an html msg

") ->send() ->send_text; diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php index f5004eae..af78c59c 100644 --- a/modules/gallery/views/error_admin.html.php +++ b/modules/gallery/views/error_admin.html.php @@ -120,7 +120,7 @@ font-size: 1.1em; } - + <?= t("Something went wrong!") ?>