RoutingPanel: redesign

Author: dg

src/Bridges/ApplicationTracy/RoutingPanel.php

@@ -82,6 +82,7 @@ public function getPanel()
 		$request = $this->request;
 		$routers = $this->routers;
 		$source = $this->source;
+		$hasModule = (bool) array_filter($routers, function($rq) { return $rq['module']; });
 		$url = $this->httpRequest->getUrl();
 		require __DIR__ . '/templates/RoutingPanel.panel.phtml';
 		return ob_get_clean();

src/Bridges/ApplicationTracy/templates/RoutingPanel.panel.phtml

@@ -15,15 +15,16 @@ use Nette,
 	}
 
 	#tracy-debug .nette-RoutingPanel .yes td {
-		color: green;
+		background: #BDE678 !important;
 	}
 
 	#tracy-debug .nette-RoutingPanel .may td {
-		color: #67F;
+		background: #C1D3FF !important;
 	}
 
 	#tracy-debug .nette-RoutingPanel pre, #tracy-debug .nette-RoutingPanel code {
 		display: inline;
+		background: transparent;
 	}
 
 </style>
@@ -38,40 +39,35 @@ use Nette,
 </h1>
 
 <div class="tracy-inner">
-	<p><code><?= htmlSpecialChars($url, ENT_IGNORE, 'UTF-8') ?></code></p>
-
 <?php if (empty($routers)): ?>
 	<p>No routers defined.</p>
 
 <?php else: ?>
 	<table>
 	<thead>
 	<tr>
-		<th>Matched?</th>
-		<th>Class</th>
-		<th>Mask</th>
+		<th></th>
+		<th>Mask / Class</th>
 		<th>Defaults</th>
-		<th>Module</th>
-		<th>Request</th>
+		<?php if ($hasModule): ?><th>Module</th><?php endif ?>
+		<th>Matched as</th>
 	</tr>
 	</thead>
 
 	<tbody>
 	<?php foreach ($routers as $router): ?>
 	<tr class="<?= $router['matched'] ?>">
-		<td><?= $router['matched'] ?></td>
-
-		<td><code title="<?= htmlSpecialChars($router['class'], ENT_QUOTES, 'UTF-8') ?>"><?= preg_replace('#.+\\\\#', '', htmlSpecialChars($router['class'], ENT_NOQUOTES, 'UTF-8')) ?></code></td>
+		<td><?= $router['matched'] === 'yes' ? '✓' : ($router['matched'] === 'may' ? '≈' : '') ?></td>
 
-		<td><code><strong><?= htmlSpecialChars($router['mask'], ENT_NOQUOTES, 'UTF-8') ?></strong></code></td>
+		<td><code title="<?= htmlSpecialChars($router['class'], ENT_QUOTES, 'UTF-8') ?>"><?= htmlSpecialChars($router['mask'] ?: $router['class'], ENT_NOQUOTES, 'UTF-8') ?></code></td>
 
 		<td><code>
 		<?php foreach ($router['defaults'] as $key => $value): ?>
 			<?= htmlSpecialChars($key, ENT_IGNORE, 'UTF-8'), "&nbsp;=&nbsp;", is_string($value) ? htmlSpecialChars($value, ENT_IGNORE, 'UTF-8') . '<br />' : Dumper::toHtml($value, [Dumper::COLLAPSE => TRUE, Dumper::LIVE => TRUE]) ?>
 		<?php endforeach ?>
 		</code></td>
 
-		<td><code><?= htmlSpecialChars($router['module'], ENT_NOQUOTES, 'UTF-8') ?></code></td>
+		<?php if ($hasModule): ?><td><code><?= htmlSpecialChars($router['module'], ENT_NOQUOTES, 'UTF-8') ?></code></td><?php endif ?>
 
 		<td><?php if ($router['request']): ?><code>
 		<?php $params = $router['request']->getParameters(); ?>
@@ -87,10 +83,10 @@ use Nette,
 	</table>
 <?php endif ?>
 
+	<p><code><?= htmlSpecialChars($url->getBaseUrl(), ENT_IGNORE, 'UTF-8') ?><span style="background:#eee; white-space:nowrap"><?= htmlSpecialChars($url->getRelativeUrl(), ENT_IGNORE, 'UTF-8') ?></span></code></p>
+
 	<?php if ($source): ?>
-	<p><?= $source instanceof \ReflectionClass ? $source->getName() : $source->getDeclaringClass()->getName() . '::' . $source->getName() . '()' ?> in
-	<?= Tracy\Helpers::editorLink($source->getFileName(), $source->getStartLine()) ?>
-	</p>
+	<p><a href="<?= htmlSpecialChars(Tracy\Helpers::editorUri($source->getFileName(), $source->getStartLine()), ENT_QUOTES, 'UTF-8') ?>"><?= $source instanceof \ReflectionClass ? $source->getName() : $source->getDeclaringClass()->getName() . '::' . $source->getName() . '()' ?></a></p>
 	<?php endif ?>
 </div>
 </div>