Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
794d0756
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
794d0756
编写于
9月 04, 2013
作者:
Y
yong.you
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the nav
上级
47b4165a
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
31 addition
and
45 deletion
+31
-45
cat-home/src/main/webapp/WEB-INF/tags/body.tag
cat-home/src/main/webapp/WEB-INF/tags/body.tag
+0
-1
cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag
cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag
+8
-8
cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag
cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag
+5
-5
cat-home/src/main/webapp/css/body.css
cat-home/src/main/webapp/css/body.css
+10
-23
cat-home/src/main/webapp/jsp/report/bug/bug.jsp
cat-home/src/main/webapp/jsp/report/bug/bug.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/bug/bugHistory.jsp
cat-home/src/main/webapp/jsp/report/bug/bugHistory.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/heavy/heavy.jsp
cat-home/src/main/webapp/jsp/report/heavy/heavy.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/heavy/heavyHistory.jsp
cat-home/src/main/webapp/jsp/report/heavy/heavyHistory.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/service/service.jsp
cat-home/src/main/webapp/jsp/report/service/service.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/service/serviceHistory.jsp
...ome/src/main/webapp/jsp/report/service/serviceHistory.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/utilization/utilization.jsp
...me/src/main/webapp/jsp/report/utilization/utilization.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/utilization/utilizationHistory.jsp
...main/webapp/jsp/report/utilization/utilizationHistory.jsp
+1
-1
未找到文件。
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">
当前项目: ${model.department}<span class="divider"> / </span>${model.projectLine} <span class="divider"> / </span>
<span class="text-error">${model.domain}</span>
[ <a href="javascript:showDomain()" id="switch">切换</a> ]
<td class="position">
项目:
<span class="text-error">${model.domain}</span>
[ <a href="javascript:showDomain()" id="switch">切换</a> ]
<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>
<c:forEach var="nav" items="${model.historyNavs}">
<c:choose>
<c:when test="${nav.title eq model.reportType}">
[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${nav.title}" class="current">${nav.title}</a> ]
[ <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>
[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${nav.title}">${nav.title}</a> ]
[ <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>
[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${model.reportType}&step=-1&${navUrlPrefix}">${model.currentNav.last}</a> ]
[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${model.reportType}&step=1&${navUrlPrefix}">${model.currentNav.next}</a> ]
[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&reportType=${model.reportType}&nav=next&${navUrlPrefix}">now</a> ]
[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${model.reportType}&step=-1&${navUrlPrefix}">${model.currentNav.last}</a> ]
[ <a href="?op=history&domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${model.reportType}&step=1&${navUrlPrefix}">${model.currentNav.next}</a> ]
[ <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">
当前项目: ${model.department}<span class="divider"> / </span>${model.projectLine} <span class="divider"> / </span>
<span class="text-error">${model.domain}</span>
[ <a href="javascript:showDomain()" id="switch">切换</a> ]
<td class="position">
项目:
<span class="text-error">${model.domain}</span>
[ <a href="javascript:showDomain()" id="switch">切换</a> ]
<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>
<c:forEach var="nav" items="${model.navs}">
[ <a href="${model.baseUri}?date=${model.date}&ip=${model.ipAddress}&step=${nav.hours}&${navUrlPrefix}">${nav.title}</a> ]
<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}">
[ <a href="${model.baseUri}?date=${model.date}&ip=${model.ipAddress}&step=${nav.hours}&${navUrlPrefix}">${nav.title}</a> ]
</c:forEach>
[ <a href="${model.baseUri}?${navUrlPrefix}">now</a> ]
</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"
>
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
}
"
>
[
<a
href=
"${model.baseUri}?date=${model.date}&step=${nav.hours}&${navUrlPrefix}"
>
${nav.title}
</a>
]
</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"
>
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>
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
}
"
>
[
<a
href=
"${model.baseUri}?op=heavy&date=${model.date}&step=${nav.hours}"
>
${nav.title}
</a>
]
</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>
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>
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
}
"
>
[
<a
href=
"?date=${model.date}&step=${nav.hours}&${navUrlPrefix}&op=service"
>
${nav.title}
</a>
]
</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>
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>
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
}
"
>
[
<a
href=
"${model.baseUri}?date=${model.date}&step=${nav.hours}&op=utilization"
>
${nav.title}
</a>
]
</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>
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录