commit 3f89cb43d78e80b0125e7c6cfc03cc65483d29a2
author Simon Hunt <simon@opennetworking.org> Thu Aug 10 13:32:00 2017 -0700
committer Simon Hunt <simon@opennetworking.org> Thu Aug 10 13:32:20 2017 -0700
tree 3b6d4d81f726edc9528562382db3c0b375f01e69
parent 69ec87142cfa7f25f19c6d5ceeb9539358efe49b

ONOS-6730: Topo Lion
- added show / hide action verbs
- localize some flash messages
- localize "no devices connected"

Change-Id: I84ed1dbc18b7389a4448fd685dc217ccbca6f60a

web/gui/src/main/webapp/app/view/topo/topo.js

diff --git a/web/gui/src/main/webapp/app/view/topo/topo.js b/web/gui/src/main/webapp/app/view/topo/topo.js
index 6c5c8aa..07b29c7 100644
--- a/web/gui/src/main/webapp/app/view/topo/topo.js
+++ b/web/gui/src/main/webapp/app/view/topo/topo.js
@@ -193,14 +193,14 @@
 
     function _togSvgLayer(x, G, tag, what) {
         var on = (x === 'keyev') ? !sus.visible(G) : !!x,
-            verb = on ? 'Show' : 'Hide';
+            verb = on ? topoLion('show') : topoLion('hide');
         sus.visible(G, on);
         updatePrefsState(tag, on);
         flash.flash(verb + ' ' + what);
     }
 
     function toggleMap(x) {
-        _togSvgLayer(x, mapG, 'bg', 'background map');
+        _togSvgLayer(x, mapG, 'bg', topoLion('fl_background_map'));
     }
 
     function openMapSelection() {
@@ -208,17 +208,17 @@
     }
 
     function toggleSprites(x) {
-        _togSvgLayer(x, spriteG, 'spr', 'sprite layer');
+        _togSvgLayer(x, spriteG, 'spr', topoLion('fl_sprite_layer'));
     }
 
     function resetZoom() {
         zoomer.reset();
-        flash.flash('Pan and zoom reset');
+        flash.flash(topoLion('fl_pan_zoom_reset'));
     }
 
     function equalizeMasters() {
         wss.sendEvent('equalizeMasters');
-        flash.flash('Equalizing master roles');
+        flash.flash(topoLion('fl_eq_masters'));
     }
 
     function handleEscape() {
@@ -337,7 +337,7 @@
 
         g = noDevsLayer.append('g');
         gs.addGlyph(g, 'bird', 100).attr('class', 'noDevsBird');
-        g.append('text').text('No devices are connected')
+        g.append('text').text(topoLion('no_devices_are_connected'))
             .attr({ x: 120, y: 80 });
 
         box = g.node().getBBox();
@@ -348,6 +348,11 @@
         showNoDevs(true);
     }
 
+    function lionNoDevs() {
+        d3.select('#topo-noDevsLayer g text')
+            .text(topoLion('no_devices_are_connected'));
+    }
+
     function showNoDevs(b) {
         sus.visible(noDevsLayer, b);
     }
@@ -710,6 +715,10 @@
                     topoLion = $scope.lion;
                     $log.debug('Loaded Topo LION Bundle:', topoLion);
 
+                    // insert localized text into already established
+                    // DOM elements...
+                    lionNoDevs();
+
                     // now we have the map projection, we are ready for
                     //  the server to send us device/host data...
                     tes.start();