prep work for feature #2320: tag dynamic fields for ipv4v6

2 files changed, 18 insertions, 1 deletions

diff --git a/usr/local/www/javascript/row_helper.js b/usr/local/www/javascript/row_helper.js
index 706b579..2233927 100755
--- a/usr/local/www/javascript/row_helper.js
+++ b/usr/local/www/javascript/row_helper.js
@@ -18,6 +18,7 @@ var temp_streaming_text = "";
 
 var addRowTo = (function() {
     return (function (tableId) {
+	var $ = jQuery;
 	var d, tbody, tr, td, bgc, i, ii, j;
 	d = document;
 	tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
@@ -28,6 +29,8 @@ var addRowTo = (function() {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input>" + rowtype[i](rowname[i], rowsize[i], totalrows) + " ";
 		} else if(rowtype[i] == 'textbox') {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + rowsize[i] + "' class='formfld unknown' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
+		} else if(rowtype[i] == 'textbox,ipv4v6') {
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + rowsize[i] + "' class='formfld unknown ipv4v6' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
 		} else if(rowtype[i] == 'password') {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input type='password' size='" + rowsize[i] + "' class='formfld pwd' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
 		} else if(rowtype[i] == 'select') {
@@ -37,6 +40,13 @@ var addRowTo = (function() {
 				str=str + "<option value=\"" + cidr + "\" >" + cidr + "</option>";
 			}
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select size='1' name='" + rowname[i] + totalrows + "'>" + str + "</select> ";
+		} else if(rowtype[i] == 'select,ipv4v6') {
+                        var cidr;
+			var str;
+			for (cidr = 128; cidr>= 1; cidr--) {
+				str=str + "<option value=\"" + cidr + "\" >" + cidr + "</option>";
+			}
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select class='ipv4v6' size='1' name='" + rowname[i] + totalrows + "'>" + str + "</select> ";
 		} else if(rowtype[i] == 'select_source') {
                         var cidr;
 			var str;
@@ -56,6 +66,7 @@ var addRowTo = (function() {
 	tr.appendChild(td);
 	tbody.appendChild(tr);
 	totalrows++;
+	$(tr).ipv4v6ify();
     });
 })();
 
diff --git a/usr/local/www/javascript/row_helper_dynamic.js b/usr/local/www/javascript/row_helper_dynamic.js
index 30312ba..e5e5c6f 100755
--- a/usr/local/www/javascript/row_helper_dynamic.js
+++ b/usr/local/www/javascript/row_helper_dynamic.js
@@ -24,7 +24,8 @@ var temp_streaming_text = "";
 
 var addRowTo = (function() {
     return (function (tableId, objectSize) {
-	var d, tbody, tr, td, bgc, i, ii, j;
+	var $ = jQuery;
+	var d, tbody, tr, td, bgc, i, ii, j, className;
 	d = document;
 	tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
 	tr = d.createElement("tr");
@@ -37,8 +38,12 @@ var addRowTo = (function() {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input>" + rowtype[i](rowname[i], objectSize, totalrows) + " ";
 		} else if(rowtype[i] == 'textbox') {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input " + rowhelper_onChange + " size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
+		} else if(rowtype[i] == 'textbox,ipv4v6') {
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input " + rowhelper_onChange + " size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "' class='ipv4v6' id='" + rowname[i] + totalrows + "'></input> ";
 		} else if(rowtype[i] == 'select') {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select " + rowhelper_onChange + " name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'>" + newrow[i] + "</select> ";
+		} else if(rowtype[i] == 'select,ipv4v6') {
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select " + rowhelper_onChange + " name='" + rowname[i] + totalrows + "' class='ipv4v6' id='" + rowname[i] + totalrows + "'>" + newrow[i] + "</select> ";
 		} else if(rowtype[i] == 'select_source') {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select " + rowhelper_onChange + " name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'>" + newrow[i] + "</select> ";
 		} else if(rowtype[i] == 'checkbox') {
@@ -57,6 +62,7 @@ var addRowTo = (function() {
 	tbody.appendChild(tr);
 	if(rowhelper_onAdd != '') 
 		eval(rowhelper_onAdd);
+	$(tr).ipv4v6ify();
     });
 })();