Updating features archetype to talk about user-facing features.

[controller.git] / opendaylight / web / devices / src / main / resources / js / page.js

diff --git a/opendaylight/web/devices/src/main/resources/js/page.js b/opendaylight/web/devices/src/main/resources/js/page.js
index cc142bf9672f136686a952e88c5c99395f6c2d8e..935354e304b204fb31ba1947424ef7912c3c6c02 100644 (file)
--- a/opendaylight/web/devices/src/main/resources/js/page.js
+++ b/opendaylight/web/devices/src/main/resources/js/page.js
@@ -37,11 +37,11 @@ one.f.dashlet = {
 one.f.menu = {
   left : {
     top : [
-      one.f.dashlet.nodesLearnt,
-      one.f.dashlet.connection
+      one.f.dashlet.nodesLearnt
       ],
     bottom : [
-      one.f.dashlet.staticRouteConfig
+      one.f.dashlet.staticRouteConfig,
+      one.f.dashlet.connection
       ]
   },
   right : {
@@ -127,6 +127,7 @@ one.f.switchmanager.nodesLearnt = {
     }
   },
   modal : {
+    registry : { callback:undefined },
     initialize: {
       updateNode: function(evt) {
         one.f.switchmanager.nodesLearnt.ajax.main(one.f.switchmanager.rootUrl + "/tiers", function(tiers) {
@@ -151,7 +152,13 @@ one.f.switchmanager.nodesLearnt = {
 
           // inject body (nodePorts)
           one.lib.modal.inject.body($modal, $body);
-          $modal.modal();
+
+          $modal.modal().on("shown",function() {
+              var callback = one.f.switchmanager.nodesLearnt.modal.registry.callback;
+              if( callback !== undefined && $.isFunction(callback)) {
+                 callback();
+              }
+          });
         });
       },
       popout: function() {
@@ -1361,7 +1368,7 @@ one.f.switchmanager.spanPortConfig = {
 
       $fieldset.append($label).append($select);
       // input port
-      var $label = one.lib.form.label("Input Port");
+      var $label = one.lib.form.label("Port");
       var $select = one.lib.form.select.create();
       one.lib.form.select.prepend($select, {'':'None'});
       $select.attr('id', one.f.switchmanager.spanPortConfig.id.modal.form.port);