From bf3d031da561e3057c9783d12c7fe816cb0cd58d Mon Sep 17 00:00:00 2001 From: Frankie Wu Date: Tue, 28 Feb 2012 17:08:35 +0800 Subject: [PATCH] remove default.css, use body.css instead --- .../message/spi/codec/HtmlMessageCodec.java | 24 +------- .../cat/report/page/logview/JspFile.java | 2 +- cat-home/src/main/webapp/css/default.css | 60 ------------------- cat-home/src/main/webapp/css/logview.css | 6 ++ .../src/main/webapp/jsp/report/failure.jsp | 1 - cat-home/src/main/webapp/jsp/report/ip.jsp | 2 - .../src/main/webapp/jsp/report/logview.jsp | 2 - ...logview_bare.jsp => logview_no_header.jsp} | 0 .../main/webapp/jsp/report/transaction.jsp | 1 - 9 files changed, 8 insertions(+), 90 deletions(-) delete mode 100644 cat-home/src/main/webapp/css/default.css rename cat-home/src/main/webapp/jsp/report/{logview_bare.jsp => logview_no_header.jsp} (100%) diff --git a/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java b/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java index e82cc23da..c41e50f6d 100644 --- a/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java +++ b/cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java @@ -161,28 +161,6 @@ public class HtmlMessageCodec implements MessageCodec { return count; } - // - // - // protected int encodeLogViewLink(Message message, ChannelBuffer buf, int level, LineCounter counter) { BufferHelper helper = m_bufferHelper; int count = 0; @@ -190,7 +168,7 @@ public class HtmlMessageCodec implements MessageCodec { if (counter != null) { counter.inc(); - count += helper.tr1(buf, counter.getCount() % 2 != 0 ? "odd" : "even"); + count += helper.tr1(buf, "link"); } else { count += helper.tr1(buf, null); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java index 8f1ddb0fe..b8ba553c8 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java @@ -3,7 +3,7 @@ package com.dianping.cat.report.page.logview; public enum JspFile { LOGVIEW("/jsp/report/logview.jsp"), - LOGVIEW_NO_HEADER("/jsp/report/logview_bare.jsp"), + LOGVIEW_NO_HEADER("/jsp/report/logview_no_header.jsp"), ; diff --git a/cat-home/src/main/webapp/css/default.css b/cat-home/src/main/webapp/css/default.css deleted file mode 100644 index 406c7c994..000000000 --- a/cat-home/src/main/webapp/css/default.css +++ /dev/null @@ -1,60 +0,0 @@ -body { - font-family: arial, helvetica, sans-serif; - font-size: small; - background: white; - color: black; - margin: 4px; - padding: 0; - font: Message-Box; -} - -html { margin: 0 } - -a { - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - -ul.tabs { - border-bottom: 1px solid gray; - list-style-type: none; - position: relative; - padding: 0em; - padding-top: 0.4em; - padding-bottom: 0.4em; -} - -.tabs li { - display: inline; - margin: 0em 0.4em 0em 0.4em; - padding: 0.4em 0.4em 0.4em 0.4em; - overflow: hidden; - border-top: 1px solid gray; - border-left: 1px solid gray; - border-right: 1px solid gray; -} - -.tabs li.selected { - background: #ccddff; - border-bottom: 1px solid white; -} - -tr.head { - background-color: #e8e8e8; -} - -tr.strip { - background-color: #f2f2f2; -} - -tr.head th { - background-color: #f2f2f2; - border-bottom: 1px solid #c4c4c4; -} - -tr th { - background-color: #f2f2f2; -} diff --git a/cat-home/src/main/webapp/css/logview.css b/cat-home/src/main/webapp/css/logview.css index 63da4073a..1b1088908 100644 --- a/cat-home/src/main/webapp/css/logview.css +++ b/cat-home/src/main/webapp/css/logview.css @@ -16,6 +16,12 @@ tr.even td { vertical-align: top; } +tr.link td { + font-size: small; + white-space: nowrap; + vertical-align: top; +} + .warn { color: yellow; } diff --git a/cat-home/src/main/webapp/jsp/report/failure.jsp b/cat-home/src/main/webapp/jsp/report/failure.jsp index 78fd5c326..0dfda7d7c 100644 --- a/cat-home/src/main/webapp/jsp/report/failure.jsp +++ b/cat-home/src/main/webapp/jsp/report/failure.jsp @@ -6,7 +6,6 @@ - diff --git a/cat-home/src/main/webapp/jsp/report/ip.jsp b/cat-home/src/main/webapp/jsp/report/ip.jsp index 1111de23d..16e39ac41 100644 --- a/cat-home/src/main/webapp/jsp/report/ip.jsp +++ b/cat-home/src/main/webapp/jsp/report/ip.jsp @@ -6,8 +6,6 @@ - - diff --git a/cat-home/src/main/webapp/jsp/report/logview.jsp b/cat-home/src/main/webapp/jsp/report/logview.jsp index dedc9a500..fd58af6ae 100644 --- a/cat-home/src/main/webapp/jsp/report/logview.jsp +++ b/cat-home/src/main/webapp/jsp/report/logview.jsp @@ -6,8 +6,6 @@ - - diff --git a/cat-home/src/main/webapp/jsp/report/logview_bare.jsp b/cat-home/src/main/webapp/jsp/report/logview_no_header.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/report/logview_bare.jsp rename to cat-home/src/main/webapp/jsp/report/logview_no_header.jsp diff --git a/cat-home/src/main/webapp/jsp/report/transaction.jsp b/cat-home/src/main/webapp/jsp/report/transaction.jsp index eeab0ed87..7ee73f3f4 100644 --- a/cat-home/src/main/webapp/jsp/report/transaction.jsp +++ b/cat-home/src/main/webapp/jsp/report/transaction.jsp @@ -12,7 +12,6 @@ var domain = '${model.currentDomain}'; - -- GitLab