From 184860b88f7c66c9be5dbcc2edab748b47d5b382 Mon Sep 17 00:00:00 2001 From: melin Date: Sat, 25 Aug 2012 23:33:36 +0800 Subject: [PATCH] update table style --- .../resources/activeConnectionStackTrace.html | 4 +- .../http/resources/connectionInfo.html | 34 +++---- .../support/http/resources/css/style.css | 38 ++------ .../support/http/resources/js/common.js | 43 ++++----- .../support/http/resources/spring.html | 29 +++--- .../resources/support/http/resources/sql.html | 89 ++++++++++--------- .../support/http/resources/websession.html | 37 ++++---- .../support/http/resources/weburi.html | 29 +++--- 8 files changed, 141 insertions(+), 162 deletions(-) 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-

- +
- - - - - - - - - + + + + + + + + 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 () { '
IDUse CountLast ActiveTimeConnectTimeHoldabilityTransaction IsolationAutoCommitReadoOnly + IDUseCountLastActiveTimeConnectTimeHoldabilityTranIsolationAutoCommitReadoOnly Pscache
- - - - - - - +
sqldefault Row Pretchrow Prefetchhit Count
+ + + + + +
sqldefaultRowPretchrowPrefetchhitCount
- - - - - - - - - - - - - + + + + + + + + + + + + + @@ -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--ClassMethodExec CountExec TimeRunning CountConcurrent MaxJdbc Exec CountJdbc Exec TimeJdbc CommitJdbc RollbackJdbc FetchRowJdbc UpdateNClassMethodExecCountExecTimeRunningCountConcurrentJdbcCountJdbcTimeJdbcCommitJdbcRollbackJdbcFetchRowJdbcUpdate
- - - - - - - - - - - - + + + + + + + + + + + - - - @@ -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--SQLExecute CountExecute Millis TotalExecute Millis MaxInTxn CountError CountEffected Row CountFetch Row CountRunning CountConcurrent MaxExecHistogram
[ - - - - - - - - - - - - - - - - ] + 		NSQLExecCountExecTotalExecMaxInTxnCountErrorCountEffectedRowCountFetchCountRunningCountConcurrentExecHistogram
[ + - + - + - + - + - + - + - + - ] 		ExecAndRsHold
[ - - - - - - - - - - - - - - - - ] + 		ExecAndRsHold
[ + - + - + - + - + - + - + - + - ] 		FetchRow
[ - - - - - - - - - - - - ] + 		FetchRow
[ + - + - + - + - + - + - ] 		UpdateCount
[ - - - - - - - - - - - - ] + 		UpdateCount
[ + - + - + - + - + - + - ]
+
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -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

-
N--SESSIONIDPrincipalCreate TimeLast AccessRemoteAddressRequest CountRequestTimeRunning CountConcurrent MaxJdbc Exec CountJdbc Exec TimeJdbc CommitJdbc RollbackJdbc FetchRowJdbc UpdateNSESSIONID PrincipalCreateTimeLastAccessRemoteAddressRequestCountRequestTimeRunningCountConcurrentJdbcCountJdbcTimeJdbcCommitJdbcRollbackJdbcFetchRowJdbcUpdate
+
- - - - - - - - - - - - + + + + + + + + + + + + @@ -42,6 +42,9 @@ druid.weburi = function () { return { init : function() { + $("#dataTable th a").click(function(obj) { + druid.common.setOrderBy(obj.target.id.substring(3)) + }) druid.common.buildHead(3); druid.common.ajaxuri = 'weburi.json?'; druid.common.handleAjaxResult = druid.weburi.handleAjaxResult;
N--URIRequest CountRequest TimeRunning CountConcurrent MaxJdbc Exec CountJdbc Exec TimeJdbc CommitJdbc RollbackJdbc FetchRowJdbc UpdateNURIRequestCountRequestTimeRunningCountConcurrentJdbcCount JdbcTimeJdbcCommitJdbcRollbackJdbcFetchRowJdbcUpdate