Changeset 2251

Show
Ignore:
Timestamp:
03/09/2008 03:26:24 PM (9 months ago)
Author:
Shadowhand
Message:

Follow up to r2249:

  • Moved KOHANA_ERROR_CSS to system/views/kohana_errors.css
  • Updated kohana_error_disabled and kohana_error_page to match
Location:
trunk
Files:
1 added
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/application/controllers/welcome.php

    r2233 r2251  
    1313        public function index() 
    1414        { 
     15                echo $foo; 
    1516                // In Kohana, all views are loaded and treated as objects. 
    1617                $welcome = new View('welcome'); 

  • trunk/index.php

    r2250 r2251  
    6363 
    6464/** 
    65  * Define the Kohana-generated error message style. 
    66  */ 
    67 define('KOHANA_ERROR_CSS', 
    68         // Any of these styles can be changed to affect all error messages. 
    69         'div#kohana_error { background:#fff; border:solid 1px #ccc; font-family:sans-serif; color:#111; font-size:14px; line-height:130%; }'. 
    70         'div#kohana_error h3 { color:#fff; font-size:16px; padding:8px 6px; margin:0 0 8px; background:#f15a00; text-align:center; }'. 
    71         'div#kohana_error a { color:#228; text-decoration:none; }'. 
    72         'div#kohana_error a:hover { text-decoration:underline; }'. 
    73         'div#kohana_error strong { color:#900; }'. 
    74         'div#kohana_error p { margin:0; padding:4px 6px 10px; }'. 
    75         'div#kohana_error tt,'. 
    76         'div#kohana_error pre,'. 
    77         'div#kohana_error code { font-family:monospace; padding:2px 4px; white-space:pre; font-size:12px; color:#333; }'. 
    78         'div#kohana_error tt { font-style:italic; }'. 
    79         'div#kohana_error tt:before { content:">"; color:#aaa; }'. 
    80         'div#kohana_error code tt:before { content:""; }'. 
    81         'div#kohana_error pre,'. 
    82         'div#kohana_error code { background:#eaeee5; border:solid 0 #D6D8D1; border-width:0 1px 1px 0; }'. 
    83         'div#kohana_error .block { display:block; text-align:left; }'. 
    84         'div#kohana_error .stats { padding:4px; background: #eee; border-top:solid 1px #ccc; text-align:center; font-size:10px; color:#888; }'. 
    85         'div#kohana_error .backtrace { margin:0; padding:0 6px; list-style:none; line-height:12px; }' 
    86 ); 
    87  
    88 /** 
    8965 * If you rename all of your .php files to a different extension, set the new 
    9066 * extension here. This option can left to .php, even if this file is has a 
    … …  
    12197                die 
    12298                ( 
    123                         '<style type="text/css">'.KOHANA_ERROR_CSS.'</style>'. 
    124                         '<div id="kohana_error" style="width:26em;margin:50px auto;text-align:center;">'. 
     99                        '<div id="framework_error" style="width:80%;margin:50px auto;text-align:center;">'. 
    125100                                '<h3>Application Directory Not Found</h3>'. 
    126101                                '<p>The <code>$kohana_application</code> directory does not exist.</p>'. 
    … …  
    135110                die 
    136111                ( 
    137                         '<style type="text/css">'.KOHANA_ERROR_CSS.'</style>'. 
    138                         '<div id="kohana_error" style="width:26em;margin:50px auto;text-align:center;">'. 
     112                        '<div id="framework_error" style="width:80%;margin:50px auto;text-align:center;">'. 
    139113                                '<h3>System Directory Not Found</h3>'. 
    140114                                '<p>The <code>$kohana_system</code> directory does not exist.</p>'. 

  • trunk/system/views/kohana_error_disabled.php

    r2249 r2251  
    77<body> 
    88<style type="text/css"> 
    9 <?php echo KOHANA_ERROR_CSS ?> 
     9<?php include Kohana::find_file('views', 'kohana_errors', FALSE, 'css') ?> 
    1010</style> 
    11 <div id="kohana_error" style="width:24em;margin:50px auto;"> 
     11<div id="framework_error" style="width:24em;margin:50px auto;"> 
    1212<h3><?php echo $error ?></h3> 
    1313<p><?php echo $message ?></p> 

  • trunk/system/views/kohana_error_page.php

    r2249 r2251  
    88<body> 
    99<style type="text/css"> 
    10 <?php echo KOHANA_ERROR_CSS ?> 
     10<?php include Kohana::find_file('views', 'kohana_errors', FALSE, 'css') ?> 
    1111</style> 
    12 <div id="kohana_error" style="width:42em;margin:20px auto;"> 
     12<div id="framework_error" style="width:42em;margin:20px auto;"> 
    1313<h3><?php echo $error ?></h3> 
    1414<p><?php echo $description ?></p>