Partial fix to #5310

wizard.php updated to generate jquery not javascript
traffic_shaper_dedicated.xml and .inc updated to correct multiple "Next" buttons and other display issues.
(Need to do same for the other TS wizard)

3 files changed, 52 insertions, 63 deletions

diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php
index 90d60e5..70a0756 100644
--- a/src/usr/local/www/wizard.php
+++ b/src/usr/local/www/wizard.php
@@ -217,16 +217,11 @@ $pgtitle = array($title);
 $notitle = true;
 include("head.inc");
 
-if (file_exists("/usr/local/www/themes/{$g['theme']}/wizard.css")) {
-	echo "<link type=\"text/css\" rel=\"stylesheet\" href=\"/themes/{$g['theme']}/wizard.css\" media=\"all\" />\n";
-} else {
-	echo "<link type=\"text/css\" rel=\"stylesheet\" href=\"/themes/{$g['theme']}/all.css\" media=\"all\" />";
-}
-
 if ($pkg['step'][$stepid]['fields']['field'] != "") { ?>
 <script type="text/javascript">
 //<![CDATA[
-events.push(function(){
+
+
 	function FieldValidate(userinput, regexp, message) {
 		if (!userinput.match(regexp)) {
 			alert(message);
@@ -234,62 +229,74 @@ events.push(function(){
 	}
 
 	function enablechange() {
+
 	<?php
+
 		foreach ($pkg['step'][$stepid]['fields']['field'] as $field) {
 			if (isset($field['enablefields']) or isset($field['checkenablefields'])) {
-				print "\t" . 'if (document.iform.' . strtolower($field['name']) . '.checked) {' . "\n";
+				print "\t" . 'if ( $("#" + "' . strtolower($field['name']) . '").prop("checked") ) {' . "\n";
+
 				if (isset($field['enablefields'])) {
 					$enablefields = explode(',', $field['enablefields']);
 					foreach ($enablefields as $enablefield) {
 						$enablefield = strtolower($enablefield);
-						print "\t\t" . 'document.iform.' . $enablefield . '.disabled = 0;' . "\n";
+						print "\t\t" . '$("#" + "' . $enablefield . '").prop("disabled", false);' . "\n";
 					}
 				}
+
 				if (isset($field['checkenablefields'])) {
 					$checkenablefields = explode(',', $field['checkenablefields']);
 					foreach ($checkenablefields as $checkenablefield) {
 						$checkenablefield = strtolower($checkenablefield);
-						print "\t\t" . 'document.iform.' . $checkenablefield . '.checked = 0;' . "\n";
+						print "\t\t" . '$("#" + "' . $checkenablefield . '").prop("checked", true);' . "\n";
 					}
 				}
+
 				print "\t" . '} else {' . "\n";
 				if (isset($field['enablefields'])) {
 					$enablefields = explode(',', $field['enablefields']);
 					foreach ($enablefields as $enablefield) {
 						$enablefield = strtolower($enablefield);
-						print "\t\t" . 'document.iform.' . $enablefield . '.disabled = 1;' . "\n";
+						print "\t\t" . '$("#" + "' . $enablefield . '").prop("disabled", true);' . "\n";
+
 					}
 				}
-				if (isset($field['checkenablefields'])) {
-					$checkenablefields = explode(',', $field['checkenablefields']);
-					foreach ($checkenablefields as $checkenablefield) {
-						$checkenablefield = strtolower($checkenablefield);
-						print "\t\t" . 'document.iform.' . $checkenablefield . '.checked = 1;' . "\n";
+
+			if (isset($field['checkdisablefields'])) {
+				$checkenablefields = explode(',', $field['checkdisablefields']);
+				foreach ($checkenablefields as $checkenablefield) {
+					$checkenablefield = strtolower($checkenablefield);
+						print "\t\t" . '$("#" + "' . $checkenablefield . '").prop("checked", false);' . "\n";
 					}
 				}
+
 				print "\t" . '}' . "\n";
 			}
 		}
 	?>
+
 	}
 
 	function disablechange() {
 	<?php
 		foreach ($pkg['step'][$stepid]['fields']['field'] as $field) {
 			if (isset($field['disablefields']) or isset($field['checkdisablefields'])) {
-				print "\t" . 'if (document.iform.' . strtolower($field['name']) . '.checked) {' . "\n";
+
+				print "\t" . 'if ( $("#" + "' . strtolower($field['name']) . '").prop("checked") ) {' . "\n";
+
 				if (isset($field['disablefields'])) {
 					$enablefields = explode(',', $field['disablefields']);
 					foreach ($enablefields as $enablefield) {
 						$enablefield = strtolower($enablefield);
-						print "\t\t" . 'document.iform.' . $enablefield . '.disabled = 1;' . "\n";
+
+						print "\t\t" . '$("#" + "' . $enablefield . '").prop("disabled", true);' . "\n";
 					}
 				}
 				if (isset($field['checkdisablefields'])) {
 					$checkenablefields = explode(',', $field['checkdisablefields']);
 					foreach ($checkenablefields as $checkenablefield) {
 						$checkenablefield = strtolower($checkenablefield);
-						print "\t\t" . 'document.iform.' . $checkenablefield . '.checked = 1;' . "\n";
+						print "\t\t" . '$("#" + "' . $checkenablefield . '").prop("checked", true);' . "\n";
 					}
 				}
 				print "\t" . '} else {' . "\n";
@@ -297,14 +304,14 @@ events.push(function(){
 					$enablefields = explode(',', $field['disablefields']);
 					foreach ($enablefields as $enablefield) {
 						$enablefield = strtolower($enablefield);
-						print "\t\t" . 'document.iform.' . $enablefield . '.disabled = 0;' . "\n";
+						print "\t\t" . '$("#" + "' . $enablefield . '").prop("disabled", false);' . "\n";
 					}
 				}
 				if (isset($field['checkdisablefields'])) {
 					$checkenablefields = explode(',', $field['checkdisablefields']);
 					foreach ($checkenablefields as $checkenablefield) {
 						$checkenablefield = strtolower($checkenablefield);
-						print "\t\t" . 'document.iform.' . $checkenablefield . '.checked = 0;' . "\n";
+						print "\t\t" . '$("#" + "' . $checkenablefield . '").prop("checked", false);' . "\n";
 					}
 				}
 				print "\t" . '}' . "\n";
@@ -340,7 +347,7 @@ events.push(function(){
 		}
 ?>
 	}
-});
+
 //]]>
 </script>
 <?php }
@@ -510,6 +517,7 @@ if ($pkg['step'][$stepid]['fields']['field'] != "") {
 			eval($toeval);
 		}
 
+//		print('Step: ' . $pkg['step'][$stepid]['id'] . ', Field: ' . $field['type'] . '<br />');
 		switch ($field['type']) {
 			case "input":
 				if ($field['displayname']) {
@@ -857,9 +865,9 @@ if ($pkg['step'][$stepid]['fields']['field'] != "") {
 				}
 
 				if (isset($field['enablefields']) or isset($field['checkenablefields'])) {
-					$onclick = "Javascript:enablechange()";
+					$onclick = "enablechange()";
 				} else if (isset($field['disablefields']) or isset($field['checkdisablefields'])) {
-					$onclick = "Javascript:disablechange()";
+					$onclick = "disablechange()";
 				}
 
 				$section->addInput(new Form_Checkbox(
@@ -882,7 +890,7 @@ print($form);
 
 <script type="text/javascript">
 //<![CDATA[
-events.push(function(){
+
 		if (typeof ext_change != 'undefined') {
 			ext_change();
 		}
@@ -924,7 +932,7 @@ events.push(function(){
 		}
 ?>
 	}
-});
+
 //]]>
 </script>
 
@@ -983,9 +991,11 @@ if ($pkg['step'][$stepid]['disableallfieldsbydefault'] != "") {
 
 <script type="text/javascript">
 //<![CDATA[
+events.push(function(){
 	enablechange();
 	disablechange();
 	showchange();
+});
 //]]>
 </script>
 
diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index d984fed..95b374a 100644
--- a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -238,7 +238,7 @@ function step2_stepbeforeformdisplay() {
 		$field['displayname'] = "Download";
 		$field['name'] = "conn{$i}download";
 		$field['type'] = "input";
-		$field['bindstofield'] = "ezshaper->step2->conn{$i}download";
+		$field['bindstofieldnext'] = "ezshaper->step2->conn{$i}download";
 		$field['combinefieldsbegin'] = "true";
 		$fields[] = $field;
 
@@ -357,11 +357,6 @@ function step3_stepbeforeformdisplay() {
 	$voipfields[] = $field;
 
 	$field = array();
-	$field['name'] = "Next";
-	$field['type'] = "submit";
-	$voipfields[] = $field;
-
-	$field = array();
 	$field['name'] = "VOIP specific settings";
 	$field['type'] = "listtopic";
 	$voipfields[] = $field;
@@ -409,7 +404,7 @@ function step3_stepbeforeformdisplay() {
 		$voipfields[] = $field;
 
 		$field = array();
-		$field['displayname'] = "Upload";
+		$field['displayname'] = "Upload rate";
 		$field['name'] = "conn{$i}upload";
 		$enablefields[] = "conn{$i}upload";
 		$field['type'] = "input";
@@ -418,6 +413,7 @@ function step3_stepbeforeformdisplay() {
 		$voipfields[] = $field;
 
 		$field = array();
+		$field['displayname'] = "Units";
 		$field['combinefieldsend'] = "true";
 		$field['dontdisplayname'] = "true";
 		$field['dontcombinecells'] = "true";
@@ -442,7 +438,7 @@ function step3_stepbeforeformdisplay() {
 		$voipfields[] = $field;
 
 		$field = array();
-		$field['displayname'] = "Download";
+		$field['displayname'] = "Download rate";
 		$field['name'] = "local{$i}download";
 		$enablefields[] = "local{$i}download";
 		$field['type'] = "input";
@@ -452,6 +448,7 @@ function step3_stepbeforeformdisplay() {
 
 		$field = array();
 		$field['combinefieldsend'] = "true";
+		$field['displayname'] = "Units";
 		$field['dontdisplayname'] = "true";
 		$field['dontcombinecells'] = "true";
 		$field['name'] = "local{$i}downloadspeed";
diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
index c86a72a..e3ee5f3 100755
--- a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
+++ b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
@@ -89,11 +89,7 @@
 				<bindstofield>ezshaper-&gt;step3-&gt;enable</bindstofield>
 			</field>
 			<field>
-				<name>Next</name>
-				<type>submit</type>
-			</field>
-			<field>
-				<name>VOIP specific settings</name>
+				<name>VOIP specific settingsX</name>
 				<type>listtopic</type>
 			</field>
 			<field>
@@ -132,7 +128,7 @@
 				<name>Bandwidth</name>
 				<type>input</type>
 				<validate>^[0-9]*$</validate>
-				<typehint>Total bandwidth in percentage(%)(should be between 5 and 40) guarantee for VOIP traffic.</typehint>
+				<description>Total bandwidth in percentage(%)(should be between 5 and 40) guarantee for VOIP traffic.</description>
 				<bindstofield>ezshaper-&gt;step3-&gt;bandwidth</bindstofield>
 			</field>
 			<field>
@@ -160,10 +156,6 @@
 				<bindstofield>ezshaper-&gt;step4-&gt;enable</bindstofield>
 			</field>
 			<field>
-				<name>Next</name>
-				<type>submit</type>
-			</field>
-			<field>
 				<name>PenaltyBox specific settings</name>
 				<type>listtopic</type>
 			</field>
@@ -187,14 +179,15 @@
 				<dontdisplayname>true</dontdisplayname>
 				<dontcombinecells>true</dontcombinecells>
 				<donotdisable>true</donotdisable>
-                                <name>BandwidthSpeed</name>
+				<displayname>Units</displayname>
+                <name>BandwidthSpeed</name>
 				<description>The limit you want to apply.</description>
-                                <type>select</type>
+                <type>select</type>
 				<options>
 				<option>
-                                        <name>%</name>
-                                        <value>%</value>
-                                </option>
+                    <name>%</name>
+                    <value>%</value>
+                    </option>
 				<option>
 					<name>bit/s</name>
 					<value>b</value>
@@ -212,8 +205,8 @@
 					<value>Gb</value>
 				</option>
 				</options>
-                                <bindstofield>ezshaper->step4->bandwidthunit</bindstofield>
-                        </field>
+                <bindstofield>ezshaper->step4->bandwidthunit</bindstofield>
+             </field>
 			<field>
 				<name>Next</name>
 				<type>submit</type>
@@ -238,10 +231,6 @@
 				<bindstofield>ezshaper-&gt;step5-&gt;enable</bindstofield>
 			</field>
 			<field>
-				<name>Next</name>
-				<type>submit</type>
-			</field>
-			<field>
 				<name>p2p Catch all</name>
 				<type>listtopic</type>
 			</field>
@@ -265,6 +254,7 @@
                                 <dontcombinecells>true</dontcombinecells>
 				<donotdisable>true</donotdisable>
                                 <name>BandwidthSpeed</name>
+                                <displayname>Units</displayname>
                                 <description>The limit you want to apply.</description>
                                 <type>select</type>
                                 <options>
@@ -445,10 +435,6 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;enable</bindstofield>
 			</field>
 			<field>
-				<name>Next</name>
-				<type>submit</type>
-			</field>
-			<field>
 				<name>Enable/Disable specific game consoles and services</name>
 				<type>listtopic</type>
 			</field>
@@ -767,10 +753,6 @@
 				<bindstofield>ezshaper-&gt;step7-&gt;enable</bindstofield>
 			</field>
 			<field>
-				<name>Next</name>
-				<type>submit</type>
-			</field>
-			<field>
 				<name>Remote Service / Terminal emulation</name>
 				<type>listtopic</type>
 			</field>