Skip to content

C
cat

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

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

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

提交 794d0756 编写于 作者: Y yong.you
浏览文件
操作

modify the nav

上级 47b4165a
隐藏空白更改
内联 并排
Showing with 31 addition and 45 deletion
cat-home/src/main/webapp/WEB-INF/tags/body.tag
浏览文件 @ 794d0756
......@@ -3,7 +3,6 @@
<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%>
<jsp:useBean id="navBar"
class="com.dianping.cat.report.view.NavigationBar" scope="page" />
<res:bean id="res" />
<html>
<head>
......
cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag
浏览文件 @ 794d0756
......@@ -13,8 +13,8 @@
<div class="report">
<table class="header">
<tr>
<td class="position">当前项目:&nbsp;${model.department}<span class="divider">&nbsp;/&nbsp;</span>${model.projectLine} <span class="divider">&nbsp;/&nbsp;</span><span class="text-error">${model.domain}</span>&nbsp;&nbsp;
&nbsp;&nbsp;[&nbsp;&nbsp;<a href="javascript:showDomain()" id="switch">切换</a>&nbsp;&nbsp;]&nbsp;&nbsp;
<td class="position">项目：<span class="text-error">${model.domain}</span>&nbsp;&nbsp;
[&nbsp;&nbsp;<a href="javascript:showDomain()" id="switch">切换</a>&nbsp;&nbsp;]
<script>
function showDomain() {
var b = $('#switch').html();
......@@ -31,20 +31,20 @@
<td class="title"><span class="text-success"><span class="text-success"><span class="text-error">【报表时间】</span><jsp:invoke fragment="subtitle"/></span></td>
</td>
<td class="nav">
<a href="?domain=${model.domain}" class="switch"><span class="text-error">【切换至小时模式】</span></a>
<a href="?domain=${model.domain}" class="switch"><span class="text-error">【切到小时模式】</span></a>
&nbsp;&nbsp;<c:forEach var="nav" items="${model.historyNavs}">
<c:choose>
<c:when test="${nav.title eq model.reportType}">
&nbsp;&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${nav.title}" class="current">${nav.title}</a> ]
&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${nav.title}" class="current">${nav.title}</a> ]
</c:when>
<c:otherwise>
&nbsp;&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${nav.title}">${nav.title}</a> ]&nbsp;&nbsp;
&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${nav.title}">${nav.title}</a> ]
</c:otherwise>
</c:choose>
</c:forEach>
&nbsp;&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${model.reportType}&step=-1&${navUrlPrefix}">${model.currentNav.last}</a> ]&nbsp;&nbsp;
&nbsp;&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${model.reportType}&step=1&${navUrlPrefix}">${model.currentNav.next}</a> ]&nbsp;&nbsp;
&nbsp;&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&reportType=${model.reportType}&nav=next&${navUrlPrefix}">now</a> ]&nbsp;&nbsp;
&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${model.reportType}&step=-1&${navUrlPrefix}">${model.currentNav.last}</a> ]
&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${model.reportType}&step=1&${navUrlPrefix}">${model.currentNav.next}</a> ]
&nbsp;[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&reportType=${model.reportType}&nav=next&${navUrlPrefix}">now</a> ]
</td>
</tr>
</table>
......
cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag
浏览文件 @ 794d0756
......@@ -12,8 +12,8 @@
<div class="report">
<table class="header">
<tr>
<td class="position">当前项目:&nbsp;${model.department}<span class="divider">&nbsp;/&nbsp;</span>${model.projectLine} <span class="divider">&nbsp;/&nbsp;</span><span class="text-error">${model.domain}</span>&nbsp;&nbsp;
&nbsp;&nbsp;[&nbsp;&nbsp;<a href="javascript:showDomain()" id="switch">切换</a>&nbsp;&nbsp;]&nbsp;&nbsp;
<td class="position">项目：<span class="text-error">${model.domain}</span>&nbsp;&nbsp;
[&nbsp;&nbsp;<a href="javascript:showDomain()" id="switch">切换</a>&nbsp;&nbsp;]
<script>
function showDomain() {
var b = $('#switch').html();
......@@ -29,9 +29,9 @@
</td>
<td class="title"><span class="text-success"><span class="text-error">【报表时间】</span><jsp:invoke fragment="subtitle"/></span></td>
<td class="nav">
<a class="switch" href="${model.baseUri}?op=history&domain=${model.domain}&ip=${model.ipAddress}"><span class="text-error">【切换至历史模式】</span></a>
&nbsp;&nbsp;<c:forEach var="nav" items="${model.navs}">
&nbsp;[ <a href="${model.baseUri}?date=${model.date}&ip=${model.ipAddress}&step=${nav.hours}&${navUrlPrefix}">${nav.title}</a> ]&nbsp;
<a class="switch" href="${model.baseUri}?op=history&domain=${model.domain}&ip=${model.ipAddress}"><span class="text-error">【切到历史模式】</span></a>
<c:forEach var="nav" items="${model.navs}">
&nbsp;[ <a href="${model.baseUri}?date=${model.date}&ip=${model.ipAddress}&step=${nav.hours}&${navUrlPrefix}">${nav.title}</a> ]
</c:forEach>
&nbsp;[ <a href="${model.baseUri}?${navUrlPrefix}">now</a> ]&nbsp;
</td>
......
cat-home/src/main/webapp/css/body.css
浏览文件 @ 794d0756
body {
font-family: arial, helvetica, sans-serif;
font-size: small;
background: white;
color: black;
margin: 4px;
padding: 0;
}
html {
margin: 0
}
.report .header {
background:#f5f5f5;
font-weight: bold;
......@@ -26,16 +20,13 @@ html {
.report .navbar .nav {
text-align: right;
font-size: small;
font-weight: bold;
}
.report .header .nav {
text-align: right;
font-size: small;
font-weight: bold;
color: black;
width:40%;
}
.report .navbar .nav A {
......@@ -65,11 +56,7 @@ a:hover {
}
.current {
background-color: orange;
}
table {
font-size: small;
background-color: #3CB371;
}
tr.head {
......@@ -87,12 +74,12 @@ tr.head th {
tr th {
background-color: #f2f2f2;
font-size: small;
}
tr.odd td {
background-color: #eee;
font-size: small;
white-space: nowrap;
vertical-align: top;
text-align: left;
......@@ -100,7 +87,7 @@ tr.odd td {
tr.even td {
background-color: white;
font-size: small;
white-space: nowrap;
vertical-align: top;
text-align: left;
......@@ -108,7 +95,7 @@ tr.even td {
tr.odd th {
background-color: #eee;
font-size: small;
white-space: nowrap;
vertical-align: top;
text-align: left;
......@@ -116,14 +103,14 @@ tr.odd th {
tr.even th {
background-color: white;
font-size: small;
white-space: nowrap;
vertical-align: top;
text-align: left;
}
.data {
font-size: small;
min-width:50%;
}
.data tr th{
......@@ -131,13 +118,13 @@ tr.even th {
}
.data .odd td {
background-color: #eee;
font-size: small;
text-align:right;
}
.data .even td {
background-color: white;
font-size: small;
text-align:right;
}
.data th .left{
......@@ -210,7 +197,7 @@ a.abtest-heartbeat{
background-color: #009933;
}
.detail {
font-size: small;
border-spacing: 1px;
}
.top{
......
cat-home/src/main/webapp/jsp/report/bug/bug.jsp
浏览文件 @ 794d0756
......@@ -22,7 +22,7 @@
<td class="title"><span class="text-success"><span class="text-error">【报表时间】</span><span class="text-success">&nbsp;&nbsp;From ${w:format(model.bugReport.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.bugReport.endTime,'yyyy-MM-dd HH:mm:ss')}</span></td>
</td>
<td class="nav" >
<a href="?op=historyBug&domain=${model.domain}" class="switch"><span class="text-error">【切换至历史模式】</span></a>
<a href="?op=historyBug&domain=${model.domain}" class="switch"><span class="text-error">【切到历史模式】</span></a>
<c:forEach var="nav" items="${model.navs}">
&nbsp;[ <a href="${model.baseUri}?date=${model.date}&step=${nav.hours}&${navUrlPrefix}">${nav.title}</a> ]&nbsp;
</c:forEach>
......
cat-home/src/main/webapp/jsp/report/bug/bugHistory.jsp
浏览文件 @ 794d0756
......@@ -20,7 +20,7 @@
<tr>
<td class="title"><span class="text-success"><span class="text-error">【报表时间】</span><span class="text-success">&nbsp;&nbsp;From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</span></td>
<td class="nav">
<a class="switch" href="?domain=${model.domain}"><span class="text-error">【切换至小时模式】</span></a>
<a class="switch" href="?domain=${model.domain}"><span class="text-error">【切到小时模式】</span></a>
<c:forEach var="nav" items="${model.historyNavs}">
<c:choose>
<c:when test="${nav.title eq model.reportType}">
......
cat-home/src/main/webapp/jsp/report/heavy/heavy.jsp
浏览文件 @ 794d0756
......@@ -21,7 +21,7 @@
<tr>
<td class="title text-success"><span class="text-success"><span class="text-error">【报表时间】</span>&nbsp;&nbsp;From ${w:format(model.heavyReport.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.heavyReport.endTime,'yyyy-MM-dd HH:mm:ss')}</td>
<td class="nav" >
<a href="?op=historyHeavy&domain=${model.domain}" class="switch"><span class="text-error">【切换至历史模式】</span></a>
<a href="?op=historyHeavy&domain=${model.domain}" class="switch"><span class="text-error">【切到历史模式】</span></a>
<c:forEach var="nav" items="${model.navs}">
&nbsp;[ <a href="${model.baseUri}?op=heavy&date=${model.date}&step=${nav.hours}">${nav.title}</a> ]&nbsp;
</c:forEach>
......
cat-home/src/main/webapp/jsp/report/heavy/heavyHistory.jsp
浏览文件 @ 794d0756
......@@ -20,7 +20,7 @@
<tr>
<td class="title"><span class="text-success"><span class="text-error">【报表时间】</span>&nbsp;&nbsp;From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</td>
<td class="nav">
<a class="switch" href="?domain=${model.domain}&op=heavy"><span class="text-error">【切换至小时模式】</span></a>
<a class="switch" href="?domain=${model.domain}&op=heavy"><span class="text-error">【切到小时模式】</span></a>
<c:forEach var="nav" items="${model.historyNavs}">
<c:choose>
<c:when test="${nav.title eq model.reportType}">
......
cat-home/src/main/webapp/jsp/report/service/service.jsp
浏览文件 @ 794d0756
......@@ -22,7 +22,7 @@
<td class="title text-success"><span class="text-success"><span class="text-error">【报表时间】</span>&nbsp;&nbsp;From ${w:format(model.serviceReport.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.serviceReport.endTime,'yyyy-MM-dd HH:mm:ss')}</td>
</td>
<td class="nav" >
<a href="?op=historyService&domain=${model.domain}" class="switch"><span class="text-error">【切换至历史模式】</span></a>
<a href="?op=historyService&domain=${model.domain}" class="switch"><span class="text-error">【切到历史模式】</span></a>
<c:forEach var="nav" items="${model.navs}">
&nbsp;[ <a href="?date=${model.date}&step=${nav.hours}&${navUrlPrefix}&op=service">${nav.title}</a> ]&nbsp;
</c:forEach>
......
cat-home/src/main/webapp/jsp/report/service/serviceHistory.jsp
浏览文件 @ 794d0756
......@@ -21,7 +21,7 @@
<td class="title text-success"><span class="text-success"><span class="text-error">【报表时间】</span>&nbsp;&nbsp;From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</td>
</td>
<td class="nav">
<a class="switch" href="?domain=${model.domain}&op=service"><span class="text-error">【切换至小时模式】</span></a>
<a class="switch" href="?domain=${model.domain}&op=service"><span class="text-error">【切到小时模式】</span></a>
<c:forEach var="nav" items="${model.historyNavs}">
<c:choose>
<c:when test="${nav.title eq model.reportType}">
......
cat-home/src/main/webapp/jsp/report/utilization/utilization.jsp
浏览文件 @ 794d0756
......@@ -22,7 +22,7 @@
<td class="title text-success"><span class="text-success"><span class="text-error">【报表时间】</span>&nbsp;&nbsp;From ${w:format(model.utilizationReport.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.utilizationReport.endTime,'yyyy-MM-dd HH:mm:ss')}</td>
</td>
<td class="nav" >
<a href="?op=historyUtilization&domain=${model.domain}" class="switch"><span class="text-error">【切换至历史模式】</span></a>
<a href="?op=historyUtilization&domain=${model.domain}" class="switch"><span class="text-error">【切到历史模式】</span></a>
<c:forEach var="nav" items="${model.navs}">
&nbsp;[ <a href="${model.baseUri}?date=${model.date}&step=${nav.hours}&op=utilization">${nav.title}</a> ]&nbsp;
</c:forEach>
......
cat-home/src/main/webapp/jsp/report/utilization/utilizationHistory.jsp
浏览文件 @ 794d0756
......@@ -21,7 +21,7 @@
<td class="title"><span class="text-success"><span class="text-error">【报表时间】</span>&nbsp;&nbsp;From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</td>
</td>
<td class="nav">
<a class="switch" href="?domain=${model.domain}&op=utilization"><span class="text-error">【切换至小时模式】</span></a>
<a class="switch" href="?domain=${model.domain}&op=utilization"><span class="text-error">【切到小时模式】</span></a>
<c:forEach var="nav" items="${model.historyNavs}">
<c:choose>
<c:when test="${nav.title eq model.reportType}">
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或