summaryrefslogtreecommitdiffstats
path: root/application/errors
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-07-12 12:49:40 +0200
committerFlorian Pritz <bluewind@xinu.at>2012-07-12 12:53:57 +0200
commit1eb6508517a670667c8d69b1fe3d6a6beaab7451 (patch)
tree6df651e67f136c0558c67bfb365bab5be82264ca /application/errors
parent539638e7de5b9282797a514e437e74c4c50bea94 (diff)
Improve design of general error page
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/errors')
-rwxr-xr-xapplication/errors/error_general.php67
1 files changed, 13 insertions, 54 deletions
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index fd63ce2c5..333b21fd0 100755
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -1,62 +1,21 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Error</title>
-<style type="text/css">
+<?php
-::selection{ background-color: #E13300; color: white; }
-::moz-selection{ background-color: #E13300; color: white; }
-::webkit-selection{ background-color: #E13300; color: white; }
-
-body {
- background-color: #fff;
- margin: 40px;
- font: 13px/20px normal Helvetica, Arial, sans-serif;
- color: #4F5155;
+if (is_cli_client()) {
+ echo $heading."\n";
+ echo $message."\n";
+ exit();
}
-a {
- color: #003399;
- background-color: transparent;
- font-weight: normal;
-}
+$title = "Error";
+$is_error_page = true;
-h1 {
- color: #444;
- background-color: transparent;
- border-bottom: 1px solid #D0D0D0;
- font-size: 19px;
- font-weight: normal;
- margin: 0 0 14px 0;
- padding: 14px 15px 10px 15px;
-}
-
-code {
- font-family: Consolas, Monaco, Courier New, Courier, monospace;
- font-size: 12px;
- background-color: #f9f9f9;
- border: 1px solid #D0D0D0;
- color: #002166;
- display: block;
- margin: 14px 0 14px 0;
- padding: 12px 10px 12px 10px;
-}
+include 'application/views/file/header.php';
-#container {
- margin: 10px;
- border: 1px solid #D0D0D0;
- -webkit-box-shadow: 0 0 8px #D0D0D0;
-}
-
-p {
- margin: 12px 15px 12px 15px;
-}
-</style>
-</head>
-<body>
- <div id="container">
+?>
+ <div class="error">
<h1><?php echo $heading; ?></h1>
<?php echo $message; ?>
</div>
-</body>
-</html> \ No newline at end of file
+
+<?php
+include 'application/views/file/footer.php';