diff --git a/src/main/resources/support/http/resources/activeConnectionStackTrace.html b/src/main/resources/support/http/resources/activeConnectionStackTrace.html
index bf754a60a8..a4d73a037d 100644
--- a/src/main/resources/support/http/resources/activeConnectionStackTrace.html
+++ b/src/main/resources/support/http/resources/activeConnectionStackTrace.html
@@ -34,7 +34,7 @@ druid.activeConnectionStackTrace = function () {
url: 'activeConnectionStackTrace-' + datasourceId + '.json',
success: function(data) {
var conntionStackTraceList = data.Content;
- if (conntionStackTraceList == null)
+ /* if (conntionStackTraceList == null)
return;
var activeConnectionStackTraceTable = document.getElementById("activeConnectionStackTraceTable");
@@ -45,7 +45,7 @@ druid.activeConnectionStackTrace = function () {
var conntionStackTrace = conntionStackTraceList[i];
var newRow = activeConnectionStackTraceTable.insertRow(-1);
newRow.insertCell(-1).innerHTML = conntionStackTrace;
- }
+ } */
},
dataType: "json"
});
diff --git a/src/main/resources/support/http/resources/connectionInfo.html b/src/main/resources/support/http/resources/connectionInfo.html
index de6d49091f..5e63cd0b20 100644
--- a/src/main/resources/support/http/resources/connectionInfo.html
+++ b/src/main/resources/support/http/resources/connectionInfo.html
@@ -15,26 +15,26 @@
Pooling Connection Info List for Datasource-
-
+
- | ID |
- Use Count |
- Last ActiveTime |
- ConnectTime |
- Holdability |
- Transaction Isolation |
- AutoCommit |
- ReadoOnly |
-
+ | ID |
+ UseCount |
+ LastActiveTime |
+ ConnectTime |
+ Holdability |
+ TranIsolation |
+ AutoCommit |
+ ReadoOnly |
+
Pscache
-
-
- | sql |
- default Row Pretch |
- row Prefetch |
- hit Count |
-
+
+
+ | sql |
+ defaultRowPretch |
+ rowPrefetch |
+ hitCount |
+
diff --git a/src/main/resources/support/http/resources/css/style.css b/src/main/resources/support/http/resources/css/style.css
index 9c7d25bf21..b5280cb7f6 100644
--- a/src/main/resources/support/http/resources/css/style.css
+++ b/src/main/resources/support/http/resources/css/style.css
@@ -4,40 +4,14 @@ body{
padding-top: 60px;
padding-bottom: 40px;
}
-table .header {
- cursor: pointer;
+#dataTable th > a {
+ color: #555555;
}
-table .header:after {
- border-color: #000000 transparent;
- border-style: solid;
- border-width: 0 4px 4px;
- content: "";
- float: right;
- margin-top: 7px;
- visibility: hidden;
-}
-table .headerSortUp, table .headerSortDown {
- background-color: rgba(141, 192, 219, 0.25);
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-}
-table .headerSortDown:after, table .headerSortDown:hover:after {
- opacity: 0.6;
- visibility: visible;
-}
-table .headerSortUp:after {
- border-color: #000000 transparent -moz-use-text-color;
- border-style: solid solid none;
- border-width: 4px 4px medium;
- box-shadow: none;
- opacity: 0.6;
- visibility: visible;
-}
-table .yellow {
+#dataTable th {
+ background-color: #E5E5E5;
border-bottom-color: #FFC40D;
- color: #FFC40D;
-}
-table .yellow {
- background-color: #FFF6D9;
+ color: #555555;
+ cursor: pointer;
}
.footer {
diff --git a/src/main/resources/support/http/resources/js/common.js b/src/main/resources/support/http/resources/js/common.js
index 5c417fb68b..67141d45a7 100644
--- a/src/main/resources/support/http/resources/js/common.js
+++ b/src/main/resources/support/http/resources/js/common.js
@@ -22,7 +22,7 @@ druid.common = function () {
' '+
' - Index
'+
' - DataSource
'+
- ' - Sql
'+
+ ' - SQL
'+
' - WebURI
'+
' - Web Session
'+
' - Spring
'+
@@ -84,35 +84,28 @@ druid.common = function () {
resetSortMark : function() {
var divObj = document.getElementById('th-' + statViewOrderBy);
var old_divObj = document.getElementById('th-' + statViewOrderBy_old);
+ var replaceToStr = '';
if (old_divObj) {
var html = old_divObj.innerHTML;
- if (statViewOrderBy_old.indexOf('[') > 0) {
- html = html.replace('↑', '-');
- html = html.replace('↓', '-');
- old_divObj.innerHTML = html
- } else {
- $(old_divObj).parent().removeClass("headerSortDown").removeClass("headerSortUp")
+ if (statViewOrderBy_old.indexOf('[') > 0)
+ replaceToStr = '-';
+ html = html.replace('▲', replaceToStr);
+ html = html.replace('▼', replaceToStr);
+ old_divObj.innerHTML = html
+ }
+ if (divObj) {
+ var html = divObj.innerHTML;
+ if (statViewOrderBy.indexOf('[') > 0)
+ html = '';
+
+ if (statViewOrderType == 'asc') {
+ html += '▲';
+ } else if (statViewOrderType == 'desc') {
+ html += '▼';
}
+ divObj.innerHTML = html;
}
- if (divObj) {
- console.info(divObj)
- if (statViewOrderBy.indexOf('[') > 0) {
- html = '';
- if (statViewOrderType == 'asc') {
- html += '↑';
- } else if (statViewOrderType == 'desc') {
- html += '↓';
- }
- divObj.innerHTML = html;
- } else {
- if (statViewOrderType == 'asc') {
- $(divObj).parent().addClass("headerSortDown")
- } else if (statViewOrderType == 'desc') {
- $(divObj).parent().addClass("headerSortUp")
- }
- }
- }
this.ajaxRequestForBasicInfo();
},
diff --git a/src/main/resources/support/http/resources/spring.html b/src/main/resources/support/http/resources/spring.html
index 203ec74e34..3f5b543363 100644
--- a/src/main/resources/support/http/resources/spring.html
+++ b/src/main/resources/support/http/resources/spring.html
@@ -18,19 +18,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+ | N |
+ Class |
+ Method |
+ ExecCount |
+ ExecTime |
+ RunningCount |
+ Concurrent |
+ JdbcCount |
+ JdbcTime |
+ JdbcCommit |
+ JdbcRollback |
+ JdbcFetchRow |
+ JdbcUpdate |
@@ -43,6 +43,9 @@
druid.spring = function () {
return {
init : function() {
+ $("#dataTable th a").click(function(obj) {
+ druid.common.setOrderBy(obj.target.id.substring(3))
+ })
druid.common.buildHead(5);
druid.common.ajaxuri = 'spring.json?';
druid.common.handleAjaxResult = druid.spring.handleAjaxResult;
diff --git a/src/main/resources/support/http/resources/sql.html b/src/main/resources/support/http/resources/sql.html
index dd93d76e62..f629cc3e7c 100644
--- a/src/main/resources/support/http/resources/sql.html
+++ b/src/main/resources/support/http/resources/sql.html
@@ -18,52 +18,52 @@
-
-
-
-
-
-
-
-
-
-
-
- | N |
+ SQL |
+ ExecCount |
+ ExecTotal |
+ ExecMax |
+ InTxnCount |
+ ErrorCount |
+ EffectedRowCount |
+ FetchCount |
+ RunningCount |
+ Concurrent |
+ ExecHistogram [
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ - ]
|
- ExecAndRsHold [
- -
- -
- -
- -
- -
- -
- -
- - ]
+ | ExecAndRsHold [
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ - ]
|
- FetchRow [
+ -
+ -
+ -
+ -
+ -
+ - ]
|
- UpdateCount [
+ -
+ -
+ -
+ -
+ -
+ - ]
|
@@ -77,6 +77,9 @@
druid.sql = function () {
return {
init : function() {
+ $("#dataTable th a").click(function(obj) {
+ druid.common.setOrderBy(obj.target.id.substring(3))
+ })
druid.common.buildHead(2);
druid.common.ajaxuri = 'sql.json?';
druid.common.handleAjaxResult = druid.sql.handleAjaxResult;
diff --git a/src/main/resources/support/http/resources/websession.html b/src/main/resources/support/http/resources/websession.html
index 56a6149858..029b914979 100644
--- a/src/main/resources/support/http/resources/websession.html
+++ b/src/main/resources/support/http/resources/websession.html
@@ -15,25 +15,25 @@
Web Session Stat
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ | N |
+ SESSIONID |
+ Principal |
+ CreateTime |
+ LastAccess |
+ RemoteAddress |
+ RequestCount |
+ RequestTime |
+ RunningCount |
+ Concurrent |
+ JdbcCount |
+ JdbcTime |
+ JdbcCommit |
+ JdbcRollback |
+ JdbcFetchRow |
+ JdbcUpdate |
@@ -46,6 +46,9 @@
druid.websession = function () {
return {
init : function() {
+ $("#dataTable th a").click(function(obj) {
+ druid.common.setOrderBy(obj.target.id.substring(3))
+ })
druid.common.buildHead(4);
druid.common.ajaxuri = 'websession.json?';
druid.common.handleAjaxResult = druid.websession.handleAjaxResult;
diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html
index 93f33cac02..394ac5e4d3 100644
--- a/src/main/resources/support/http/resources/weburi.html
+++ b/src/main/resources/support/http/resources/weburi.html
@@ -15,21 +15,21 @@
Web URI Stat
- |