Index: trunk/htdocs/cacher/cacher.tpl.php
===================================================================
--- trunk/htdocs/cacher/xcache.tpl.php	(revision 1052)
+++ trunk/htdocs/cacher/cacher.tpl.php	(revision 1053)
@@ -1,7 +1,7 @@
-<?php include("header.tpl.php"); ?>
+<?php include("../common/header.tpl.php"); ?>
+<div class="switcher"><?php echo switcher("type", $listTypes); ?></div>
 <div id="help">
 	<a href="help.php"><?php echo _("Help") ?> &raquo;</a>
 </div>
-<div class="switcher"><?php echo switcher("type", $types); ?></div>
 <?php
 $a = new Cycle('class="col1"', 'class="col2"');
@@ -215,9 +215,9 @@
 			$hits     = number_format($entry['hits']);
 			$size     = size($entry['size']);
-			$class_cnt = number_format($entry['class_cnt']);
-			$function_cnt = number_format($entry['function_cnt']);
-			if ($isphp) {
-				$phprefcount = number_format($entry['phprefcount']);
-				$file_size   = size($entry['file_size']);
+			if ($isphp) {
+				$class_cnt    = number_format($entry['class_cnt']);
+				$function_cnt = number_format($entry['function_cnt']);
+				$phprefcount  = number_format($entry['phprefcount']);
+				$file_size    = size($entry['file_size']);
 			}
 
@@ -231,17 +231,19 @@
 			}
 
-			if (!$isphp) {
+			if ($isphp) {
+				$namelink = $name;
 				echo <<<ENTRY
-					<td><input type="checkbox" name="remove[]" value="{$name}"/></td>
+				<td>{$entry['cache_name']} {$i}</td>
+ENTRY;
+			}
+			else {
+				echo <<<ENTRY
+					<td><label><input type="checkbox" name="remove[]" value="{$name}"/>{$entry['cache_name']} {$i}</label></td>
 ENTRY;
 				$uname = urlencode($entry['name']);
 				$namelink = "<a href=\"edit.php?name=$uname\">$name</a>";
 			}
-			else {
-				$namelink = $name;
-			}
 
 			echo <<<ENTRY
-			<td>{$entry['cache_name']} {$i}</td>
 			<td>{$namelink}</td>
 			<td align="right" int="{$entry['hits']}">{$entry['hits']}</td>
@@ -299,3 +301,3 @@
 }
 ?>
-<?php include("footer.tpl.php"); ?>
+<?php include("../common/footer.tpl.php"); ?>