Changeset 3330 for trunk/system/views

Show
Ignore:
Timestamp:
08/10/2008 05:12:41 PM (4 months ago)
Author:
Geert
Message:

Fixed #760 and added some indentation

Location:
trunk/system/views
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/system/views/kohana_error_disabled.php

    r2602 r3330  
    22<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
    33<head> 
    4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
    5 <title><?php echo $error ?></title> 
     4        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
     5        <title><?php echo $error ?></title> 
     6        <style type="text/css"> 
     7        <?php include Kohana::find_file('views', 'kohana_errors', FALSE, 'css') ?> 
     8        </style> 
    69</head> 
    710<body> 
    8 <style type="text/css"> 
    9 <?php include Kohana::find_file('views', 'kohana_errors', FALSE, 'css') ?> 
    10 </style> 
    11 <div id="framework_error" style="width:24em;margin:50px auto;"> 
    12 <h3><?php echo html::specialchars($error) ?></h3> 
    13 <p style="text-align:center"><?php echo $message ?></p> 
    14 </div> 
     11        <div id="framework_error" style="width:24em;margin:50px auto;"> 
     12                <h3><?php echo html::specialchars($error) ?></h3> 
     13                <p style="text-align:center"><?php echo $message ?></p> 
     14        </div> 
    1515</body> 
    1616</html> 

  • trunk/system/views/kohana_error_page.php

    r2602 r3330  
    22<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
    33<head> 
    4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
    5 <title><?php echo $error ?></title> 
    6 <base href="http://php.net/" /> 
     4        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
     5        <title><?php echo $error ?></title> 
     6        <base href="http://php.net/" /> 
     7        <style type="text/css"> 
     8        <?php include Kohana::find_file('views', 'kohana_errors', FALSE, 'css') ?> 
     9        </style> 
    710</head> 
    811<body> 
    9 <style type="text/css"> 
    10 <?php include Kohana::find_file('views', 'kohana_errors', FALSE, 'css') ?> 
    11 </style> 
    12 <div id="framework_error" style="width:42em;margin:20px auto;"> 
    13 <h3><?php echo html::specialchars($error) ?></h3> 
    14 <p><?php echo html::specialchars($description) ?></p> 
    15 <?php if ( ! empty($line) AND ! empty($file)): ?> 
    16 <p><?php echo Kohana::lang('core.error_file_line', $file, $line) ?></p> 
    17 <?php endif ?> 
    18 <p><code class="block"><?php echo $message ?></code></p> 
    19 <?php if ( ! empty($trace)): ?> 
    20 <h3><?php echo Kohana::lang('core.stack_trace') ?></h3> 
    21 <?php echo $trace ?> 
    22 <?php endif ?> 
    23 <p class="stats"><?php echo Kohana::lang('core.stats_footer') ?></p> 
    24 </div> 
     12        <div id="framework_error" style="width:42em;margin:20px auto;"> 
     13                <h3><?php echo html::specialchars($error) ?></h3> 
     14                <p><?php echo html::specialchars($description) ?></p> 
     15                <?php if ( ! empty($line) AND ! empty($file)): ?> 
     16                        <p><?php echo Kohana::lang('core.error_file_line', $file, $line) ?></p> 
     17                <?php endif ?> 
     18                <p><code class="block"><?php echo $message ?></code></p> 
     19                <?php if ( ! empty($trace)): ?> 
     20                        <h3><?php echo Kohana::lang('core.stack_trace') ?></h3> 
     21                        <?php echo $trace ?> 
     22                <?php endif ?> 
     23                <p class="stats"><?php echo Kohana::lang('core.stats_footer') ?></p> 
     24        </div> 
    2525</body> 
    2626</html>