More tweaks to the error output and headings.

Removing extra | from debugger output.
cakephp · Sep 3, 2011 · 815b78c · 815b78c
1 parent 35024c0
commit 815b78c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
@@ -56,7 +56,7 @@ h2 {
 	font-size: 190%;
 }
 h3 {
-	color: #993;
+	color: #2c6877;
 	font-family:'Gill Sans','lucida grande', helvetica, arial, sans-serif;
 	font-size: 165%;
 }
@@ -434,6 +434,7 @@ p.error,
 	color: #fff;
 	border: 1px solid rgba(0, 0, 0, 0.5);
 	background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #76BF6B, #3B8230);
 	background-image: -moz-linear-gradient(top, #76BF6B, #3B8230);
 	background-image: -ms-linear-gradient(top, #76BF6B, #3B8230);
 	background-image: -o-linear-gradient(top, #76BF6B, #3B8230);
@@ -542,11 +543,14 @@ pre {
 	position: relative;
 	white-space: normal;
 }
+.cake-debug > a {
+	text-shadow: none;
+}
 .cake-stack-trace {
 	background: rgba(255, 255, 255, 0.7);
 	color: #333;
-	margin: 10px 0 0 0;
-	padding: 10px;
+	margin: 10px 0 5px 0;
+	padding: 10px 10px 0 10px;
 	font-size: 120%;
 	line-height: 140%;
 	overflow: auto;
@@ -570,15 +574,18 @@ pre {
 	position: relative;
 	overflow: auto;
 }
-.cake-stack-trace pre,
-.cake-code-dump pre {
+.cake-context {
+	margin-bottom: 10px;
+}
+.cake-stack-trace pre {
 	color: #000;
 	background-color: #F0F0F0;
-	margin: 0px;
+	margin: 0px 0 10px 0;
 	padding: 1em;
 	overflow: auto;
 	text-shadow: none;
 }
+/* excerpt */
 .cake-code-dump pre,
 .cake-code-dump pre code {
 	clear: both;
@@ -588,9 +595,9 @@ pre {
 	padding: 4px;
 	overflow: auto;
 }
-.cake-code-dump span.code-highlight {
-	background-color: #ff0;
-	padding: 4px;
+.cake-code-dump .code-highlight {
+	display: block;
+	background-color: rgba(255, 255, 0, 0.5);
 }
 .code-coverage-results div.code-line {
 	padding-left:5px;

diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php
@@ -146,8 +146,8 @@ public function __construct() {
 		$this->_templates['js']['context'] = '<pre id="{:id}-context" class="cake-context" ';
 		$this->_templates['js']['context'] .= 'style="display: none;">{:context}</pre>';
 
-		$this->_templates['js']['code'] = '<div id="{:id}-code" class="cake-code-dump" ';
-		$this->_templates['js']['code'] .= 'style="display: none;"><pre>{:code}</pre></div>';
+		$this->_templates['js']['code'] = '<pre id="{:id}-code" class="cake-code-dump" ';
+		$this->_templates['js']['code'] .= 'style="display: none;">{:code}</pre>';
 
 		$e = '<pre class="cake-debug"><b>{:error}</b> ({:code}) : {:description} ';
 		$e .= '[<b>{:path}</b>, line <b>{:line}]</b></pre>';
@@ -716,7 +716,7 @@ public function outputError($data) {
 			}
 			$info .= String::insert($tpl[$key], compact($key) + $insert, $insertOpts);
 		}
-		$links = join(' | ', $links);
+		$links = join(' ', $links);
 		unset($data['context']);
 		if (isset($tpl['callback']) && is_callable($tpl['callback'])) {
 			return call_user_func($tpl['callback'], $data, compact('links', 'info'));