From d53f6d0e052fb455059170a311640fcd06cad798 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
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_404.html.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 modules/gallery/views/error_404.html.php

(limited to 'modules/gallery/views/error_404.html.php')

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 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="g-error">
+  <h1>
+    <?= t("Dang...  Page not found!") ?>
+  </h1>
+  <? if ($is_guest): ?>
+    <h2>
+      <?= t("Hey wait, you're not signed in yet!") ?>
+    </h2>
+    <p>
+       <?= t("Maybe the page exists, but is only visible to authorized users.") ?>
+       <?= t("Please sign in to find out.") ?>
+    </p>
+    <?= $login_form ?>
+  <? else: ?>
+    <p>
+      <?= t("Maybe the page exists, but is only visible to authorized users.") ?>
+      <?= t("Talk to your Gallery administrator if you think this is an error for help fixing this!") ?>
+    </p>
+ <? endif; ?>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3


From e88e976fc4255d323a1f5919453604ecf467ed0d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
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/error_404.html.php')

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 @@
   <? else: ?>
     <p>
       <?= t("Maybe the page exists, but is only visible to authorized users.") ?>
-      <?= t("Talk to your Gallery administrator if you think this is an error for help fixing this!") ?>
+      <?= t("If you think this is an error, talk to your Gallery administrator!") ?>
     </p>
  <? endif; ?>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3