svn commit: r1309343 - in /felix/trunk/webconsole-plugins/upnp/src/main/resources: OSGI-INF/l10n/bundle.properties OSGI-INF/l10n/bundle_bg.properties res/upnp.html res/upnp.js

[vvalchev]

Author: vvalchev
Date: Wed Apr  4 11:52:14 2012
New Revision: 1309343

URL: http://svn.apache.org/viewvc?rev=1309343&view=rev
Log:
Fixed FELIX-3431 UPnP plugin should provide a better status line
https://issues.apache.org/jira/browse/FELIX-3431

Modified:
    
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle.properties
    
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
    felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.html
    felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.js

Modified: 
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle.properties
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle.properties?rev=1309343&r1=1309342&r2=1309343&view=diff
==============================================================================
--- 
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle.properties
 (original)
+++ 
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle.properties
 Wed Apr  4 11:52:14 2012
@@ -28,7 +28,9 @@
 # native2ascii -encoding utf-8 bundle_bg.raw_properties bundle_bg.properties
 pluginTitle=UPnP
 
-status.ok=UPnP Service Available.
+status.ok=Look below for a list of UPnP devices.
+status.devs=There are {0} main devices/services available.
+status.none=No UPnP Devices found!
 btn.search=Search for UPnP Devices
 btn.reloadVars=Reload State Variables
 tree.searching=Searching for UPnP Devices ...

Modified: 
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties?rev=1309343&r1=1309342&r2=1309343&view=diff
==============================================================================
--- 
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
 (original)
+++ 
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
 Wed Apr  4 11:52:14 2012
@@ -28,7 +28,9 @@
 # native2ascii -encoding utf-8 bundle_bg.raw_properties bundle_bg.properties
 pluginTitle=У-ва UPnP
 
-status.ok=UPnP работи. Вижте по-долу за наличните 
устройсва.
+status.ok=Вижте по-долу за наличните 
устройства.
+status.devs=Открити са {0} главни 
устройства/услуги.
+status.none=Няма открити UPnP устройства!
 btn.search=Търсене на устройства
 btn.reloadVars=Презареждане на променливите
 tree.searching=Търсене на устройства...

Modified: felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.html
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.html?rev=1309343&r1=1309342&r2=1309343&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.html 
(original)
+++ felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.html Wed 
Apr  4 11:52:14 2012
@@ -9,7 +9,9 @@ var i18n = {
        args_type    : '${args.type}',
        args_value   : '${args.value}',
        no_actions   : '${no.actions}',
-       no_params_out: '${no.params.out}'
+       no_params_out: '${no.params.out}',
+       status_devs  : '${status.devs}',
+       status_none  : '${status.none}'
 }
 // ]]>
 </script>

Modified: felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.js
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.js?rev=1309343&r1=1309342&r2=1309343&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.js 
(original)
+++ felix/trunk/webconsole-plugins/upnp/src/main/resources/res/upnp.js Wed Apr  
4 11:52:14 2012
@@ -273,8 +273,10 @@ function listDevices() {
                                var html = addDevice(this);
                                browser.treeview( { add: html.appendTo(browser) 
} );
                        });
+                       
$('.statline').text(i18n.status_devs.msgFormat(data.devices.length));
                } else {
-                       browser.append('','No devices available', '');
+                       $('.statline').text(i18n.status_none);
+                       browser.append('', i18n.status_none, '');
                }
 
                // update selected items