| commit | ab926c93bd2ecfe501c4b7b4639dfb9d75ccc5de | [log] [tgz] |
|---|---|---|
| author | Felix Meschberger <fmeschbe@apache.org> | Thu Jul 07 06:21:46 2011 +0000 |
| committer | Felix Meschberger <fmeschbe@apache.org> | Thu Jul 07 06:21:46 2011 +0000 |
| tree | 3dea73095b960ef8edc11bf48e6e9133a634a1fa | |
| parent | c3c1cdcf84796943c0063d9f9b493de0ca85c1af [diff] |
FERLIX-3022 Add uptime information in addition to the start time. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1143664 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties b/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties index f28be89..4eb754e 100644 --- a/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties +++ b/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
@@ -57,6 +57,8 @@ vmstat.sl.bundle=Default Bundle Start Level vmstat.info.title=Server Information: vmstat.lastStarted=Last Started +vmstat.upTime=Uptime +vmstat.upTime.format.days=days vmstat.framework=Framework vmstat.shutdown.in=Shutdown in vmstat.java.title=Java Information:
diff --git a/webconsole/src/main/resources/res/ui/vmstat.js b/webconsole/src/main/resources/res/ui/vmstat.js index 684b68a..5ad9961 100644 --- a/webconsole/src/main/resources/res/ui/vmstat.js +++ b/webconsole/src/main/resources/res/ui/vmstat.js
@@ -34,7 +34,6 @@ target.text(statData[i]); } } - $('#lastStarted').text(localTm(statData.lastStarted)); var st = statData.shutdownTimer; $('#shutdownform').css('display', st ? 'none' : 'block'); $('#shutdownform2').css('display', st ? 'block' : 'none');
diff --git a/webconsole/src/main/resources/templates/vmstat.html b/webconsole/src/main/resources/templates/vmstat.html index 0f8f984..0c2ad55 100644 --- a/webconsole/src/main/resources/templates/vmstat.html +++ b/webconsole/src/main/resources/templates/vmstat.html
@@ -49,6 +49,10 @@ <td id="lastStarted">---</td> </tr> <tr> + <td>${vmstat.upTime}</td> + <td id="upTime">---</td> + </tr> + <tr> <td>${vmstat.framework}</td> <td> <form id="shutdownform" method="post" action="${pluginRoot}">