diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-01-07 13:56:51 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-01-07 13:56:51 -0500 |
commit | 3568193009b7c2b5bde38e913f6e87dfa9265a12 (patch) | |
tree | e2445847e89928f68d3aff40377f951fb9460416 /src/usr | |
parent | 6ac8623c18029152d119a43e50623c259f62f013 (diff) | |
download | pfsense-3568193009b7c2b5bde38e913f6e87dfa9265a12.zip pfsense-3568193009b7c2b5bde38e913f6e87dfa9265a12.tar.gz |
Change the automatic information block to look for <div class="infoblock" instrad of <div id="infoblock"
Just makes more sense to use a class for this
Diffstat (limited to 'src/usr')
27 files changed, 30 insertions, 33 deletions
diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php index 7e01c5c..cc8d137 100644 --- a/src/usr/local/www/diag_confbak.php +++ b/src/usr/local/www/diag_confbak.php @@ -208,7 +208,7 @@ print($form); if (is_array($confvers)) { ?> <div> - <div id="infoblock_open"> + <div class="infoblock_open"> <?=print_info_box( gettext( 'To view the differences between an older configuration and a newer configuration, ' . diff --git a/src/usr/local/www/diag_sockets.php b/src/usr/local/www/diag_sockets.php index 7727a65..5039d50 100644 --- a/src/usr/local/www/diag_sockets.php +++ b/src/usr/local/www/diag_sockets.php @@ -133,7 +133,7 @@ $showAllOption = $showAll ? "" : "?showAll"; ?> <div> -<div id="infoblock"> +<div class="infoblock"> <?php print_info_box(gettext('Socket information - explanation.') . '<br /><br />' . gettext('This page shows the output for the commands: "sockstat -4lL" and "sockstat -6lL".' . '<br />' . diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php index e053e1a..4bd9319 100644 --- a/src/usr/local/www/diag_tables.php +++ b/src/usr/local/www/diag_tables.php @@ -159,7 +159,7 @@ print $form; if ($bogons || !empty($entries)) { ?> <div> - <div id="infoblock_open"> + <div class="infoblock_open"> <?php $last_updated = exec('/usr/bin/grep -i -m 1 -E "^# last updated" /etc/' . escapeshellarg($tablename) . '|cut -d"(" -f2|tr -d ")" '); if ($last_updated != "") { diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index f505d63..d0ff400 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -311,7 +311,7 @@ display_top_tabs($tab_array); <!-- Information section. Icon ID must be "showinfo" and the information <div> ID must be "infoblock". That way jQuery (in pfenseHelpers.js) will automatically take care of the display. --> <div> - <div id="infoblock"> + <div class="infoblock"> <?=print_info_box(gettext('Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' . 'of changes that have to be made if a host, network or port changes. <br />' . 'You can enter the name of an alias instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '<br />' . diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index 016bf0b..320bad4 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -277,7 +277,7 @@ display_top_tabs($tab_array); </nav> </form> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext('Depending on the way your WAN connection is setup, you may also need a ') . '<a href="firewall_virtual_ip.php">' . gettext("Virtual IP.") . '</a>' . '<br />' . gettext('If you add a 1:1 NAT entry for any of the interface IPs on this system, ' . diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index 5b51d2d..cf61565 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -660,7 +660,7 @@ endif; </div> </form> -<div id="infoblock"> +<div class="infoblock"> <?php print_info_box(gettext('If automatic outbound NAT is selected, a mapping is automatically generated for each interface\'s subnet (except WAN-type connections) and the rules ' . 'on the "Mappings" section of this page are ignored.' . '<br />' . diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 2a4c970..807d5a7 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -695,7 +695,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): </nav> </form> -<div id="infoblock"> +<div class="infoblock"> <div class="alert alert-info clearfix" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button><div class="pull-left"> <dl class="dl-horizontal responsive"> <!-- Legend --> diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php index de4be3c..53ee0f4 100644 --- a/src/usr/local/www/firewall_schedule.php +++ b/src/usr/local/www/firewall_schedule.php @@ -279,7 +279,7 @@ endforeach; </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext('Schedules act as placeholders for time ranges to be used in Firewall Rules.'), 'info')?> </div> diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index a230003..f931b0f 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -506,7 +506,7 @@ if (!$dfltmsg && $sform) { if ($dfltmsg) { ?> <div> - <div id="infoblock"> + <div class="infoblock"> <?=print_info_box($default_shaper_msg, 'info')?> </div> </div> diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index cbe25c4..037d2d2 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -364,7 +364,7 @@ endforeach; </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext('The virtual IP addresses defined on this page may be used in ') . '<a href="firewall_nat.php">' . gettext('NAT') . '</a>' . gettext(' mappings.') . '<br />' . gettext('You can check the status of your CARP Virtual IPs and interfaces ') . '<a href="status_carp.php">' . gettext('here') . '</a>', 'info')?> </div> diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index 023efd6..f8b02d3 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -489,7 +489,7 @@ $form->add($section); print($form); ?> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext("Proxy ARP and Other type Virtual IPs cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc. Use a CARP or IP Alias type address for these types.") . '<br />' . sprintf(gettext("For more information on CARP and the above values, visit the OpenBSD %s"), '<a href="http://www.openbsd.org/faq/pf/carp.html">CARP FAQ</a>.'), 'info')?> </div> diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php index 795bcc9..d832809 100644 --- a/src/usr/local/www/interfaces_groups.php +++ b/src/usr/local/www/interfaces_groups.php @@ -156,7 +156,7 @@ display_top_tabs($tab_array); </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext('Interface Groups allow you to setup rules for multiple interfaces without duplicating the rules.<br />' . 'If you remove members from an interface group, the group rules are no longer applicable to that interface.'), 'info')?> diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php index 9e22c6e..de197ba 100644 --- a/src/usr/local/www/interfaces_qinq.php +++ b/src/usr/local/www/interfaces_qinq.php @@ -182,7 +182,7 @@ endforeach; </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q QinQ tagging properly. <br />On cards that do not explicitly support it, ' . 'QinQ tagging will still work, but the reduced MTU may cause problems.<br />' . 'See the %s handbook for information on supported cards.'), $g['product_name']), 'info')?> diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index f9013cd..4742b09 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -170,7 +170,7 @@ display_top_tabs($tab_array); </div> </form> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(sprintf(gettext('NOTE: Not all drivers/NICs support 802.1Q '. 'VLAN tagging properly. <br />On cards that do not explicitly support it, VLAN '. 'tagging will still work, but the reduced MTU may cause problems.<br />See the '. diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js index 6d02d2d..61c6793 100644 --- a/src/usr/local/www/jquery/pfSenseHelpers.js +++ b/src/usr/local/www/jquery/pfSenseHelpers.js @@ -387,19 +387,19 @@ $('[id^=delete]').click(function(event) { // "More information" handlers // If there is an infoblock, automatically add an info icon that toggles its display -if($('#infoblock,#infoblock_open').length != 0) { - $('#infoblock,#infoblock_open').before('<i class="fa fa-info-circle icon-pointer" style="color: #337AB7;; font-size:20px; margin-left: 10px; margin-bottom: 10px;" id="showinfo" title="More information"></i>'); +if($('.infoblock,.infoblock_open,#infoblock').length != 0) { + $('.infoblock,.infoblock_open,#infoblock').before('<i class="fa fa-info-circle icon-pointer" style="color: #337AB7;; font-size:20px; margin-left: 10px; margin-bottom: 10px;" id="showinfo" title="More information"></i>'); // and remove the 'X' button from the last text box (Which we assume to be the infoblock) $('.close :last').remove(); } // Hide information on page load -$('#infoblock').hide(); +$('.infoblock,#infoblock').hide(); // Show the help on clicking the info icon $('#showinfo').click(function() { - $('#infoblock,#infoblock_open').toggle(); + $('.infoblock,.infoblock_open,#infoblock').toggle(); }); // Put a dummy row into any empty table to keep IE happy diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php index 9ef63c8..56dbd73 100644 --- a/src/usr/local/www/services_captiveportal_filemanager.php +++ b/src/usr/local/www/services_captiveportal_filemanager.php @@ -271,7 +271,7 @@ endif; // The notes displayed on the page are large, the page content comparitively small. A "Note" button // is provided so that you only see the notes if you ask for them ?> -<div id="infoblock" class="panel panel-default"> +<div class="infoblock" class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title">Notes</h2></div> <div class="panel-body"> <?=gettext("Any files that you upload here with the filename prefix of captiveportal- will " . diff --git a/src/usr/local/www/services_captiveportal_hostname.php b/src/usr/local/www/services_captiveportal_hostname.php index c40694a..5c7480f 100644 --- a/src/usr/local/www/services_captiveportal_hostname.php +++ b/src/usr/local/www/services_captiveportal_hostname.php @@ -196,7 +196,7 @@ endif; </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box($notestr)?> </div> diff --git a/src/usr/local/www/services_captiveportal_ip.php b/src/usr/local/www/services_captiveportal_ip.php index d321e75..ce3df1b 100644 --- a/src/usr/local/www/services_captiveportal_ip.php +++ b/src/usr/local/www/services_captiveportal_ip.php @@ -192,7 +192,7 @@ endif; </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext('Adding allowed IP addresses will allow IP access to/from these addresses through the captive portal without being taken to the portal page. ' . 'This can be used for a web server serving images for the portal page or a DNS server on another network, for example.'), 'info')?> </div> diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php index 9a4cbb5..5ce5467 100644 --- a/src/usr/local/www/services_captiveportal_mac.php +++ b/src/usr/local/www/services_captiveportal_mac.php @@ -255,7 +255,7 @@ endif; </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext('Adding MAC addresses as "pass" MACs allows them access through the captive portal automatically without being taken to the portal page.'), 'info')?> </div> <?php diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php index 7b9f88b..7790200 100644 --- a/src/usr/local/www/services_igmpproxy.php +++ b/src/usr/local/www/services_igmpproxy.php @@ -183,7 +183,7 @@ endforeach; </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext('Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. ' . 'Only one "upstream" interface can be configured.'), 'info')?> </div> diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index 1964247..ed445a0 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -542,7 +542,7 @@ endforeach; </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(sprintf(gettext("If the DNS Resolver is enabled, the DHCP". " service (if enabled) will automatically serve the LAN IP". " address as a DNS server to DHCP clients so they will use". diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index 2a28239..f28f048 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -349,14 +349,11 @@ if (!$rawfilter) { } ?> -<div id="infoblock"> - +<div class="infoblock"> <?php - print_info_box('<a href="https://doc.pfsense.org/index.php/What_are_TCP_Flags%3F">' . gettext("TCP Flags") . '</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR' . '<br />' . '<i class="fa fa-minus-square-o icon-primary"></i> = Add to block list., <i class="fa fa-plus-square-o icon-primary"></i> = Pass traffic, <i class="fa fa-info icon-primary"></i> = Resolve'); - ?> </div> diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php index 211b5c8..f8c7b49 100755 --- a/src/usr/local/www/status_logs_filter_dynamic.php +++ b/src/usr/local/www/status_logs_filter_dynamic.php @@ -477,7 +477,7 @@ function toggleListDescriptions() { <?php if ($tcpcnt > 0) { ?> -<div id="infoblock"> +<div class="infoblock"> <?php print_info_box('<a href="https://doc.pfsense.org/index.php/What_are_TCP_Flags%3F">' . gettext("TCP Flags") . '</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR'); diff --git a/src/usr/local/www/status_logs_filter_summary.php b/src/usr/local/www/status_logs_filter_summary.php index fff226d..b94f2e3 100644 --- a/src/usr/local/www/status_logs_filter_summary.php +++ b/src/usr/local/www/status_logs_filter_summary.php @@ -157,7 +157,7 @@ print("<br />"); $infomsg = sprintf(gettext('This is a summary of the last %1$s lines of the firewall log (Max %2$s).'), $gotlines, $lines); ?> <div> - <div id="infoblock_open"> + <div class="infoblock_open"> <?=print_info_box($infomsg, 'info');?> </div> </div> diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php index 4185e9c..c4c98b0 100644 --- a/src/usr/local/www/system_gateway_groups.php +++ b/src/usr/local/www/system_gateway_groups.php @@ -201,7 +201,7 @@ endforeach; </a> </nav> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext('Remember to use these Gateway Groups in firewall rules in order to enable load balancing, failover, ' . 'or policy-based routing.' . '<br />' . 'Without rules directing traffic into the Gateway Groups, they will not be used.'), 'info')?> diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index c42d1e7..825c47f 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -542,7 +542,7 @@ foreach ($a_user as $i => $userent): </nav> </form> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box(gettext("Additional users can be added here. User permissions for accessing " . "the webConfigurator can be assigned directly or inherited from group memberships. " . "An icon that appears grey indicates that it is a system defined object. " . diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index 54bf3b8..41cdd0c 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -561,7 +561,7 @@ display_top_tabs($tab_array); </nav> </form> -<div id="infoblock"> +<div class="infoblock"> <?=print_info_box('<strong>' . gettext("Note:") . '</strong><br />' . gettext("You can check your IPsec status at ") . '<a href="status_ipsec.php">' . gettext("Status:IPsec") . '</a>.<br />' . gettext("IPsec Debug Mode can be enabled at ") . '<a href="vpn_ipsec_settings.php">' .gettext("VPN:IPsec:Advanced Settings") . '</a>.<br />' . |