diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-10-16 15:47:24 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-10-16 15:47:24 -0400 |
| commit | e79dc51763a658098ab2180c8fd35b91e8f8b11a (patch) | |
| tree | e5c2b70fc74e509e51df3ba7444a6feeb90b5688 /src/usr/local/www/wizards | |
| parent | 4999ee1aab526c28c56174c0291f80f9bd3d31df (diff) | |
| download | pfsense-e79dc51763a658098ab2180c8fd35b91e8f8b11a.zip pfsense-e79dc51763a658098ab2180c8fd35b91e8f8b11a.tar.gz | |
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)
Diffstat (limited to 'src/usr/local/www/wizards')
| -rw-r--r-- | src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | 13 | ||||
| -rwxr-xr-x | src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml | 40 |
2 files changed, 16 insertions, 37 deletions
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->step3->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->step3->bandwidth</bindstofield> </field> <field> @@ -160,10 +156,6 @@ <bindstofield>ezshaper->step4->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->step5->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->step6->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->step7->enable</bindstofield> </field> <field> - <name>Next</name> - <type>submit</type> - </field> - <field> <name>Remote Service / Terminal emulation</name> <type>listtopic</type> </field> |
