diff options
| -rwxr-xr-x | application/errors/error_general.php | 67 | ||||
| -rw-r--r-- | application/views/file/header.php | 16 | ||||
| -rw-r--r-- | data/default.css | 4 |
3 files changed, 26 insertions, 61 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'; diff --git a/application/views/file/header.php b/application/views/file/header.php index 733c6788e..3029e4579 100644 --- a/application/views/file/header.php +++ b/application/views/file/header.php @@ -14,13 +14,15 @@ <?php echo anchor('file/upload_history', 'History'); ?> | <?php echo anchor('user/invite', 'Invite'); ?> - <div class="right"> - <?php if(isset($username) && $username) { ?> - <?=anchor("user/logout", "Logout"); ?> - <?php } else { ?> - <?=anchor("user/login", "Login"); ?> - <?php } ?> - </div> + <?php if(!isset($is_error_page)) { ?> + <div class="right"> + <?php if(isset($username) && $username) { ?> + <?=anchor("user/logout", "Logout"); ?> + <?php } else { ?> + <?=anchor("user/login", "Login"); ?> + <?php } ?> + </div> + <?php } ?> </div> <div class="content"> diff --git a/data/default.css b/data/default.css index 399ca1410..a9170a92e 100644 --- a/data/default.css +++ b/data/default.css @@ -65,6 +65,10 @@ p, li { padding-top:13px; } +.error h1 { + font-size: 18px; +} + table { border-collapse: collapse; } |