modify the router page and fix js error

cat-client/src/main/java/com/dianping/cat/message/io/TcpSocketSender.java

@@ -95,8 +95,6 @@ public class TcpSocketSender implements Task, MessageSender, LogEnabled {
 					MessageTree tree = m_queue.poll();
 
 					if (tree != null) {
-						System.out.println("write to====" + future.getChannel().getRemoteAddress());
-						
 						sendInternal(tree);
 						tree.setMessage(null);
 					}
@@ -104,7 +102,6 @@ public class TcpSocketSender implements Task, MessageSender, LogEnabled {
 					m_logger.error("Error when sending message over TCP socket!", t);
 				}
 			} else {
-				System.out.println("channel  can't write");
 				try {
 					Thread.sleep(5);
 				} catch (Exception e) {

cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java

@@ -74,9 +74,8 @@ public class Handler implements PageHandler<Context> {
 			if (report != null) {
 				model.setContent(report.toString());
 			}
-			break;
 		}
-		model.setAction(Action.API);
+		model.setAction(action);
 		model.setPage(SystemPage.ROUTER);
 
 		if (!ctx.isProcessStopped()) {

cat-home/src/main/webapp/jsp/report/dependency/dependencyDashboard.jsp

@@ -8,16 +8,6 @@
 <jsp:useBean id="model" type="com.dianping.cat.report.page.dependency.Model" scope="request"/>
 
 <res:bean id="res" />
-<res:useCss value='${res.css.local.table_css}' target="head-css" />
-<res:useCss value='${res.css.local.body_css}' target="head-css" />
-<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
-<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js" />
-<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js" />
-<res:useJs value="${res.js.local['startopo.js']}" target="head-js" />
-<res:useJs value="${res.js.local['raphael-min.js']}" target="head-js" />
-<res:useJs value="${res.js.local['dependencyConfig.js']}" target="head-js" />
-<res:useJs value="${res.js.local['jquery.validate.min.js']}" target="head-js" />
 <style>
 	.tooltip-inner {
 		max-width:36555px;
@@ -31,6 +21,16 @@
 </style>
  <c:choose>
 	<c:when test="${payload.fullScreen}">
+		<res:useCss value='${res.css.local.table_css}' target="head-css" />
+		<res:useCss value='${res.css.local.body_css}' target="head-css" />
+		<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+		<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+		<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js" />
+		<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js" />
+		<res:useJs value="${res.js.local['raphael-min.js']}" target="head-js" />
+		<res:useJs value="${res.js.local['dependencyConfig.js']}" target="head-js" />
+		<res:useJs value="${res.js.local['jquery.validate.min.js']}" target="head-js" />
+		<res:useJs value="${res.js.local['startopo.js']}" target="head-js" />
 		<div class="report">
 			<a href="javascript:showOpNav()" id="switch" class="btn btn-small btn-success">隐藏</a>
 				<div class="opNav">
@@ -46,6 +46,7 @@
 	    </div>
 	</c:when>
 	<c:otherwise>
+		<res:useJs value="${res.js.local['startopo.js']}" target="head-js" />
 			<a:report title="Dependency Report"
 		navUrlPrefix="domain=${model.domain}&op=dashboard">
 		<jsp:attribute name="subtitle">From ${w:format(model.reportStart,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.reportEnd,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>

cat-home/src/main/webapp/jsp/report/dependency/metricDashboard.jsp

@@ -7,14 +7,6 @@
 <jsp:useBean id="payload" type="com.dianping.cat.report.page.dependency.Payload" scope="request"/>
 <jsp:useBean id="model" type="com.dianping.cat.report.page.dependency.Model" scope="request"/>
 
-<res:bean id="res" />
-<res:useCss value='${res.css.local.table_css}' target="head-css" />
-<res:useJs value="${res.js.local['dependencyConfig.js']}" target="head-js" />
-<res:useCss value='${res.css.local.body_css}' target="head-css" />
-<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
-<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js" />
-<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
 	
 <style>
 	.tooltip-inner {
@@ -29,6 +21,14 @@
 </style>
  <c:choose>
 	<c:when test="${payload.fullScreen}">
+		<res:bean id="res" />
+		<res:useCss value='${res.css.local.table_css}' target="head-css" />
+		<res:useJs value="${res.js.local['dependencyConfig.js']}" target="head-js" />
+		<res:useCss value='${res.css.local.body_css}' target="head-css" />
+		<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+		<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+		<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js" />
+		<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
 		<res:useJs value="${res.js.local['highcharts.js']}" target="head-js" />
 		<div class="report">
 			<a href="javascript:showOpNav()" id="switch" class="btn btn-small btn-success">隐藏</a>

cat-home/src/main/webapp/jsp/system/router/router.jsp

-<%@ page contentType="text/html; charset=utf-8" %>
+<%@ page contentType="text/xml; charset=utf-8" trimDirectiveWhitespaces="true" %>
 <jsp:useBean id="model" type="com.dianping.cat.system.page.router.Model" scope="request"/>
 ${model.content}
\ No newline at end of file