Changeset 6027 for trunk

Timestamp:

02/08/12 20:01:56 (4 months ago)

Author:

vain

Message:

• moves the inline css styles to error.css

Location:

trunk

Files:

• core/errorhandler.core.php (modified) (2 diffs)
• core/exception.core.php (modified) (2 diffs)
• themes/core/css/error.css (modified) (1 diff)

trunk/core/errorhandler.core.php

@@ -303 +303 @@
 
         # Error Table
-        $html .= '<table><tr><td>';
+        $html .= '<table width="80%"><tr><td>';
 
         # The inner Error Table
-        $html .= '<div id="panel"';
-        $html .= 'style="background: none repeat scroll 0 0 #FDF599; border: 1px solid #E03937; border-radius: 3px; padding: 0 0 15px 15px; margin-bottom: 10px; box-shadow: 0 1px 2px gray;">';
-        $html .= '<h3>Error <span style="font-weight: normal; font-size: 11px;">'.$errorname . ' ('. $errornumber .')</span></h3><h4>'.$errorstring.'</h4>';
+        $html .= '<div id="panel1" class="panel">';
+        $html .= '<h3>Error <span class="small">'.$errorname . ' ('. $errornumber .')</span></h3><h4>'.$errorstring.'</h4>';
         $html .= '<strong>File: </strong>'.dirname($errorfile).DS;
         $html .= '<strong>'.basename($errorfile).'</strong>';
@@ -315 +314 @@
 
         # Error Context
-        $html .= '<tr><td colspan="2"><h3>Context</h3>';
-        $html .= self::getErrorContext($errorfile, $errorline, 8) . '</td></tr>';
+        $html .= '<tr><td colspan="2">';
+        $html .= '<div id="panel2" class="panel">';
+        $html .= '<h3>Context</h3>';
+        $html .= '<span class="smalltext">You are viewing the source code of '. $errorfile.' around line '. $errorline .'.</span>';
+        $html .= self::getErrorContext($errorfile, $errorline, 8) . '</div></td></tr>';
 
         # Add Debug Backtracing

trunk/core/exception.core.php

@@ -300 +300 @@
 
         # Exception Table
-        $html   .= '<table><tr><td>';
+        $html   .= '<table width="80%"><tr><td>';
 
         /**
@@ -308 +308 @@
          */
 
-        $html .= '<div id="panel"';
-        $html .= 'style="background: none repeat scroll 0 0 #FDF599; border: 1px solid #E03937; border-radius: 3px; padding: 0 0 15px 15px; margin-bottom: 10px; box-shadow: 0 1px 2px gray;">';
+        $html .= '<div id="panel1" class="panel">';
         $html .= '<h3>Exception '.$code.'</h3><h4>'.$this->message.'</h4>';
         $html .= '<strong>File: </strong>'.dirname($this->file).DS;

trunk/themes/core/css/error.css

@@ -20 +20 @@
     color: #222222;
     font-size:12px;
+}
+
+.panel {
+    background: none repeat scroll 0 0 #FDF599;
+    border: 1px solid #E03937;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 2px gray;
+    margin-bottom: 10px;
+    padding: 0 0 15px 15px;
+}
+
+.panel h3 {
+    border-bottom: 1px dotted #E03937;
+    padding-bottom: 0.6em;
+    width: 20%;
+}
+
+.panel smalltext {
+    font-weight: normal;
+    font-size: 10px;
 }