diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-05-22 15:26:29 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-05-22 15:26:29 -0300 |
commit | 3543db5ee94dddae808d0908587b98e412a6c5fe (patch) | |
tree | 7708a403e1e3b0127fe228d007f78e8102a2a545 /usr/local | |
parent | 7d8aad66f3a9aa1f7804426a195c84244f347c24 (diff) | |
parent | 1b244d3828e83d3c1677d88d5c6bfcb34debac83 (diff) | |
download | pfsense-3543db5ee94dddae808d0908587b98e412a6c5fe.zip pfsense-3543db5ee94dddae808d0908587b98e412a6c5fe.tar.gz |
Merge pull request #1205 from ExolonDX/branch_master_59
Diffstat (limited to 'usr/local')
-rw-r--r-- | usr/local/www/diag_dump_states_sources.php | 4 | ||||
-rw-r--r-- | usr/local/www/firewall_rules_edit.php | 2 | ||||
-rw-r--r-- | usr/local/www/index.php | 4 | ||||
-rw-r--r-- | usr/local/www/interfaces_ppps_edit.php | 4 | ||||
-rw-r--r-- | usr/local/www/system_advanced_notifications.php | 2 | ||||
-rw-r--r-- | usr/local/www/vpn_openvpn_csc.php | 4 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/thermal_sensors.widget.php | 4 | ||||
-rw-r--r-- | usr/local/www/wizard.php | 2 |
8 files changed, 19 insertions, 7 deletions
diff --git a/usr/local/www/diag_dump_states_sources.php b/usr/local/www/diag_dump_states_sources.php index 8eaef8d..2220d1f 100644 --- a/usr/local/www/diag_dump_states_sources.php +++ b/usr/local/www/diag_dump_states_sources.php @@ -72,6 +72,7 @@ include("head.inc"); <form action="diag_dump_states_sources.php" method="get" name="iform"> <script type="text/javascript"> +//<![CDATA[ function removeSource(srcip, dstip) { var busy = function(index,icon) { jQuery(icon).bind("onclick",""); @@ -99,6 +100,7 @@ include("head.inc"); function(index,row) { jQuery(row).fadeOut(1000); } ); } +//]]> </script> <table width="100%" border="0" cellpadding="0" cellspacing="0"> @@ -130,7 +132,7 @@ include("head.inc"); <?=gettext("Filter expression:");?> <input type="text" name="filter" class="formfld search" value="<?=htmlspecialchars($_GET['filter']);?>" size="30" /> <input type="submit" class="formbtn" value="<?=gettext("Filter");?>" /> - <td> + </td> </tr> </table> </form> diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 207e183..aaec6a5 100644 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -887,7 +887,9 @@ include("head.inc"); echo "<input name='interface' id='interface' type='hidden' value='{$pconfig['interface']}' />"; ?> <script type="text/javascript"> + //<![CDATA[ editenabled = 0; + //]]> </script> </td> </tr> diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 36c0639..6e9e178 100644 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -668,8 +668,10 @@ pfSense_handle_custom_code("/usr/local/pkg/dashboard/pre_dashboard"); } else { ?> <script type="text/javascript"> + //<![CDATA[ var colpos = "<?=$colpos[$widgetcounter]?>"; - createColumn(colpos); + createColumn(colpos); + //]]> </script> <?php } } diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php index 7a38eda..a613181 100644 --- a/usr/local/www/interfaces_ppps_edit.php +++ b/usr/local/www/interfaces_ppps_edit.php @@ -393,8 +393,10 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE" <link href="/javascript/numericupdown/css/numericupdown.css" rel="stylesheet" type="text/css" /> <script type="text/javascript" src="/javascript/datepicker/js/datepicker.js"></script> <link href="/javascript/datepicker/css/datepicker.css" rel="stylesheet" type="text/css"/> - <script type="text/javascript" > + <script type="text/javascript"> + //<![CDATA[ jQuery(document).ready(function() { updateType(<?php echo "'{$pconfig['type']}'";?>); }); + //]]> </script> </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC" > diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php index 8f5e90a..2ead28d 100644 --- a/usr/local/www/system_advanced_notifications.php +++ b/usr/local/www/system_advanced_notifications.php @@ -349,6 +349,7 @@ include("head.inc"); </tr> </table> <script type="text/javascript"> +//<![CDATA[ jQuery(document).ready(function() { if (jQuery('#smtpssl').is(':checked')) { jQuery('#smtptls').prop('disabled', true); @@ -362,6 +363,7 @@ include("head.inc"); jQuery('#smtptls').change( function() { jQuery('#smtpssl').prop('disabled', this.checked); }); +//]]> </script> <?php include("fend.inc"); ?> </body> diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php index 26debd4..f70344d 100644 --- a/usr/local/www/vpn_openvpn_csc.php +++ b/usr/local/www/vpn_openvpn_csc.php @@ -254,7 +254,7 @@ include("head.inc"); <body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>"> <?php include("fbegin.inc"); ?> <script type="text/javascript"> -<!-- +//<![CDATA[ function dns_domain_change() { @@ -299,7 +299,7 @@ function netbios_change() { } } -//--> +//]]> </script> <?php if ($input_errors) diff --git a/usr/local/www/widgets/widgets/thermal_sensors.widget.php b/usr/local/www/widgets/widgets/thermal_sensors.widget.php index a65eee2..d7d398c 100644 --- a/usr/local/www/widgets/widgets/thermal_sensors.widget.php +++ b/usr/local/www/widgets/widgets/thermal_sensors.widget.php @@ -272,8 +272,8 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) { <!-- needed to display the widget settings menu --> <script type="text/javascript"> - +//<![CDATA[ textlink = jQuery("#thermal_sensors-configure"); textlink.css({display: "inline"}); - +//]]> </script> diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php index a773e12..b0b2320 100644 --- a/usr/local/www/wizard.php +++ b/usr/local/www/wizard.php @@ -892,7 +892,9 @@ if($pkg['step'][$stepid]['stepafterformdisplay'] <> "") { if($pkg['step'][$stepid]['javascriptafterformdisplay'] <> "") { // handle after form display event. echo "\n<script type=\"text/javascript\">\n"; + echo "//<![CDATA[\n"; echo $pkg['step'][$stepid]['javascriptafterformdisplay'] . "\n"; + echo "//]]>\n"; echo "</script>\n\n"; } |