From c2cddede38dbb29d53167e296981a678759e0648 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Mon, 5 Dec 2011 21:54:09 -0500
Subject: first version of a 404 page

---
 views/default/errors/404.php         |  8 ++++++++
 views/default/errors/default.php     |  8 ++++++++
 views/default/page/error.php         | 14 ++++++++++++++
 views/default/page/layouts/error.php |  6 ++++++
 4 files changed, 36 insertions(+)
 create mode 100644 views/default/errors/404.php
 create mode 100644 views/default/errors/default.php
 create mode 100644 views/default/page/error.php
 create mode 100644 views/default/page/layouts/error.php

(limited to 'views')

diff --git a/views/default/errors/404.php b/views/default/errors/404.php
new file mode 100644
index 000000000..8bc35acdd
--- /dev/null
+++ b/views/default/errors/404.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Page not found error
+ */
+
+$message = elgg_echo('error:404');
+
+echo "<h2>$message</h2>";
diff --git a/views/default/errors/default.php b/views/default/errors/default.php
new file mode 100644
index 000000000..a0582eba2
--- /dev/null
+++ b/views/default/errors/default.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * General error
+ */
+
+$message = elgg_echo('error:default');
+
+echo "<h2>$message</h2>";
diff --git a/views/default/page/error.php b/views/default/page/error.php
new file mode 100644
index 000000000..b7ba3ae9b
--- /dev/null
+++ b/views/default/page/error.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Page shell for errors
+ *
+ * This is for errors that are not unhandled exceptions. Those are handled
+ * through the failsafe viewtype to guarantee that no further exceptions occur.
+ * An example error would be 404 (page not found).
+ * 
+ * @uses $vars['title']       The page title
+ * @uses $vars['body']        The main content of the page
+ * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
+ */
+
+echo elgg_view('page/default', $vars);
diff --git a/views/default/page/layouts/error.php b/views/default/page/layouts/error.php
new file mode 100644
index 000000000..5b3109964
--- /dev/null
+++ b/views/default/page/layouts/error.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Error layout
+ */
+
+echo elgg_view('page/layouts/one_column', $vars);
-- 
cgit v1.2.3


From f003120fba687d14630b690c50e2316f717eca7d Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Mon, 19 Dec 2011 20:49:30 -0500
Subject: added more spacing to error layout

---
 engine/lib/pagehandler.php            | 2 ++
 views/default/css/elements/layout.php | 3 +++
 views/default/page/layouts/error.php  | 6 ++++++
 3 files changed, 11 insertions(+)

(limited to 'views')

diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index 16be6e3b2..ffcfc5b6a 100644
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -114,6 +114,8 @@ function elgg_unregister_page_handler($handler) {
 /**
  * Serve an error page
  *
+ * @todo not sending status codes yet
+ *
  * @param string $hook   The name of the hook
  * @param string $type   The type of the hook
  * @param bool   $result The current value of the hook
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index 42d898439..25a2bffb7 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -81,6 +81,9 @@
 .elgg-layout-two-sidebar {
 	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif) repeat-y right top;
 }
+.elgg-layout-error {
+	margin-top: 20px;
+}
 .elgg-sidebar {
 	position: relative;
 	padding: 20px 10px;
diff --git a/views/default/page/layouts/error.php b/views/default/page/layouts/error.php
index 5b3109964..cdce28a8e 100644
--- a/views/default/page/layouts/error.php
+++ b/views/default/page/layouts/error.php
@@ -3,4 +3,10 @@
  * Error layout
  */
 
+$class = 'elgg-layout-error';
+if (isset($vars['class'])) {
+	$class = "$class {$vars['class']}";
+}
+$vars['class'] = $class;
+
 echo elgg_view('page/layouts/one_column', $vars);
-- 
cgit v1.2.3