Skip to content

C
cat

梦中观雨 / cat
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

体验新版 GitCode，发现更多精彩内容 >>

提交 d4331f2b 编写于 作者: Y youyong205
浏览文件
操作

modify the cat tab nav

上级 7d88b750
隐藏空白更改
内联 并排
Showing with 52 addition and 51 deletion
cat-home/src/main/java/com/dianping/cat/report/ReportPage.java
浏览文件 @ d4331f2b
......@@ -21,7 +21,7 @@ public enum ReportPage implements Page {
DASHBOARD("dashboard", "dashboard", "Dashboard", "Dashboard", false),
MATRIX("matrix", "matrix", "Matrix", "Matrix", true),
MATRIX("matrix", "matrix", "Matrix", "Matrix", false),
CROSS("cross", "cross", "Cross", "Cross", true),
......@@ -37,19 +37,19 @@ public enum ReportPage implements Page {
EXTERNALERROR("externalError", "externalError", "externalError", "ExternalError", true),
STATISTICS("statistics", "statistics", "Statistics", "Statistics", true),
STATISTICS("statistics", "statistics", "Statistics", "Statistics", false),
ALTERATION("alteration", "alteration", "Change", "Alteration", true),
ALTERATION("alteration", "alteration", "Change", "Alteration", false),
MONITOR("monitor", "monitor", "Monitor", "Monitor", true),
NETWORK("network", "network", "Network", "Network", true),
NETWORK("network", "network", "Network", "Network", false),
USERMONITOR("userMonitor", "userMonitor", "Monitor", "UserMonitor", true),
SYSTEM("system", "system", "System", "System", true),
SYSTEM("system", "system", "System", "System", false),
CDN("cdn", "cdn", "Cdn", "Cdn", true),
CDN("cdn", "cdn", "Cdn", "Cdn", false),
APP("app", "app", "App", "App", true),
......
cat-home/src/main/java/com/dianping/cat/report/view/NavigationBar.java
浏览文件 @ d4331f2b
......@@ -24,9 +24,9 @@ public class NavigationBar {
ReportPage.METRIC,
ReportPage.USERMONITOR,
ReportPage.APP,
ReportPage.TRANSACTION,
ReportPage.EVENT,
......@@ -39,10 +39,12 @@ public class NavigationBar {
ReportPage.CACHE,
ReportPage.MATRIX,
ReportPage.DEPENDENCY,
ReportPage.STATE,
ReportPage.MATRIX,
ReportPage.NETWORK,
ReportPage.CDN,
......@@ -51,11 +53,12 @@ public class NavigationBar {
ReportPage.ALTERATION,
ReportPage.STATE,
ReportPage.STATISTICS,
SystemPage.ALARM,
ReportPage.LOGVIEW,
};
SystemPage.CONFIG,
ReportPage.LOGVIEW, };
}
}
cat-home/src/main/java/com/dianping/cat/system/SystemPage.java
浏览文件 @ d4331f2b
......@@ -5,11 +5,11 @@ import org.unidal.web.mvc.annotation.ModuleMeta;
public enum SystemPage implements Page {
ALARM("alarm", "alarm", "Alarm", "Alarm", true),
ALARM("alarm", "alarm", "Alarm", "Alarm", false),
LOGIN("login", "login", "Login", "Login", false),
CONFIG("config", "config", "Config", "Config", true),
CONFIG("config", "config", "Config", "Config", false),
PLUGIN("plugin", "plugin", "Plugin", "Plugin", true);
......
cat-home/src/main/resources/META-INF/wizard/webapp/wizard.xml
浏览文件 @ d4331f2b
......@@ -26,7 +26,7 @@
<page name="dashboard" title="Dashboard" path="dashboard" standalone="false">
<description>Dashboard</description>
</page>
<page name="matrix" title="Matrix" path="matrix" view="/jsp/report/matrix/matrix.jsp">
<page name="matrix" title="Matrix" path="matrix" view="/jsp/report/matrix/matrix.jsp" standalone="false">
<description>Matrix</description>
</page>
<page name="cross" title="Cross" path="cross" view="/jsp/report/cross/cross.jsp">
......@@ -35,7 +35,7 @@
<page name="cache" title="Cache" path="cache" view="/jsp/report/cache/cache.jsp">
<description>Cache</description>
</page>
<page name="state" title="State" path="state" view="/jsp/report/state/state.jsp">
<page name="state" title="State" path="state" view="/jsp/report/state/state.jsp" standalone="false">
<description>State</description>
</page>
<page name="top" title="Top" path="top" view="/jsp/report/top/top.jsp">
......@@ -50,25 +50,25 @@
<page name="externalError" title="externalError" path="externalError" template="default">
<description>ExternalError</description>
</page>
<page name="statistics" title="Statistics" path="statistics" view="/jsp/report/bug/bug.jsp" template="default">
<page name="statistics" title="Statistics" path="statistics" view="/jsp/report/bug/bug.jsp" template="default" standalone="false">
<description>Statistics</description>
</page>
<page name="alteration" title="Change" path="alteration" template="default">
<page name="alteration" title="Change" path="alteration" template="default" standalone="false">
<description>Alteration</description>
</page>
<page name="monitor" title="Monitor" path="monitor" template="default">
<description>Monitor</description>
</page>
<page name="network" title="Network" path="network" template="default">
<page name="network" title="Network" path="network" template="default" standalone="false">
<description>Network</description>
</page>
<page name="userMonitor" title="Monitor" path="userMonitor" template="default">
<description>UserMonitor</description>
</page>
<page name="system" title="System" path="system" template="default">
<page name="system" title="System" path="system" template="default" standalone="false">
<description>System</description>
</page>
<page name="cdn" title="Cdn" path="cdn" template="default">
<page name="cdn" title="Cdn" path="cdn" template="default" standalone="false">
<description>Cdn</description>
</page>
<page name="app" title="App" path="app" template="default">
......@@ -76,13 +76,13 @@
</page>
</module>
<module name="system" path="s" default="false">
<page name="alarm" title="Alarm" default="true" path="alarm" view="/jsp/system/alarm/alarm.jsp">
<page name="alarm" title="Alarm" default="true" path="alarm" view="/jsp/system/alarm/alarm.jsp" standalone="false">
<description>Alarm</description>
</page>
<page name="login" title="Login" default="true" path="login" standalone="false">
<description>Login</description>
</page>
<page name="config" title="Config" path="config" view="/jsp/system/project/project.jsp">
<page name="config" title="Config" path="config" view="/jsp/system/project/project.jsp" standalone="false">
<description>Config</description>
</page>
<page name="plugin" title="Plugin" path="plugin" view="/jsp/system/plugin/plugin.jsp">
......
cat-home/src/main/resources/chrome/cat/cat.js
浏览文件 @ d4331f2b
......@@ -69,7 +69,7 @@ function TabManager() {
var value = headers[i]["value"];
console.debug("\t" + name + " : " + value);
}
if(tabId <= 0) {
if(tabId <= 0) {
return;
}
......
cat-home/src/main/webapp/WEB-INF/tags/body.tag
浏览文件 @ d4331f2b
......@@ -18,26 +18,18 @@
<res:useCss value='${res.css.local.tiny_css}' media="screen and (max-width: 1050px)" target="head-css" />
<res:useCss value='${res.css.local.large_css}' media="screen and (min-width: 1050px)" target="head-css" />
</head>
<body>
<div class="navbar navbar-inverse">
<div class="navbar-inner">
<div class="container-fluid">
<a class="brand" href="/cat/r/home?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">CAT</a>
<a class="brand" style="padding-right:20px" href="/cat/r/home?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">CAT</a>
<div class="nav-collapse collapse">
<div class="nav pull-right">
<c:forEach var="page" items="${navBar.systemPages}">
<c:if test="${page.standalone}">
<li ${model.page.name == page.name ? 'class="active"' : ''}><a
href="${model.webapp}/${page.moduleName}/${page.path}">${page.title}</a></li>
</c:if>
<c:if
test="${not page.standalone and model.page.name == page.name}">
<li class="active"><a href="#">${page.title}</a></li>
</c:if>
</c:forEach>
<div class="nav pull-right">
<li id="loginInfo" ></li>
</div>
<ul class="nav">
<ul class="nav">
<c:forEach var="page" items="${navBar.visiblePages}">
<c:if test="${page.standalone}">
<li ${model.page.name == page.name ? 'class="active"' : ''}><a
......@@ -48,7 +40,23 @@
<li class="active"><a href="#">${page.title}</a></li>
</c:if>
</c:forEach>
</ul>
</ul>
<ul class="nav">
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Other<b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="nav-header">Report</li>
<li><a style="padding:3px 30px" href="/cat/r/matrix?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">matrix</a></li>
<li><a style="padding:3px 30px" href="/cat/r/network?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">network</a></li>
<li><a style="padding:3px 30px" href="/cat/r/cdn?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">cdn</a></li>
<li><a style="padding:3px 30px" href="/cat/r/system?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">system</a></li>
<li><a style="padding:3px 30px" href="/cat/r/change?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">change</a></li>
<li><a style="padding:3px 30px" href="/cat/r/statistics?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">statistics</a></li>
<li class="nav-header">System</li>
<li><a style="padding:3px 30px" href="/cat/s/alarm?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">alarm</a></li>
<li><a style="padding:3px 30px" href="/cat/s/config?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">config</a></li>
</ul>
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
......
cat-home/src/main/webapp/jsp/report/bug/bug.jsp
浏览文件 @ d4331f2b
......@@ -9,7 +9,6 @@
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<script type="text/javascript">
$(document).ready(function() {
......
cat-home/src/main/webapp/jsp/report/bug/bugHistory.jsp
浏览文件 @ d4331f2b
......@@ -9,7 +9,6 @@
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<script type="text/javascript">
$(document).ready(function() {
$('#bug').addClass('active');
......
cat-home/src/main/webapp/jsp/report/exceptionAlert/alert.jsp
浏览文件 @ d4331f2b
......@@ -9,7 +9,6 @@
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<script type="text/javascript">
$(document).ready(function() {
$('#alert').addClass('active');
......
cat-home/src/main/webapp/jsp/report/exceptionAlert/alertHistory.jsp
浏览文件 @ d4331f2b
......@@ -9,7 +9,6 @@
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<script type="text/javascript">
$(document).ready(function() {
$('#alert').addClass('active');
......
cat-home/src/main/webapp/jsp/report/heavy/heavy.jsp
浏览文件 @ d4331f2b
......@@ -9,7 +9,6 @@
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<script type="text/javascript">
$(document).ready(function() {
......
cat-home/src/main/webapp/jsp/report/heavy/heavyHistory.jsp
浏览文件 @ d4331f2b
......@@ -9,7 +9,6 @@
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<script type="text/javascript">
$(document).ready(function() {
$('#heavy').addClass('active');
......
cat-home/src/main/webapp/jsp/report/service/service.jsp
浏览文件 @ d4331f2b
......@@ -9,7 +9,6 @@
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<script type="text/javascript">
$(document).ready(function() {
......
cat-home/src/main/webapp/jsp/report/service/serviceHistory.jsp
浏览文件 @ d4331f2b
......@@ -9,7 +9,6 @@
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<script type="text/javascript">
$(document).ready(function() {
......
cat-home/src/main/webapp/jsp/report/summary/summary.jsp
浏览文件 @ d4331f2b
......@@ -9,7 +9,6 @@
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<script type="text/javascript">
$(document).ready(function() {
$('#summary').addClass('active');
......
cat-home/src/main/webapp/jsp/report/top/top.jsp
浏览文件 @ d4331f2b
......@@ -18,7 +18,6 @@
</style>
<a:body>
<res:useCss value='${res.css.local.table_css}' target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
<div class="report">
<table class="header">
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或