Merge "Bug fix for ForwardingRulesManager: addFlow and addFlowAsync are reversed."

[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 d21f8d83a79d2d9ec52ca365289dc8d442b5bc6d..96b16bf92cc2da50be0c06da2ac3e946edca8b7d 100644 (file)
--- a/opendaylight/web/devices/src/main/resources/js/page.js
+++ b/opendaylight/web/devices/src/main/resources/js/page.js
@@ -18,7 +18,7 @@ one.f.dashlet = {
        },
     staticRouteConfig : {
         id : 'staticRouteConfig',
-        name : 'Static route Configuration'
+        name : 'Static Route Configuration'
     },
     subnetGatewayConfig : {
         id : 'subnetGatewayConfig',
@@ -62,7 +62,7 @@ one.f.switchmanager = {
                return $table;
        },
        validateName: function(name) {
-               return name.match(/^[a-zA-Z0-9][a-zA-Z0-9_\-\.]{1,31}$/g) == null ? false : true;
+        return (name.length < 256);
        }
 };
 
@@ -77,6 +77,7 @@ one.f.switchmanager.nodesLearnt = {
                        form: {
                                nodeId: "one_f_switchmanager_nodesLearnt_id_modal_form_nodeid",
                                nodeName : "one_f_switchmanager_nodesLearnt_id_modal_form_nodename",
+                               portStatus : "one_f_switchmanager_nodesLearnt_id_modal_form_portstatus",
                                tier: "one_f_switchmanager_nodesLearnt_id_modal_form_tier",
                                operationMode: "one_f_switchmanager_nodesLearnt_id_modal_form_opmode"
                        }
@@ -93,7 +94,6 @@ one.f.switchmanager.nodesLearnt = {
                        $dashlet.append($table);
                });
        },
-
        ajax : {
                main : function(url, callback) {
                        $.getJSON(url, function(data) {
@@ -105,7 +105,7 @@ one.f.switchmanager.nodesLearnt = {
                initialize: {
                        updateNode: function(evt) {
                                var nodeId = decodeURIComponent(evt.target.id);
-                               var h3 = "Update node information";
+                               var h3 = "Update Node Information";
                    var footer = one.f.switchmanager.nodesLearnt.modal.footer.updateNode();
                    var $modal = one.lib.modal.spawn(one.f.switchmanager.nodesLearnt.id.modal.modal, h3, "", footer);
                    
@@ -177,7 +177,7 @@ one.f.switchmanager.nodesLearnt = {
                        var result = {};
             result['nodeName'] = $('#' + one.f.switchmanager.nodesLearnt.id.modal.form.nodeName, $modal).val();
             if(!one.f.switchmanager.validateName(result['nodeName'])) {
-               alert("Node name can contain alphabets numbers and characters _ - . upto 32 characters in length");
+               alert("Node name can contain upto 255 characters");
                return;
             }
             result['nodeId'] = $('#' + one.f.switchmanager.nodesLearnt.id.modal.form.nodeId, $modal).val();
@@ -255,6 +255,7 @@ one.f.switchmanager.nodesLearnt = {
                                entry.push(value["tierName"]);
                                entry.push(value["mac"]);
                                entry.push(value["ports"]);
+                               entry.push(value["portStatus"]);
                                tr.entry = entry;
                                result.push(tr);
                        });
@@ -386,7 +387,7 @@ one.f.switchmanager.subnetGatewayConfig = {
                                var result = {};
                    result['gatewayName'] = $('#' + one.f.switchmanager.subnetGatewayConfig.id.modal.form.name, $modal).val();
                    if(!one.f.switchmanager.validateName(result['gatewayName'])) {
-                       alert("Gateway name can contain alphabets numbers and characters _ - . upto 32 characters in length");
+                       alert("Gateway name can contain upto 255 characters");
                        return;
                    }
                    result['gatewayIPAddress'] = $('#' + one.f.switchmanager.subnetGatewayConfig.id.modal.form.gatewayIPAddress, $modal).val();
@@ -634,7 +635,8 @@ one.f.switchmanager.staticRouteConfig = {
                        var body = one.f.switchmanager.staticRouteConfig.data.staticRouteConfig(content);
                        // first column contains checkbox. no need for header
                        content.columnNames.splice(0,0," ");
-                       var $table = one.f.switchmanager.createTable(content.columnNames, body);
+                       var tableHeaders = ['', 'Name', 'Static Route', 'Next Hop Address'];
+                       var $table = one.f.switchmanager.createTable(tableHeaders, body);
                        $dashlet.append($table);
                });
        },
@@ -1007,4 +1009,4 @@ $('.dash .nav a', '#main').click(function() {
 // activate first tab on each dashlet
 $('.dash .nav').each(function(index, value) {
     $($(value).find('li')[0]).find('a').click();
-});
\ No newline at end of file
+});