提交 0be604b5 编写于 作者: Y yong.you

modify the css

上级 557248c5
......@@ -54,7 +54,7 @@ public class DomainFilter implements Filter {
String domain = httpRequest.getParameter("domain");
boolean cookieExist = false;
if (domain != null && domain.length() > 0) {
if (cookies != null && cookies.length > 0 && domain != null && domain.length() > 0) {
for (Cookie cookie : cookies) {
if (DOMAIN.equals(cookie.getName())) {
cookieExist = true;
......
......@@ -97,6 +97,10 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
return m_reports;
}
public String getReportType(){
return "";
}
public int getRunningCount() {
return m_runningCount;
}
......@@ -168,7 +172,7 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
public void setTerminatedCount(int terminatedCount) {
m_terminatedCount = terminatedCount;
}
public void setTotalPages(int totalPages) {
m_totalPages = totalPages;
}
......@@ -240,6 +244,5 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
public void setRun(AbtestRun run) {
m_run = run;
}
}
}
......@@ -63,6 +63,10 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
return m_opState;
}
public String getReportType(){
return "";
}
public List<ScheduledReport> getSchduledReports() {
return m_schduledReports;
}
......@@ -106,7 +110,7 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
public void setTemplateIndex(int templateIndex) {
m_templateIndex = templateIndex;
}
public void setUserReportSubStates(List<UserReportSubState> userReportSubStates) {
m_userReportSubStates = userReportSubStates;
}
......
......@@ -62,14 +62,6 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
public static final String FAIL = "Fail";
public Map<String, Domain> getProductLineToDomains() {
return m_productLineToDomains;
}
public void setProductLineToDomains(Map<String, Domain> productLineToDomains) {
m_productLineToDomains = productLineToDomains;
}
public Model(Context ctx) {
super(ctx);
}
......@@ -98,10 +90,18 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
return m_aggregationRules;
}
public String getBug() {
return m_bug;
}
public TopologyGraphConfig getConfig() {
return m_config;
}
public String getContent() {
return m_content;
}
public String getDate() {
return "";
}
......@@ -131,10 +131,22 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
return m_edgeConfigs;
}
public ExceptionLimit getExceptionLimit() {
return m_exceptionLimit;
}
public List<ExceptionLimit> getExceptionLimits() {
return m_exceptionLimits;
}
public String getIpAddress() {
return "";
}
public MetricItemConfig getMetricItemConfig() {
return m_metricItemConfig;
}
public String getOpState() {
return m_opState;
}
......@@ -147,6 +159,14 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
return m_productLines;
}
public Map<String, Domain> getProductLineToDomains() {
return m_productLineToDomains;
}
public Map<ProductLine, List<MetricItemConfig>> getProductMetricConfigs() {
return m_productMetricConfigs;
}
public Project getProject() {
return m_project;
}
......@@ -155,6 +175,10 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
return m_projects;
}
public String getReportType(){
return "";
}
public void setAggregationRule(AggregationRule aggregationRule) {
m_aggregationRule = aggregationRule;
}
......@@ -163,10 +187,18 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
m_aggregationRules = aggregationRules;
}
public void setBug(String bug) {
m_bug = bug;
}
public void setConfig(TopologyGraphConfig config) {
m_config = config;
}
public void setContent(String content) {
m_content = content;
}
public void setDomainConfig(DomainConfig domainConfig) {
m_domainConfig = domainConfig;
}
......@@ -175,10 +207,22 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
m_edgeConfig = edgeConfig;
}
public void setExceptionLimit(ExceptionLimit exceptionLimit) {
m_exceptionLimit = exceptionLimit;
}
public void setExceptionLimits(List<ExceptionLimit> exceptionLimits) {
m_exceptionLimits = exceptionLimits;
}
public void setGraphConfig(TopologyGraphConfig config) {
m_config = config;
}
public void setMetricItemConfig(MetricItemConfig metricItemConfig) {
m_metricItemConfig = metricItemConfig;
}
public void setOpState(boolean result) {
if (result) {
m_opState = SUCCESS;
......@@ -195,62 +239,21 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
m_productLines = productLines;
}
public void setProject(Project project) {
m_project = project;
}
public void setProjects(List<Project> projects) {
m_projects = projects;
}
public MetricItemConfig getMetricItemConfig() {
return m_metricItemConfig;
}
public void setMetricItemConfig(MetricItemConfig metricItemConfig) {
m_metricItemConfig = metricItemConfig;
}
public Map<ProductLine, List<MetricItemConfig>> getProductMetricConfigs() {
return m_productMetricConfigs;
public void setProductLineToDomains(Map<String, Domain> productLineToDomains) {
m_productLineToDomains = productLineToDomains;
}
public void setProductMetricConfigs(Map<ProductLine, List<MetricItemConfig>> productMetricConfigs) {
m_productMetricConfigs = productMetricConfigs;
}
public ExceptionLimit getExceptionLimit() {
return m_exceptionLimit;
}
public List<ExceptionLimit> getExceptionLimits() {
return m_exceptionLimits;
}
public void setExceptionLimit(ExceptionLimit exceptionLimit) {
m_exceptionLimit = exceptionLimit;
public void setProject(Project project) {
m_project = project;
}
public void setExceptionLimits(List<ExceptionLimit> exceptionLimits) {
m_exceptionLimits = exceptionLimits;
public void setProjects(List<Project> projects) {
m_projects = projects;
}
public String getBug() {
return m_bug;
}
public void setBug(String bug) {
m_bug = bug;
}
public String getContent() {
return m_content;
}
public void setContent(String content) {
m_content = content;
}
public static class Edge {
private List<EdgeConfig> m_edgeConfigs;
......@@ -269,5 +272,4 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
return m_nodeConfig;
}
}
}
......@@ -84,7 +84,7 @@
}
}
function buildHref(domain){
var href = '<a href="?op=history&domain='+domain+'&date=${model.date}&reportType=${model.reportType}">&nbsp;[&nbsp;'+domain+'&nbsp;]&nbsp;</a>';
var href = '<a href="?op=history&domain='+domain+'&date=${model.date}">&nbsp;[&nbsp;'+domain+'&nbsp;]&nbsp;</a>';
return href;
}
......@@ -98,7 +98,6 @@
var href = buildHref(domainArray[i])
html+= href;
}
console.log(html);
$('#frequentNavbar').html(html);
var ct = getcookie("ct");
......
......@@ -188,6 +188,11 @@ a.abtest-heartbeat {
width: 100px;
}
.machines{
margin-top:5px;
margin-bottom:5px;
}
.longText {
text-align: left;
white-space: normal;
......
<%@ page contentType="text/html; charset=utf-8"%>
<br/>
<div class="well sidebar-nav" >
<ul class="nav nav-list">
<li class='nav-header'><h4>Statistics</h4></li>
......
......@@ -12,7 +12,6 @@
<a:report title="Cache Report${empty payload.type ? '' : ' :: '}<a href='?domain=${model.domain}&date=${model.date}&type=${payload.type}'>${payload.type}</a>" navUrlPrefix="ip=${model.ipAddress}&queryname=${model.queryName}&domain=${model.domain}${empty payload.type ? '' : '&type='}${payload.type}" timestamp="${w:format(model.creatTime,'yyyy-MM-dd HH:mm:ss')}">
<jsp:attribute name="subtitle">From ${w:format(report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
</br>
<table class="machines">
<tr style="text-align:left">
<th>Machines: &nbsp;[&nbsp; <c:choose>
......@@ -39,7 +38,6 @@
</th>
</tr>
</table>
<br>
<table class="data">
<c:choose>
<c:when test="${empty payload.type}">
......
......@@ -14,7 +14,6 @@
navUrlPrefix="ip=${model.ipAddress}&queryname=${model.queryName}&domain=${model.domain}${empty payload.type ? '' : '&type='}${payload.type}" timestamp="${w:format(model.creatTime,'yyyy-MM-dd HH:mm:ss')}">
<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
</br>
<table class="machines">
<tr style="text-align:left">
<th>Machines: &nbsp; <c:forEach var="ip" items="${model.ips}">
......@@ -33,7 +32,6 @@ navUrlPrefix="ip=${model.ipAddress}&queryname=${model.queryName}&domain=${model.
</th>
</tr>
</table>
<br>
<table class="data">
<c:choose>
<c:when test="${empty payload.type}">
......
......@@ -12,7 +12,6 @@
<jsp:attribute name="subtitle">From ${w:format(model.report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
<%@ include file="crossQuery.jsp" %>
</br>
<table class="machines">
<tr style="text-align: left">
<th>Machines: &nbsp;[&nbsp; <c:choose>
......@@ -39,7 +38,6 @@
</th>
</tr>
</table>
<br>
<table class='data'>
<c:if test="${!empty model.projectInfo.callProjectsInfo}">
<tr>
......
......@@ -18,8 +18,6 @@
<jsp:body>
<res:useJs value="${res.js.local['svgchart.latest.min.js']}" target="head-js"/>
<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
</br>
<table class="machines">
<tr style="text-align: left">
<th>Machines: &nbsp;[&nbsp; <c:choose>
......@@ -46,7 +44,6 @@
</th>
</tr>
</table>
<br>
<table class='data'>
<c:choose>
<c:when test="${empty payload.type}">
......
......@@ -12,7 +12,6 @@
<jsp:body>
<res:useJs value="${res.js.local['svgchart.latest.min.js']}" target="head-js"/>
<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
</br>
<table class="machines">
<tr style="text-align: left">
<th>Machines: <c:forEach var="ip" items="${model.ips}">&nbsp;[&nbsp;
......@@ -30,7 +29,6 @@
</th>
</tr>
</table>
<br>
<table class='data'>
<c:choose>
<c:when test="${empty payload.type}">
......
......@@ -14,9 +14,8 @@
<a:report title="HeartBeat Report" navUrlPrefix="ip=${model.ipAddress}&domain=${model.domain}" timestamp="${w:format(model.creatTime,'yyyy-MM-dd HH:mm:ss')}">
<jsp:attribute name="subtitle">From ${w:format(report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
</br>
<table class="machines">
<th style="text-align:left">Machines:
<th style="text-align:left">Machines:
<c:forEach var="ip" items="${model.ips}">
&nbsp;[&nbsp;
<c:choose>
......@@ -32,7 +31,6 @@
</c:forEach>
</th>
</table>
<br>
<table class="graph">
<tr>
<th>Framework Thread Info</th>
......
......@@ -13,7 +13,6 @@
<jsp:body>
<res:useJs value="${res.js.local['svgchart.latest.min.js']}" target="head-js"/>
<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
</br>
<table class="machines">
<tr style="text-align:left">
<th>Machines: &nbsp;[&nbsp; <c:choose>
......
......@@ -18,7 +18,6 @@
<jsp:body>
<res:useJs value="${res.js.local['svgchart.latest.min.js']}" target="head-js"/>
<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
</br>
<table class="machines">
<tr style="text-align:left">
<th>Machines: &nbsp;[&nbsp; <c:choose>
......
......@@ -8,7 +8,6 @@
<jsp:useBean id="payload" type="com.dianping.cat.report.page.sql.Payload" scope="request" />
<jsp:useBean id="model" type="com.dianping.cat.report.page.sql.Model"scope="request" />
<c:set var="report" value="${model.report}" />
<a:report
title="Sql Report"
navUrlPrefix="database=${model.database}&domain=${model.domain}"
......@@ -16,7 +15,6 @@
<jsp:attribute name="subtitle">From ${w:format(report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
</br>
<table>
<tr style="text-align: left">
<th>Databases: &nbsp;[&nbsp; <c:choose>
......@@ -43,7 +41,6 @@
</th>
</tr>
</table>
<br>
<table class='data'>
<tr>
<th></th>
......
......@@ -8,14 +8,12 @@
<jsp:useBean id="payload" type="com.dianping.cat.report.page.sql.Payload" scope="request" />
<jsp:useBean id="model" type="com.dianping.cat.report.page.sql.Model"scope="request" />
<c:set var="report" value="${model.report}" />
<a:historyReport
title="Sql Report"
navUrlPrefix="database=${model.database}&domain=${model.domain}">
<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
<jsp:body>
</br>
<table class='databases'>
<tr style="text-align: left">
<th>Databases: &nbsp;[&nbsp; <c:choose>
......@@ -42,7 +40,6 @@
</th>
</tr>
</table>
<br>
<table class='data'>
<tr>
<th></th>
......
......@@ -16,8 +16,6 @@
<jsp:body>
<res:useJs value="${res.js.local['svgchart.latest.min.js']}" target="head-js"/>
<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
<br>
<table class="machines">
<tr style="text-align: left">
<th>Machines: &nbsp;[&nbsp; <c:choose>
......@@ -44,8 +42,6 @@
</th>
</tr>
</table>
</br>
<table width="80%">
<tr>
<td width="5%"></td>
......
......@@ -13,8 +13,6 @@
<jsp:body>
<res:useJs value="${res.js.local['svgchart.latest.min.js']}" target="head-js"/>
<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
<br>
<table class="machines">
<tr style="text-align:left">
<th>Machines: &nbsp;[&nbsp; <c:choose>
......@@ -41,8 +39,6 @@
</th>
</tr>
</table>
</br>
<table width="80%">
<tr>
<td width="5%"></td>
......
......@@ -15,7 +15,6 @@
<jsp:body>
<res:useJs value="${res.js.local['svgchart.latest.min.js']}" target="head-js"/>
<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
</br>
<table class="machines">
<tr style="text-align:left">
<th>Machines: &nbsp;[&nbsp; <c:choose>
......@@ -42,7 +41,6 @@
</th>
</tr>
</table>
<br>
<table class='data'>
<c:choose>
<c:when test="${empty payload.type}">
......@@ -77,7 +75,7 @@
</c:forEach>
</c:when>
<c:otherwise>
<tr><th class='left' colspan='12'><input type="text" name="queryname" id="queryname" size="40" value="${model.queryName}">
<tr><th style="text-align:left;" colspan='13'><input type="text" name="queryname" id="queryname" size="40" value="${model.queryName}">
<input class="btn btn-primary btn-small" value="Filter" onclick="selectByName('${model.date}','${model.domain}','${model.ipAddress}','${payload.type}')" type="submit">
支持多个字符串查询,例如sql|url|task,查询结果为包含任一sql、url、task的列。
</th></tr>
......
......@@ -12,7 +12,6 @@
<jsp:body>
<res:useJs value="${res.js.local['svgchart.latest.min.js']}" target="head-js"/>
<res:useJs value="${res.js.local['baseGraph.js']}" target="head-js"/>
</br>
<table class="machines">
<tr style="text-align: left">
<th>Machines:
......@@ -31,7 +30,6 @@
</th>
</tr>
</table>
<br>
<table class='data'>
<c:choose>
<c:when test="${empty payload.type}">
......@@ -73,7 +71,7 @@
</c:forEach>
</c:when>
<c:otherwise>
<tr><th class='left' colspan='12'>
<tr><th style="text-align:left;" colspan='13'>
<input type="text" id="queryname" size="40" value="${model.queryName}">
<input class="btn btn-primary btn-small" value="Filter" onclick="filterByName('${model.date}','${model.domain}','${model.ipAddress}','${payload.type}')" type="submit">
支持多个字符串查询,例如sql|url|task,查询结果为包含任一sql、url、task的列
......@@ -87,7 +85,7 @@
}
</script>
<tr>
<th style="text-align: left;">
<th style="text-align: left;">
<a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=type${model.customDate}&queryname=${model.queryName}">Name</a>
</th>
<th class="right"><a href="?op=history&domain=${model.domain}&date=${model.date}&ip=${model.ipAddress}&reportType=${model.reportType}&type=${payload.type}&sort=total${model.customDate}&queryname=${model.queryName}">Total Count</a></th>
......
......@@ -23,7 +23,8 @@
<res:useCss value="${res.css.local['bootstrap-rowlink.css']}" target="head-css" />
<res:useJs value="${res.js.local['bootstrap-rowlink.min.js']}" target="head-js" />
<res:useJs value="${res.js.local['abtestAllTest.js']}" target="head-js" />
<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" />
<style>
.statusSpan {
float: right;
......
......@@ -22,6 +22,8 @@ div.controls input {
<res:useJs value="${res.js.local['select2.min.js']}" target="head-js" />
<res:useJs value="${res.js.local['abtestAllTest.js']}" target="head-js" />
<res:useJs value="${res.js.local['bootstrap-validation.min.js']}" target="head-js" />
<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" />
<div style="width: 950px; margin: 0 auto; margin-bottom: 250px;">
<h4 style="margin: 0 auto;">Create ABTest</h4>
......
......@@ -33,6 +33,9 @@ div.controls input {
<res:useJs value="${res.js.local['select2.min.js']}" target="head-js" />
<res:useJs value="${res.js.local['abtestAllTest.js']}" target="head-js" />
<res:useJs value="${res.js.local['bootstrap-validation.min.js']}" target="head-js" />
<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" />
<div id="content" class="row-fluid">
<div class="span12 column">
<h3>
......
......@@ -22,7 +22,9 @@
<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
<res:useCss value="${res.css.local['body.css']}" target="head-css" />
<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js" />
<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" />
<div id="content" lass="row-fluid">
<div class="span12 column">
<h3>Report <small>${model.abtest.name} #${model.abtest.id}</small></h3>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册