diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/alarm/JspFile.java b/cat-home/src/main/java/com/dianping/cat/system/page/alarm/JspFile.java index 369b068c3f8dea6b1a29e2234e5ed3686f40fb17..02631c26f6aabac8b404de24755d48570325e7cd 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/alarm/JspFile.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/alarm/JspFile.java @@ -1,55 +1,55 @@ package com.dianping.cat.system.page.alarm; public enum JspFile { - ALARM_RECORD_DETAIL("/jsp/system/alarmRecordDetail.jsp"), + ALARM_RECORD_DETAIL("/jsp/system/alarm/alarmRecordDetail.jsp"), - ALARM_RECORD_LIST("/jsp/system/alarmRecordList.jsp"), + ALARM_RECORD_LIST("/jsp/system/alarm/alarmRecordList.jsp"), - ALARM_RULE_ADD("/jsp/system/alarmRuleAdd.jsp"), + ALARM_RULE_ADD("/jsp/system/alarm/alarmRuleAdd.jsp"), - ALARM_RULE_ADD_SUBMIT("/jsp/system/alarmOpState.jsp"), + ALARM_RULE_ADD_SUBMIT("/jsp/system/alarm/alarmOpState.jsp"), - ALARM_RULE_UPDATE("/jsp/system/alarmRuleUpdate.jsp"), + ALARM_RULE_UPDATE("/jsp/system/alarm/alarmRuleUpdate.jsp"), - ALARM_RULE_UPDATE_SUBMIT("/jsp/system/alarmOpState.jsp"), + ALARM_RULE_UPDATE_SUBMIT("/jsp/system/alarm/alarmOpState.jsp"), - ALARM_TEMPLATE_ADD("/jsp/system/alarmTemplateAdd.jsp"), + ALARM_TEMPLATE_ADD("/jsp/system/alarm/alarmTemplateAdd.jsp"), - ALARM_TEMPLATE_ADD_SUBMIT("/jsp/system/alarmOpState.jsp"), + ALARM_TEMPLATE_ADD_SUBMIT("/jsp/system/alarm/alarmOpState.jsp"), - ALARM_TEMPLATE_DELETE("/jsp/system/alarmTemplateList.jsp"), + ALARM_TEMPLATE_DELETE("/jsp/system/alarm/alarmTemplateList.jsp"), - ALARM_TEMPLATE_LIST("/jsp/system/alarmTemplateList.jsp"), + ALARM_TEMPLATE_LIST("/jsp/system/alarm/alarmTemplateList.jsp"), - ALARM_TEMPLATE_UPDATE("/jsp/system/alarmTemplateUpdate.jsp"), + ALARM_TEMPLATE_UPDATE("/jsp/system/alarm/alarmTemplateUpdate.jsp"), - ALARM_TEMPLATE_UPDATE_SUBMIT("/jsp/system/alarmOpState.jsp"), + ALARM_TEMPLATE_UPDATE_SUBMIT("/jsp/system/alarm/alarmOpState.jsp"), - EXCEPTION_ALARM_RULE_DELETE("/jsp/system/alarmExceptionRules.jsp"), + EXCEPTION_ALARM_RULE_DELETE("/jsp/system/alarm/alarmExceptionRules.jsp"), - EXCEPTION_ALARM_RULE_LIST("/jsp/system/alarmExceptionRules.jsp"), + EXCEPTION_ALARM_RULE_LIST("/jsp/system/alarm/alarmExceptionRules.jsp"), - EXCEPTION_ALARM_RULE_SUB("/jsp/system/alarmOpState.jsp"), + EXCEPTION_ALARM_RULE_SUB("/jsp/system/alarm/alarmOpState.jsp"), - SCHEDULED_REPORT_ADD("/jsp/system/scheduledReportAdd.jsp"), + SCHEDULED_REPORT_ADD("/jsp/system/alarm/scheduledReportAdd.jsp"), - SCHEDULED_REPORT_ADD_SUBMIT("/jsp/system/alarmOpState.jsp"), + SCHEDULED_REPORT_ADD_SUBMIT("/jsp/system/alarm/alarmOpState.jsp"), - SCHEDULED_REPORT_DELETE("/jsp/system/scheduledReports.jsp"), + SCHEDULED_REPORT_DELETE("/jsp/system/alarm/scheduledReports.jsp"), - SCHEDULED_REPORT_LIST("/jsp/system/scheduledReports.jsp"), + SCHEDULED_REPORT_LIST("/jsp/system/alarm/scheduledReports.jsp"), - SCHEDULED_REPORT_SUB("/jsp/system/alarmOpState.jsp"), + SCHEDULED_REPORT_SUB("/jsp/system/alarm/alarmOpState.jsp"), - SCHEDULED_REPORT_UPDATE("/jsp/system/scheduledReportUpdate.jsp"), + SCHEDULED_REPORT_UPDATE("/jsp/system/alarm/scheduledReportUpdate.jsp"), - SCHEDULED_REPORT_UPDATE_SUBMIT("/jsp/system/alarmOpState.jsp"), + SCHEDULED_REPORT_UPDATE_SUBMIT("/jsp/system/alarm/alarmOpState.jsp"), - SERVICE_ALARM_RULE_DELETE("/jsp/system/alarmServiceRules.jsp"), + SERVICE_ALARM_RULE_DELETE("/jsp/system/alarm/alarmServiceRules.jsp"), - SERVICE_ALARM_RULE_LIST("/jsp/system/alarmServiceRules.jsp"), + SERVICE_ALARM_RULE_LIST("/jsp/system/alarm/alarmServiceRules.jsp"), - SERVICE_ALARM_RULE_SUB("/jsp/system/alarmOpState.jsp") + SERVICE_ALARM_RULE_SUB("/jsp/system/alarm/alarmOpState.jsp") ; diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/config/JspFile.java b/cat-home/src/main/java/com/dianping/cat/system/page/config/JspFile.java index 4eb10bcb9496b3d9ef98ec9f04cf9b629e3ed6ee..16465598ac220706a8075a548c02d99fe463483c 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/config/JspFile.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/config/JspFile.java @@ -1,21 +1,21 @@ package com.dianping.cat.system.page.config; public enum JspFile { - PROJECT_ALL("/jsp/system/project.jsp"), + PROJECT_ALL("/jsp/system/project/project.jsp"), - PROJECT_UPATE("/jsp/system/projectUpdate.jsp"), + PROJECT_UPATE("/jsp/system/project/projectUpdate.jsp"), - AGGREGATION_ALL("/jsp/system/aggregation.jsp"), + AGGREGATION_ALL("/jsp/system/aggregation/aggregation.jsp"), - AGGREGATION_UPATE("/jsp/system/aggregationUpdate.jsp"), + AGGREGATION_UPATE("/jsp/system/aggregation/aggregationUpdate.jsp"), - TOPOLOGY_GRAPH_NODE_CONFIG_ADD_OR_UPDATE("/jsp/system/topologyGraphNodeConfigAdd.jsp"), + TOPOLOGY_GRAPH_NODE_CONFIG_ADD_OR_UPDATE("/jsp/system/topology/topologyGraphNodeConfigAdd.jsp"), - TOPOLOGY_GRAPH_NODE_CONFIG_LIST("/jsp/system/topologyGraphNodeConfigs.jsp"), + TOPOLOGY_GRAPH_NODE_CONFIG_LIST("/jsp/system/topology/topologyGraphNodeConfigs.jsp"), - TOPOLOGY_GRAPH_EDGE_CONFIG_ADD_OR_UPDATE("/jsp/system/topologyGraphEdgeConfigAdd.jsp"), + TOPOLOGY_GRAPH_EDGE_CONFIG_ADD_OR_UPDATE("/jsp/system/topology/topologyGraphEdgeConfigAdd.jsp"), - TOPOLOGY_GRAPH_EDGE_CONFIG_LIST("/jsp/system/topologyGraphEdgeConfigs.jsp"), + TOPOLOGY_GRAPH_EDGE_CONFIG_LIST("/jsp/system/topology/topologyGraphEdgeConfigs.jsp"), ; diff --git a/cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-codegen.xml b/cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-codegen.xml index 7534252e8cb3c8bfd7909f04e78bf686b95a6325..30a49e6c8cd85dec01db127128d4135a43613356 100644 --- a/cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-codegen.xml +++ b/cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-codegen.xml @@ -3,6 +3,7 @@ + @@ -10,7 +11,7 @@ - + @@ -29,5 +30,15 @@ + + + + + + + + + + diff --git a/cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-model.xml b/cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-model.xml index 57ed65b1f6ceb35f46daf79d9fb6a30434d5cfed..38ed85a7efab1e78be9da9f4cbc6426df7f66c05 100644 --- a/cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-model.xml +++ b/cat-home/src/main/resources/META-INF/dal/model/topology-graph-config-model.xml @@ -1,6 +1,6 @@ + enable-base-visitor="true" > @@ -11,7 +11,8 @@ - + + @@ -30,6 +31,16 @@ + + + + + + + + + + diff --git a/cat-home/src/main/webapp/css/select2.css b/cat-home/src/main/webapp/css/select2.css new file mode 100644 index 0000000000000000000000000000000000000000..6cd945dbce11a631d9200ff7f33c9da58bef49f3 --- /dev/null +++ b/cat-home/src/main/webapp/css/select2.css @@ -0,0 +1,615 @@ +/* +Version: 3.3.2 Timestamp: Mon Mar 25 12:14:18 PDT 2013 +*/ +.select2-container { + position: relative; + display: inline-block; + /* inline-block for ie7 */ + zoom: 1; + *display: inline; + vertical-align: middle; +} + +.select2-container, +.select2-drop, +.select2-search, +.select2-search input{ + /* + Force border-box so that % widths fit the parent + container without overlap because of margin/padding. + + More Info : http://www.quirksmode.org/css/box.html + */ + -webkit-box-sizing: border-box; /* webkit */ + -khtml-box-sizing: border-box; /* konqueror */ + -moz-box-sizing: border-box; /* firefox */ + -ms-box-sizing: border-box; /* ie */ + box-sizing: border-box; /* css3 */ +} + +.select2-container .select2-choice { + display: block; + height: 26px; + padding: 0 0 0 8px; + overflow: hidden; + position: relative; + + border: 1px solid #aaa; + white-space: nowrap; + line-height: 26px; + color: #444; + text-decoration: none; + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + background-color: #fff; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white)); + background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%); + background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%); + background-image: -o-linear-gradient(bottom, #eeeeee 0%, #ffffff 50%); + background-image: -ms-linear-gradient(top, #ffffff 0%, #eeeeee 50%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#ffffff', endColorstr = '#eeeeee', GradientType = 0); + background-image: linear-gradient(top, #ffffff 0%, #eeeeee 50%); +} + +.select2-container.select2-drop-above .select2-choice { + border-bottom-color: #aaa; + + -webkit-border-radius:0 0 4px 4px; + -moz-border-radius:0 0 4px 4px; + border-radius:0 0 4px 4px; + + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.9, white)); + background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 90%); + background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 90%); + background-image: -o-linear-gradient(bottom, #eeeeee 0%, white 90%); + background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 90%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 ); + background-image: linear-gradient(top, #eeeeee 0%,#ffffff 90%); +} + +.select2-container .select2-choice span { + margin-right: 26px; + display: block; + overflow: hidden; + + white-space: nowrap; + + -ms-text-overflow: ellipsis; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; +} + +.select2-container .select2-choice abbr { + display: block; + width: 12px; + height: 12px; + position: absolute; + right: 26px; + top: 8px; + + font-size: 1px; + text-decoration: none; + + border: 0; + background: url('../img/select2.png') right top no-repeat; + cursor: pointer; + outline: 0; +} +.select2-container .select2-choice abbr:hover { + background-position: right -11px; + cursor: pointer; +} + +.select2-drop-mask { + position: absolute; + left: 0; + top: 0; + z-index: 9998; + background-color: #fff; + opacity: 0; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; /* works in IE 8 */ + filter: "alpha(opacity=0)"; /* expected to work in IE 8 */ + filter: alpha(opacity=0); /* IE 4-7 */ +} + +.select2-drop { + width: 100%; + margin-top:-1px; + position: absolute; + z-index: 9999; + top: 100%; + + background: #fff; + color: #000; + border: 1px solid #aaa; + border-top: 0; + + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; + + -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); + -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); + box-shadow: 0 4px 5px rgba(0, 0, 0, .15); +} + +.select2-drop.select2-drop-above { + margin-top: 1px; + border-top: 1px solid #aaa; + border-bottom: 0; + + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; + + -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); + -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); + box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); +} + +.select2-container .select2-choice div { + display: block; + width: 18px; + height: 100%; + position: absolute; + right: 0; + top: 0; + + border-left: 1px solid #aaa; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; + + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + + background: #ccc; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee)); + background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%); + background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%); + background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%); + background-image: -ms-linear-gradient(top, #cccccc 0%, #eeeeee 60%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#cccccc', GradientType = 0); + background-image: linear-gradient(top, #cccccc 0%, #eeeeee 60%); +} + +.select2-container .select2-choice div b { + display: block; + width: 100%; + height: 100%; + background: url('../img/select2.png') no-repeat 0 1px; +} + +.select2-search { + display: inline-block; + width: 100%; + min-height: 26px; + margin: 0; + padding-left: 4px; + padding-right: 4px; + + position: relative; + z-index: 10000; + + white-space: nowrap; +} + +.select2-search-hidden { + display: block; + position: absolute; + left: -10000px; +} + +.select2-search input { + width: 100%; + height: auto !important; + min-height: 26px; + padding: 4px 20px 4px 5px; + margin: 0; + + outline: 0; + font-family: sans-serif; + font-size: 1em; + + border: 1px solid #aaa; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + + background: #fff url('../img/select2.png') no-repeat 100% -22px; + background: url('../img/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee)); + background: url('../img/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%); + background: url('../img/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%); + background: url('../img/select2.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%); + background: url('../img/select2.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%); + background: url('../img/select2.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%, #eeeeee 99%); +} + +.select2-drop.select2-drop-above .select2-search input { + margin-top: 4px; +} + +.select2-search input.select2-active { + background: #fff url('../img/select2-spinner.gif') no-repeat 100%; + background: url('../img/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee)); + background: url('../img/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%); + background: url('../img/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%); + background: url('../img/select2-spinner.gif') no-repeat 100%, -o-linear-gradient(bottom, white 85%, #eeeeee 99%); + background: url('../img/select2-spinner.gif') no-repeat 100%, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%); + background: url('../img/select2-spinner.gif') no-repeat 100%, linear-gradient(top, #ffffff 85%, #eeeeee 99%); +} + +.select2-container-active .select2-choice, +.select2-container-active .select2-choices { + border: 1px solid #5897fb; + outline: none; + + -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3); + -moz-box-shadow: 0 0 5px rgba(0,0,0,.3); + box-shadow: 0 0 5px rgba(0,0,0,.3); +} + +.select2-dropdown-open .select2-choice { + border-bottom-color: transparent; + -webkit-box-shadow: 0 1px 0 #fff inset; + -moz-box-shadow: 0 1px 0 #fff inset; + box-shadow: 0 1px 0 #fff inset; + + -webkit-border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; + + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 0; + + background-color: #eee; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee)); + background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%); + background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%); + background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%); + background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 ); + background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%); +} + +.select2-dropdown-open .select2-choice div { + background: transparent; + border-left: none; + filter: none; +} +.select2-dropdown-open .select2-choice div b { + background-position: -18px 1px; +} + +/* results */ +.select2-results { + max-height: 200px; + padding: 0 0 0 4px; + margin: 4px 4px 4px 0; + position: relative; + overflow-x: hidden; + overflow-y: auto; + -webkit-tap-highlight-color: rgba(0,0,0,0); +} + +.select2-results ul.select2-result-sub { + margin: 0; +} + +.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px } +.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px } + +.select2-results li { + list-style: none; + display: list-item; + background-image: none; +} + +.select2-results li.select2-result-with-children > .select2-result-label { + font-weight: bold; +} + +.select2-results .select2-result-label { + padding: 3px 7px 4px; + margin: 0; + cursor: pointer; + + min-height: 1em; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.select2-results .select2-highlighted { + background: #3875d7; + color: #fff; +} + +.select2-results li em { + background: #feffde; + font-style: normal; +} + +.select2-results .select2-highlighted em { + background: transparent; +} + +.select2-results .select2-highlighted ul { + background: white; + color: #000; +} + + +.select2-results .select2-no-results, +.select2-results .select2-searching, +.select2-results .select2-selection-limit { + background: #f4f4f4; + display: list-item; +} + +/* +disabled look for disabled choices in the results dropdown +*/ +.select2-results .select2-disabled.select2-highlighted { + color: #666; + background: #f4f4f4; + display: list-item; + cursor: default; +} +.select2-results .select2-disabled { + background: #f4f4f4; + display: list-item; + cursor: default; +} + +.select2-results .select2-selected { + display: none; +} + +.select2-more-results.select2-active { + background: #f4f4f4 url('../img/select2-spinner.gif') no-repeat 100%; +} + +.select2-more-results { + background: #f4f4f4; + display: list-item; +} + +/* disabled styles */ + +.select2-container.select2-container-disabled .select2-choice { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #ddd; + cursor: default; +} + +.select2-container.select2-container-disabled .select2-choice div { + background-color: #f4f4f4; + background-image: none; + border-left: 0; +} + +.select2-container.select2-container-disabled .select2-choice abbr { + display: none +} + + +/* multiselect */ + +.select2-container-multi .select2-choices { + height: auto !important; + height: 1%; + margin: 0; + padding: 0; + position: relative; + + border: 1px solid #aaa; + cursor: text; + overflow: hidden; + + background-color: #fff; + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff)); + background-image: -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%); + background-image: -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%); + background-image: -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%); + background-image: -ms-linear-gradient(top, #eeeeee 1%, #ffffff 15%); + background-image: linear-gradient(top, #eeeeee 1%, #ffffff 15%); +} + +.select2-locked { + padding: 3px 5px 3px 5px !important; +} + +.select2-container-multi .select2-choices { + min-height: 26px; +} + +.select2-container-multi.select2-container-active .select2-choices { + border: 1px solid #5897fb; + outline: none; + + -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3); + -moz-box-shadow: 0 0 5px rgba(0,0,0,.3); + box-shadow: 0 0 5px rgba(0,0,0,.3); +} +.select2-container-multi .select2-choices li { + float: left; + list-style: none; +} +.select2-container-multi .select2-choices .select2-search-field { + margin: 0; + padding: 0; + white-space: nowrap; +} + +.select2-container-multi .select2-choices .select2-search-field input { + padding: 5px; + margin: 1px 0; + + font-family: sans-serif; + font-size: 100%; + color: #666; + outline: 0; + border: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background: transparent !important; +} + +.select2-container-multi .select2-choices .select2-search-field input.select2-active { + background: #fff url('../img/select2-spinner.gif') no-repeat 100% !important; +} + +.select2-default { + color: #999 !important; +} + +.select2-container-multi .select2-choices .select2-search-choice { + padding: 3px 5px 3px 18px; + margin: 3px 0 3px 5px; + position: relative; + + line-height: 13px; + color: #333; + cursor: default; + border: 1px solid #aaaaaa; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + + -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05); + -moz-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05); + box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05); + + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + background-color: #e4e4e4; + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0 ); + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -ms-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); +} +.select2-container-multi .select2-choices .select2-search-choice span { + cursor: default; +} +.select2-container-multi .select2-choices .select2-search-choice-focus { + background: #d4d4d4; +} + +.select2-search-choice-close { + display: block; + width: 12px; + height: 13px; + position: absolute; + right: 3px; + top: 4px; + + font-size: 1px; + outline: none; + background: url('../img/select2.png') right top no-repeat; +} + +.select2-container-multi .select2-search-choice-close { + left: 3px; +} + +.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { + background-position: right -11px; +} +.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close { + background-position: right -11px; +} + +/* disabled styles */ +.select2-container-multi.select2-container-disabled .select2-choices{ + background-color: #f4f4f4; + background-image: none; + border: 1px solid #ddd; + cursor: default; +} + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { + padding: 3px 5px 3px 5px; + border: 1px solid #ddd; + background-image: none; + background-color: #f4f4f4; +} + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { + display: none; +} +/* end multiselect */ + + +.select2-result-selectable .select2-match, +.select2-result-unselectable .select2-match { + text-decoration: underline; +} + +.select2-offscreen { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} + +/* Retina-ize icons */ + +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { + .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b { + background-image: url('../img/select2x2.png') !important; + background-repeat: no-repeat !important; + background-size: 60px 40px !important; + } + .select2-search input { + background-position: 100% -21px !important; + } +} diff --git a/cat-home/src/main/webapp/jsp/system/aggregation.jsp b/cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp similarity index 97% rename from cat-home/src/main/webapp/jsp/system/aggregation.jsp rename to cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp index 9a23c34aebf1780342837e10a3a8791f46760f78..2108918759510b7c9b385c93c3be04b00790441a 100644 --- a/cat-home/src/main/webapp/jsp/system/aggregation.jsp +++ b/cat-home/src/main/webapp/jsp/system/aggregation/aggregation.jsp @@ -20,7 +20,7 @@
- <%@include file="./configTree.jsp"%> + <%@include file="../configTree.jsp"%>
diff --git a/cat-home/src/main/webapp/jsp/system/aggregationUpdate.jsp b/cat-home/src/main/webapp/jsp/system/aggregation/aggregationUpdate.jsp similarity index 98% rename from cat-home/src/main/webapp/jsp/system/aggregationUpdate.jsp rename to cat-home/src/main/webapp/jsp/system/aggregation/aggregationUpdate.jsp index cc0f4dfca5357def523a10b944d60c487744a80d..70e5bf4c04577d7fa23e199f4d8172b6ff839ae9 100644 --- a/cat-home/src/main/webapp/jsp/system/aggregationUpdate.jsp +++ b/cat-home/src/main/webapp/jsp/system/aggregation/aggregationUpdate.jsp @@ -12,7 +12,7 @@
- <%@include file="./configTree.jsp"%> + <%@include file="../configTree.jsp"%>

diff --git a/cat-home/src/main/webapp/jsp/system/alarm.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarm.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarm.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarm.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmExceptionRules.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmExceptionRules.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmExceptionRules.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmExceptionRules.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmOpState.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmOpState.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmOpState.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmOpState.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmRecordDetail.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmRecordDetail.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmRecordDetail.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmRecordDetail.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmRecordList.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmRecordList.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmRecordList.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmRecordList.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmRuleAdd.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmRuleAdd.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmRuleAdd.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmRuleAdd.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmRuleUpdate.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmRuleUpdate.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmRuleUpdate.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmRuleUpdate.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmServiceRules.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmServiceRules.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmServiceRules.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmServiceRules.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmTemplateAdd.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateAdd.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmTemplateAdd.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateAdd.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmTemplateList.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateList.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmTemplateList.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateList.jsp diff --git a/cat-home/src/main/webapp/jsp/system/alarmTemplateUpdate.jsp b/cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateUpdate.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/alarmTemplateUpdate.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateUpdate.jsp diff --git a/cat-home/src/main/webapp/jsp/system/scheduledReportAdd.jsp b/cat-home/src/main/webapp/jsp/system/alarm/scheduledReportAdd.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/scheduledReportAdd.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/scheduledReportAdd.jsp diff --git a/cat-home/src/main/webapp/jsp/system/scheduledReportUpdate.jsp b/cat-home/src/main/webapp/jsp/system/alarm/scheduledReportUpdate.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/scheduledReportUpdate.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/scheduledReportUpdate.jsp diff --git a/cat-home/src/main/webapp/jsp/system/scheduledReports.jsp b/cat-home/src/main/webapp/jsp/system/alarm/scheduledReports.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/scheduledReports.jsp rename to cat-home/src/main/webapp/jsp/system/alarm/scheduledReports.jsp diff --git a/cat-home/src/main/webapp/jsp/system/config.jsp b/cat-home/src/main/webapp/jsp/system/config.jsp deleted file mode 100644 index d4b26d9ed7603986eb3f116ebfacd489ba8cee54..0000000000000000000000000000000000000000 --- a/cat-home/src/main/webapp/jsp/system/config.jsp +++ /dev/null @@ -1,5 +0,0 @@ -<%@ page contentType="text/html; charset=utf-8" %> - - - -View of config page under system \ No newline at end of file diff --git a/cat-home/src/main/webapp/jsp/system/project.jsp b/cat-home/src/main/webapp/jsp/system/project/project.jsp similarity index 97% rename from cat-home/src/main/webapp/jsp/system/project.jsp rename to cat-home/src/main/webapp/jsp/system/project/project.jsp index 4ae0296ad1e1e69f39babd5bb98697cdd8a2b676..313c91d1859bf8271833d6fa9f162fd89e9bfeb5 100644 --- a/cat-home/src/main/webapp/jsp/system/project.jsp +++ b/cat-home/src/main/webapp/jsp/system/project/project.jsp @@ -24,7 +24,7 @@
- <%@include file="./configTree.jsp"%> + <%@include file="../configTree.jsp"%>

diff --git a/cat-home/src/main/webapp/jsp/system/projectUpdate.jsp b/cat-home/src/main/webapp/jsp/system/project/projectUpdate.jsp similarity index 97% rename from cat-home/src/main/webapp/jsp/system/projectUpdate.jsp rename to cat-home/src/main/webapp/jsp/system/project/projectUpdate.jsp index 9424de147e16bf020cb48137afb7a0e5948f6f5c..4b0153dce222b4208dce7e1e4fa3e46366985744 100644 --- a/cat-home/src/main/webapp/jsp/system/projectUpdate.jsp +++ b/cat-home/src/main/webapp/jsp/system/project/projectUpdate.jsp @@ -20,7 +20,7 @@
- <%@include file="./configTree.jsp"%> + <%@include file="../configTree.jsp"%>

diff --git a/cat-home/src/main/webapp/jsp/system/topologyGraphEdgeConfigAdd.jsp b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigAdd.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/topologyGraphEdgeConfigAdd.jsp rename to cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigAdd.jsp diff --git a/cat-home/src/main/webapp/jsp/system/topologyGraphEdgeConfigs.jsp b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp similarity index 98% rename from cat-home/src/main/webapp/jsp/system/topologyGraphEdgeConfigs.jsp rename to cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp index adbb56c92e1f05cadf036b9b1df4d40847dc396a..4e11eeedf33c790518761e91efc53dba6e1ed4d1 100644 --- a/cat-home/src/main/webapp/jsp/system/topologyGraphEdgeConfigs.jsp +++ b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphEdgeConfigs.jsp @@ -66,13 +66,13 @@
- <%@include file="./configTree.jsp"%> + <%@include file="../configTree.jsp"%>
-
 
+

 

拓扑图依赖关系配置信息
diff --git a/cat-home/src/main/webapp/jsp/system/topologyGraphNodeConfigAdd.jsp b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigAdd.jsp similarity index 89% rename from cat-home/src/main/webapp/jsp/system/topologyGraphNodeConfigAdd.jsp rename to cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigAdd.jsp index 5827ccc017043f30d760fa7efc50cbf6f6192e4e..a6e8913b24f0e39b9fb16046b99af65200edc9b3 100644 --- a/cat-home/src/main/webapp/jsp/system/topologyGraphNodeConfigAdd.jsp +++ b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigAdd.jsp @@ -7,6 +7,8 @@ + +

 

修改拓扑节点配置信息

@@ -22,7 +24,11 @@ - + diff --git a/cat-home/src/main/webapp/jsp/system/topologyGraphNodeConfigs.jsp b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp similarity index 95% rename from cat-home/src/main/webapp/jsp/system/topologyGraphNodeConfigs.jsp rename to cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp index 67ac04c294d270fbfec68946b1968632d8f42eda..2e5f0c4750a9287628935dcd7d4acb2c2c5d6c2a 100644 --- a/cat-home/src/main/webapp/jsp/system/topologyGraphNodeConfigs.jsp +++ b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphNodeConfigs.jsp @@ -12,6 +12,8 @@ + +
- <%@include file="./configTree.jsp"%> + <%@include file="../configTree.jsp"%>
@@ -107,7 +110,7 @@ 修改 - + ${temp.id} ${temp.warningThreshold} diff --git a/cat-home/src/main/webapp/jsp/system/topologyGraphOpState.jsp b/cat-home/src/main/webapp/jsp/system/topology/topologyGraphOpState.jsp similarity index 100% rename from cat-home/src/main/webapp/jsp/system/topologyGraphOpState.jsp rename to cat-home/src/main/webapp/jsp/system/topology/topologyGraphOpState.jsp diff --git a/cat-home/src/test/resources/com/dianping/cat/report/page/dependency/topology-graph-config.xml b/cat-home/src/test/resources/com/dianping/cat/report/page/dependency/topology-graph-config.xml index b8b9ff8f93c0fc81ba7e0a1651b0406c76b37cc9..381679a5cfd7771eadb3e3e49798bbf5bdaec3c5 100644 --- a/cat-home/src/test/resources/com/dianping/cat/report/page/dependency/topology-graph-config.xml +++ b/cat-home/src/test/resources/com/dianping/cat/report/page/dependency/topology-graph-config.xml @@ -8,5 +8,10 @@ + + + + +