summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorsullrich <sullrich@pfsense.org>2009-11-28 14:56:38 -0500
committersullrich <sullrich@pfsense.org>2009-11-28 14:56:43 -0500
commit30c4ae8a6bf91f7656f07d80f2e8cafb83d1113a (patch)
treefefe46f2160ada000c91cb8e268c2c6d4ecae8a9 /usr
parentc898b8aaafbf83bbadac95c8e3bfd17ddb1283fa (diff)
downloadpfsense-30c4ae8a6bf91f7656f07d80f2e8cafb83d1113a.zip
pfsense-30c4ae8a6bf91f7656f07d80f2e8cafb83d1113a.tar.gz
Seperate diffserv box into a <select> dropdown. Hide item behind advanced button. Move down one section near other advanced items. Resolves #60
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/firewall_rules_edit.php24
-rwxr-xr-xusr/local/www/guiconfig.inc16
-rw-r--r--usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js6
3 files changed, 38 insertions, 8 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index ac29e5f..e5cc424 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -873,14 +873,6 @@ include("head.inc");
</span>
</td>
</tr>
- <tr>
- <td width="22%" valign="top" class="vncell">Diffserv Code Point</td>
- <td width="78%" class="vtable">
- <input name="dscp" id="dscp" value="<?=htmlspecialchars($pconfig['dscp']);?>">
- <br />
- <span class="vexpl">Valid values are: af11, af12, af13, af21, af22, af23, af31, af32, af33, af41, af42, af43, EF, 1-64, 0x04-0xfc.</span>
- </td>
- </tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Log</td>
<td width="78%" class="vtable">
@@ -891,6 +883,22 @@ include("head.inc");
</td>
</tr>
<tr>
+ <td width="22%" valign="top" class="vncell">Diffserv Code Point</td>
+ <td width="78%" class="vtable">
+ <div id="dsadv" name="dsadv">
+ <input type="button" onClick="show_dsdiv();" value="Advanced"> - Show advanced options
+ </div>
+ <div id="dsdivmain" name="dsdivmain" style="display:none">
+ <select name="dscp" id="dscp">
+ <option value=""></option>
+ <?php foreach($firewall_rules_dscp_types as $frdt): ?>
+ <option value="<?=$frdt?>"<?php if($pconfig['dscp'] == $frdt) echo " SELECTED"; ?>><?=$frdt?></option>
+ <?php endforeach; ?>
+ </select>
+ </div>
+ </td>
+ </tr>
+ <tr>
<td width="22%" valign="top" class="vncell">Advanced Options</td>
<td width="78%" class="vtable">
<div id="aoadv" name="aoadv">
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 5cf58d8..49d7562 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -89,6 +89,22 @@ if (is_subsystem_dirty('firmwarelock')) {
}
}
+$firewall_rules_dscp_types = array("af11",
+ "af12",
+ "af13",
+ "af21",
+ "af22",
+ "af23",
+ "af31",
+ "af32",
+ "af33",
+ "af41",
+ "af42",
+ "af43",
+ "EF",
+ "1-64",
+ "0x04-0xfc");
+
$auth_server_types = array(
'ldap' => "LDAP",
'radius' => "Radius");
diff --git a/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js b/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js
index 8ac037f..a8276d9 100644
--- a/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js
+++ b/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js
@@ -125,6 +125,12 @@ function show_aodiv() {
aodiv.style.display = "block";
}
+function show_dsdiv() {
+ document.getElementById("dsadv").innerHTML='';
+ dsdiv = document.getElementById('dsdivmain');
+ dsdiv.style.display = "block";
+}
+
function show_advanced_state() {
document.getElementById("showadvstatebox").innerHTML='';
aodiv = document.getElementById('showstateadv');
OpenPOWER on IntegriCloud