Merge pull request #26 from remie/integration

Add ?debug=raw mode. Fixes #19

Author: brendo

assets/devkit.css

@@ -53,6 +53,28 @@
 	#input input:focus {
 		background: hsl(210, 5%, 19%);
 	}
+	
+	#type {
+		position: absolute;
+		background-color: #242628;
+		border-bottom: 1px solid #303335;
+		border-left: 1px solid #303335;
+		border-radius: 0 0 0 5px;
+		-moz-border-radius: 0 0 0 5px;
+		-webkit-border-radius: 0 0 0 5px;
+		text-align: center;
+		height: 25px;
+		top: 0;
+		right: 0;
+		width: 120px;
+		padding: 4px;
+	}
+
+	#type span {
+		color: #AEB2B6;
+		text-shadow: 2px 2px 3px #0C0C0D;
+		cursor: pointer;
+	}
 
 	#output {
 		background: hsl(80, 100%, 50%);

assets/devkit.js

@@ -557,7 +557,7 @@
 
 		source.bind('sessionupdate', self.refresh);
 	};
-
+	
 /*---------------------------------------------------------------------------*/
 
 	jQuery(document).ready(function() {
@@ -574,4 +574,4 @@
 		}
 	});
 
-/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/

content/content.debug.php

@@ -100,6 +100,11 @@ public function buildContent($wrapper) {
 			} else if ($this->_view == 'result') {
 				$this->appendSource($wrapper, $this->_output, 'xml');
 
+			} else if ($this->_view == 'raw') {
+				header('Content-Type: application/xml');
+				echo $this->_xml;
+				die();
+				
 			} else {
 				if ($_GET['debug'] == $this->__relativePath($this->_pagedata['filelocation'])) {
 					$this->appendSource($wrapper, @file_get_contents($this->_pagedata['filelocation']), 'xsl');
@@ -125,19 +130,27 @@ protected function appendSource($wrapper, $source, $language = 'xml') {
 				'div', $bitter->process($source)
 			);
 			$inner->setAttribute('id', 'source');
-
 			$wrapper->appendChild($inner);
+
+			if($this->_view == 'xml') {
+				$viewRaw = Widget::Anchor('','?debug=raw');
+				$viewRaw->setAttribute('id', 'type');
+				$viewRaw->appendChild(new XMLElement('span',__('Plain XML')));
+				$wrapper->appendChild($viewRaw);
+			}
 		}
 
 		protected function __buildParams($params) {
 			if (!is_array($params) || empty($params)) return;
-			$params = array_map(array('General', 'sanitize'), $params);
+			$params = General::array_map_recursive(array('General', 'sanitize'), $params);
 
 			$wrapper = new XMLElement('div');
 			$wrapper->setAttribute('id', 'params');
 			$table = new XMLElement('table');
 
 			foreach ($params as $key => $value) {
+				$value = is_array($value) ? implode(', ', $value) : $value;
+
 				$row = new XMLElement('tr');
 				$row->appendChild(new XMLElement('th', "\${$key}"));
 				$row->appendChild(new XMLElement('td', "'{$value}'"));

extension.driver.php

@@ -10,8 +10,8 @@ class Extension_DebugDevKit extends Extension {
 		public function about() {
 			return array(
 				'name'			=> 'Debug DevKit',
-				'version'		=> '1.2',
-				'release-date'	=> '2011-06-14',
+				'version'		=> '1.2.1',
+				'release-date'	=> '2011-07-03',
 				'author'		=> array(
 					'name'			=> 'Rowan Lewis',
 					'website'		=> 'http://rowanlewis.com/',

lang/lang.de.php

@@ -3,8 +3,8 @@
 A debug panel for Symphony.
 It is part of the Symphony core download package.
 
-- Version: 1.2
-- Date: 2011-06-14
+- Version: 1.2.1
+- Date: 2011-07-03
 - Requirements: Symphony 2.0.4 or later
 - Author: Rowan Lewis, me@rowanlewis.com
 - GitHub Repository: <http://github.com/rowan-lewis/debugdevkit>