diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
| commit | e73b001e2585b55973faaf0be199a5f438c4ae89 (patch) | |
| tree | 6dc08100313fe95ab4ca2dfa9883c23152dd4538 /usr/local/www/load_balancer_pool_edit.php | |
| parent | 3e6ec5dfba9679f6b521962269aca9570e391abb (diff) | |
| parent | 3e4f5a3359ebcc46710f37466620d0c0cdfd7293 (diff) | |
| download | pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.zip pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.tar.gz | |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/diag_smart.php
usr/local/www/firewall_rules_edit.php
usr/local/www/interfaces.php
usr/local/www/load_balancer_pool_edit.php
usr/local/www/pkg_mgr_settings.php
Diffstat (limited to 'usr/local/www/load_balancer_pool_edit.php')
| -rwxr-xr-x | usr/local/www/load_balancer_pool_edit.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php index 3556b4c..92453b9 100755 --- a/usr/local/www/load_balancer_pool_edit.php +++ b/usr/local/www/load_balancer_pool_edit.php @@ -176,8 +176,8 @@ function clearcombo(){ <td width="22%" valign="top" class="vncellreq"><?=gettext("Mode"); ?></td> <td width="78%" class="vtable" colspan="2"> <select id="mode" name="mode" onChange="enforceFailover(); checkPoolControls();"> - <option value="loadbalance" <?if(!isset($pconfig['mode']) || ($pconfig['mode'] == "loadbalance")) echo "value=\"{$pconfig['name']}\"";?>><?=gettext("Load Balance"); ?></option> - <option value="failover" <?if($pconfig['mode'] == "failover") echo "value=\"{$pconfig['name']}\"";?>><?=gettext("Manual Failover"); ?></option> + <option value="loadbalance" <?if(!isset($pconfig['mode']) || ($pconfig['mode'] == "loadbalance")) echo "selected";?>><?=gettext("Load Balance");?></option> + <option value="failover" <?if($pconfig['mode'] == "failover") echo "selected";?>><?=gettext("Manual Failover");?></option> </select> </td> </tr> @@ -226,7 +226,7 @@ function clearcombo(){ <td width="22%" valign="top" class="vncellreq"><?=gettext("Server IP Address"); ?></td> <td width="78%" class="vtable" colspan="2"> <input name="ipaddr" type="text" size="16" style="float: left;"> - <input class="formbtn" type="button" name="button1" value="<?=gettext("Add to pool"); ?>" onclick="AddServerToPool(document.iform);"><br> + <input class="formbtn" type="button" name="button1" value="<?=gettext("Add to pool"); ?>" onclick="AddServerToPool(document.iform); enforceFailover(); checkPoolControls();"><br> </td> </tr> <tr> |
