FELIX-2234 : Reduce status information from bundle plugin
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1440501 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 056880a..786c373 100644
--- a/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
+++ b/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
@@ -105,11 +105,11 @@
bundles.pluginTitle=Bundles
bundles.statline.prefix=Bundle information:
bundles.statline.all=all {0} bundles active
-bundles.statline.partA={0} bundles in total
-bundles.statline.partB={0} bundles active
-bundles.statline.partC={0} active fragments
-bundles.statline.partD={0} bundles resolved
-bundles.statline.partE={0} bundles installed
+bundles.statline.total={0} bundles in total
+bundles.statline.active={0} bundles active
+bundles.statline.fragments={0} active fragments
+bundles.statline.resolved={0} bundles resolved
+bundles.statline.installed={0} bundles installed
bundles.install_or_update=Install or Update
bundles.install_update=Install/Update...
bundles.refreshPkg=Refresh Packages
diff --git a/webconsole/src/main/resources/res/ui/bundles.js b/webconsole/src/main/resources/res/ui/bundles.js
index 229f28d..1a671e4 100644
--- a/webconsole/src/main/resources/res/ui/bundles.js
+++ b/webconsole/src/main/resources/res/ui/bundles.js
@@ -25,21 +25,21 @@
function renderData( eventData, filter ) {
lastBundleData = eventData;
var s = eventData.s;
- var statline = i18n.statlinePrefix + ' ' + i18n.statlinePartA.msgFormat(s[0]);
+ var statline = i18n.statlinePrefix + ' ' + i18n.statlineTotal.msgFormat(s[0]);
if ( s[0] == s[1] || s[0] == s[1] + s[2]) {
statline += ' - ' + i18n.statlineAll.msgFormat(s[0]);
} else {
if ( s[1] > 0 ) {
- statline += ', ' + i18n.statlinePartB.msgFormat(s[1]);
+ statline += ', ' + i18n.statlineActive.msgFormat(s[1]);
}
if ( s[2] > 0 ) {
- statline += ', ' + i18n.statlinePartC.msgFormat(s[2]);
+ statline += ', ' + i18n.statlineFragments.msgFormat(s[2]);
}
if ( s[3] > 0 ) {
- statline += ', ' + i18n.statlinePartD.msgFormat(s[3]);
+ statline += ', ' + i18n.statlineResolved.msgFormat(s[3]);
}
if ( s[4] > 0 ) {
- statline += ', ' + i18n.statlinePartE.msgFormat(s[4]);
+ statline += ', ' + i18n.statlineInstalled.msgFormat(s[4]);
}
}
$('.statline').html(statline);
diff --git a/webconsole/src/main/resources/templates/bundles.html b/webconsole/src/main/resources/templates/bundles.html
index 119473a..e9d6a82 100644
--- a/webconsole/src/main/resources/templates/bundles.html
+++ b/webconsole/src/main/resources/templates/bundles.html
@@ -33,11 +33,11 @@
//
statlinePrefix : '${bundles.statline.prefix}',
statlineAll : '${bundles.statline.all}',
- statlinePartA : '${bundles.statline.partA}',
- statlinePartB : '${bundles.statline.partB}',
- statlinePartC : '${bundles.statline.partC}',
- statlinePartD : '${bundles.statline.partD}',
- statlinePartE : '${bundles.statline.partE}',
+ statlineTotal : '${bundles.statline.partTotal}',
+ statlineActive : '${bundles.statline.partActive}',
+ statlineFragments : '${bundles.statline.partFragments}',
+ statlineResolved : '${bundles.statline.partResolved}',
+ statlineInstalled : '${bundles.statline.partInstalled}',
install_update : '${bundles.install_or_update}',
state : {
1 : '${bundles.state.1}', // uninstalled