diff --git a/conf.default/config.xml b/conf.default/config.xml index a0cabd501..7052fcc0b 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -3,7 +3,7 @@ 9.9 - pfsense_ng + opnsense diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index d53cf5047..8a3b40a72 100644 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -50,12 +50,11 @@ unset($carp_interface_count_cache); unset($interface_ip_arr_cache); $status = get_carp_status(); -$status = intval($status); if($_POST['carp_maintenancemode'] <> "") { interfaces_carp_set_maintenancemode(!isset($config["virtualip_carp_maintenancemode"])); } if($_POST['disablecarp'] <> "") { - if($status > 0) { + if($status == true) { set_single_sysctl('net.inet.carp.allow', '0'); if(is_array($config['virtualip']['vip'])) { $viparr = &$config['virtualip']['vip']; @@ -69,7 +68,6 @@ if($_POST['disablecarp'] <> "") { } } $savemsg = sprintf(gettext("%s IPs have been disabled. Please note that disabling does not survive a reboot."), $carp_counter); - $status = 0; } else { $savemsg = gettext("CARP has been enabled."); if(is_array($config['virtualip']['vip'])) { @@ -85,11 +83,12 @@ if($_POST['disablecarp'] <> "") { } interfaces_carp_setup(); set_single_sysctl('net.inet.carp.allow', '1'); - $status = 1; } } -$carp_detected_problems = ((get_single_sysctl("net.inet.carp.demotion")) > 0); +$status = get_carp_status(); + +$carp_detected_problems = (array_pop(get_sysctl("net.inet.carp.demotion")) > 0); $pgtitle = array(gettext("Status"),gettext("CARP")); $shortcut_section = "carp"; @@ -97,113 +96,118 @@ include("head.inc"); ?> - + -
- - -" . gettext("Check link status on all interfaces with configured CARP VIPs.")); ?> + + +
+
+
+
+ + + + " . gettext("Check link status on all interfaces with configured CARP VIPs.")); ?> -
- - - "; - $align = "style=\"vertical-align:middle\""; - if($carp_enabled == false) { - $icon = "\"disabled\""; - $status = "DISABLED"; - } else { - if($status == "MASTER") { - $icon = "\"master\""; - } else if($status == "BACKUP") { - $icon = "\"backup\""; - } else if($status == "INIT") { - $icon = "\"init\""; +
+ +
+ " . convert_friendly_interface_to_friendly_descr($carp['interface']) . "@{$vhid}  "; - echo "
"; - echo ""; - echo ""; - } - } -?> -
- 0) { - if($status > 0) { - $carp_enabled = true; - echo ""; - } else { - $carp_enabled = false; - echo ""; - } - if(isset($config["virtualip_carp_maintenancemode"])) { - echo ""; - } else { - echo ""; - } - } -?> - -

- - - - - - -

" . gettext("Could not locate any defined CARP interfaces."); - echo "
"; - - include("fend.inc"); - echo ""; - return; - } - if(is_array($config['virtualip']['vip'])) { - foreach($config['virtualip']['vip'] as $carp) { - if ($carp['mode'] != "carp") - continue; - $ipaddress = $carp['subnet']; - $password = $carp['password']; - $netmask = $carp['subnet_bits']; - $vhid = $carp['vhid']; - $advskew = $carp['advskew']; - $advbase = $carp['advbase']; - $status = get_carp_interface_status("{$carp['interface']}_vip{$carp['vhid']}"); - echo "
" . $ipaddress . " {$icon}  " . $status . " 
- - - -
- + if($carpcount > 0) { + if($status == false) { + $carp_enabled = false; + echo ""; + } else { + $carp_enabled = true; + echo ""; + } + if(isset($config["virtualip_carp_maintenancemode"])) { + echo ""; + } else { + echo ""; + } + } + ?> + +
+ + + + + + + +

" . gettext("Could not locate any defined CARP interfaces."); + + + } + elseif(is_array($config['virtualip']['vip'])) { + foreach($config['virtualip']['vip'] as $carp) { + if ($carp['mode'] != "carp") + continue; + $ipaddress = $carp['subnet']; + $password = $carp['password']; + $netmask = $carp['subnet_bits']; + $vhid = $carp['vhid']; + $advskew = $carp['advskew']; + $advbase = $carp['advbase']; + $status = get_carp_interface_status("{$carp['interface']}_vip{$carp['vhid']}"); + echo "
"; + $align = "style=\"vertical-align:middle\""; + if($carp_enabled == false) { + $icon = "\"disabled\""; + $status = "DISABLED"; + } else { + if($status == "MASTER") { + $icon = "\"master\""; + } else if($status == "BACKUP") { + $icon = "\"backup\""; + } else if($status == "INIT") { + $icon = "\"init\""; + } + } + echo ""; + echo ""; + echo ""; + echo ""; + } + } + ?> +
" . convert_friendly_interface_to_friendly_descr($carp['interface']) . "@{$vhid}  " . $ipaddress . " {$icon}  " . $status . " 
+ +
+ +
+

+ : +
+ . +

-

-: -
- . -

+ " . gettext("pfSync nodes") . ":
"; + echo "
";
+							system("/sbin/pfctl -vvss | /usr/bin/grep creator | /usr/bin/cut -d\" \" -f7 | /usr/bin/sort -u");
+							echo "
"; + ?> +
+ +
+
+ + + -" . gettext("pfSync nodes") . ":
"; - echo "
";
-	system("/sbin/pfctl -vvss | /usr/bin/grep creator | /usr/bin/cut -d\" \" -f7 | /usr/bin/sort -u");
-	echo "
"; -?> - - - - - + \ No newline at end of file diff --git a/usr/local/www/crash_reporter.php b/usr/local/www/crash_reporter.php index 1b3d40bc9..0a3e2a60e 100644 --- a/usr/local/www/crash_reporter.php +++ b/usr/local/www/crash_reporter.php @@ -70,8 +70,8 @@ function output_crash_reporter_html($crash_reports) { echo "

" . gettext("Please double check the contents to ensure you are comfortable sending this information before clicking Yes.") . "

"; echo "

" . gettext("Contents of crash reports") . ":
"; echo "

"; - echo "

" . gettext(" - Submit this to the developers for inspection") . "

"; - echo "

" . gettext(" - Just delete the crash report and take me back to the Dashboard") . "

"; + echo "

" . gettext(" - Submit this to the developers for inspection") . "

"; + echo "

" . gettext(" - Just delete the crash report and take me back to the Dashboard") . "

"; echo ""; } @@ -88,11 +88,18 @@ exec("/usr/bin/grep -vi warning /tmp/PHP_errors.log", $php_errors); ?> - - + -
+
+
+
+ +
+
+ +
+ - - - - - +
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/csrf/csrf-secret.php b/usr/local/www/csrf/csrf-secret.php new file mode 100644 index 000000000..a1331841f --- /dev/null +++ b/usr/local/www/csrf/csrf-secret.php @@ -0,0 +1 @@ + - - + + -
- loader -

 

-
- - - - - - - - -
- - - - - - - - - - - - - - - - -
- {$mac_man[$mac_hi]}"; } - ?> - - -
-

.
- - - - - + + +
+
+ +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + +
+ + + + + +
+ +
+ 		+ + + + + +
+ +
+ 		+ + + + + +
+ +
+ 		+ + + + + +
+ +
+
{$mac_man[$mac_hi]}"; } + ?>
+ +
. + +
+ +
+
+ +
+ +
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_authentication.php b/usr/local/www/diag_authentication.php index 5fd0abdc6..7f5673cae 100644 --- a/usr/local/www/diag_authentication.php +++ b/usr/local/www/diag_authentication.php @@ -68,65 +68,76 @@ if ($_POST) { } $pgtitle = array(gettext("Diagnostics"),gettext("Authentication")); $shortcut_section = "authentication"; + include("head.inc"); ?> - + - + - - - - - - -
-
-
- - - - - - - - - - - - - - - - - -
- -
- -
- -
  - " /> -
-
+
+
+
+
+ + + +
+
+ +
+

Test a server

+
+ +
+
+ + + + + + + + + + + + + + + + + + + +
+
 " />
+ + +
+
+ +
+
+ +
+
-
+ + - - - + \ No newline at end of file diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index 1b67fee8e..73d4acf6c 100644 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -582,12 +582,14 @@ $mth = ini_get('upload_progress_meter.store_method'); $dir = ini_get('upload_progress_meter.file.filename_template'); $pgtitle = array(gettext("Diagnostics"),gettext("Backup/restore")); + include("head.inc"); ?> - + + - +
@@ -627,152 +629,225 @@ function backuparea_change(obj) { " . gettext("The firewall is now rebooting."));?>
+ +
- - - - - - - -
- -
-
- - - - - - - - - - - - - - - - - + + + + + +
  -



- - - - - -
- - - -
- - - - - - - - - -
- - - -
- - - -
- - - - - - - - - -
- - - -
- - - -
-

" />

-
 
  - +
+
+
+ + + +
+ + + + + +
+ +
+ +
+ +
+
+ +
+

Backup configuration

+
+ +
+
+ + + + + + + + + + +



+ + + + + +
+ + + +
+ + + + + + + + + +
+ + + +
+ + + +
+ + + + + + + + + +
+ + + +
+ + + +
+

" />

+ + +
+
+ +
+ +
+
+ +
+
+ +
+

+
+ +
+
+ + + + - - - - - - - - - - - - - -



- -

- - - - - -
- - - -
- - - - - - - - - -
- - - -
- - - -
-

" />

-



-
 
  - -



- " /> -
-
- - -



- " /> - -

-
+

+ +

+ + + + + +
+ + + +
+ + + + + + + + + +
+ + + +
+ + + +
+

" />

+



+ + +
+
+ + + + + + + + + +
+
+ +
+

+
+ +
+
+ + + + + + +
+ + +



+ " /> +
+
+ + +



+ " /> + +

+ +
+
+ +
+ +
+
+ + + + + + + + + -
+ + + +
- - - + + - + - - - - - - - - -
-
- - - - - - - - - - - - - - - - - -
- -
-
-
- + +
+
+
+ +
+ + - -
- - - - - - - + + +
+
+
+

+
+ +
+ +
+ +
  + +
+ +
+ +
- : -
-
: - - " /> - - " /> - -
: - -
" /> -
+ + + + + + +
+
+ + + + + + + + +
+
+ +
+

+
+ +
+ + : +
+
: + + " /> + + " /> + +
: + +
" /> + +
+
+
+ + + + +
+
+
+ +
+

Config history

+
+ +
+ +
+ + + + + + + + + +
" />
+ +
+
+
+
+
+ + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
+ +
+ + + + + +   + + + "> + " > + "> +
+ + " /> + +
+
+
+ + + + + + + + + + + + + + -
  - - - - " />
  - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -

-
" /> 
- -
- - - - - -   - - - - <?=gettext(" title="" /> - - - <?=gettext(" title="" /> - - - <?=gettext(" title="" /> - -
" />
- -
-
- - - - - - - + + + \ No newline at end of file diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php index 9b50b1c07..ab725e4e3 100755 --- a/usr/local/www/diag_defaults.php +++ b/usr/local/www/diag_defaults.php @@ -54,36 +54,54 @@ include("head.inc"); ?> - + + - -
-
-
- -
-

-
    -
    • -
    • -
    • -
    • -
    • -
    • -
  • ''
    • -
-

-

- " /> - " /> -

-
- - - - + +
+
+
+
+ + + 
+			
+
+ + + +
+

+
    +
    • +
    • +
    • +
    • +
    • +
    • +
  • ''
    • +
+

+ + +
+ " /> + " /> +
+

+ +
+ + +
+
+
+
+ + + \ No newline at end of file diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php index 21a903541..c900baad3 100644 --- a/usr/local/www/diag_dns.php +++ b/usr/local/www/diag_dns.php @@ -169,116 +169,111 @@ function display_host_results ($address,$hostname,$dns_speeds) { } include("head.inc"); ?> - + - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- -  =  - - "") { - echo $hostitem . "
"; - $found++; - } - } - } else { - echo $resolved; - } - if($found > 0) { ?> -
- - An alias already exists for the hostname .
- - - - - - Alias created with name - - -
-
- - - - - - - - - - - -
- - - -
- - - -
-
-
- -

-

-
- -

-
  -
  - " /> -
-
-
- - - +
+
+
+ +
+
+
+ + + +
+

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ "") { + echo $hostitem . "
"; + $found++; + } + } + } else { + echo $resolved; + } + ?> + 		+ 0): ?> + + An alias already exists for the hostname .
+ + + + + + + Alias created with name + +
+ + + + + + + + + + + + +
+ + + +
+

+ +

+

+
+ +

+
+
+ + " /> +
+ +
+
+ +
+ +
+
\ No newline at end of file diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php index 40ab24bbb..fc373bc30 100755 --- a/usr/local/www/diag_dump_states.php +++ b/usr/local/www/diag_dump_states.php @@ -73,7 +73,7 @@ include("head.inc"); ?> -"> +"> - - - - - - - -
- -
-
- - - - - - - - - - - - -
- - - - - - -
- : - - - - " /> - - " /> - -
- -
- - - - - - - - - - - -= 10000) - break; - - $line_split = preg_split("/\s+/", $line); - - $iface = array_shift($line_split); - $proto = array_shift($line_split); - $state = array_pop($line_split); - $info = implode(" ", $line_split); - - // We may want to make this optional, with a large state table, this could get to be expensive. - $iface = convert_real_interface_to_friendly_descr($iface); - - /* break up info and extract $srcip and $dstip */ - $ends = preg_split("/\?/", $info); - $parts = explode(":", $ends[0]); - $srcip = trim($parts[0]); - $parts = explode(":", $ends[count($ends) - 1]); - $dstip = trim($parts[0]); - -?> - - - - - - - - - - - - - -
Router -> Destination");?>
- -
- -
-
- - : - -
- - +
+
+
+ +
+ + + +
+ +
+ +
+ + +
+ +
+ + + + + + + + + + + + +
: " /> + + " /> + +
+ + +
+
+ +
+ +
+ +
+ + + + + + + + + + = 10000) + break; + + $line_split = preg_split("/\s+/", $line); + + $iface = array_shift($line_split); + $proto = array_shift($line_split); + $state = array_pop($line_split); + $info = implode(" ", $line_split); + + // We may want to make this optional, with a large state table, this could get to be expensive. + $iface = convert_real_interface_to_friendly_descr($iface); + + /* break up info and extract $srcip and $dstip */ + $ends = preg_split("/\?/", $info); + $parts = explode(":", $ends[0]); + $srcip = trim($parts[0]); + $parts = explode(":", $ends[count($ends) - 1]); + $dstip = trim($parts[0]); + + ?> + + + + + + + + + + + + + +
+ + + + + +
+ +
+ 		+ + + + + +
+ +
+ 		+ + + + + +
Router -> Destination");?> + +
+ 		+ + + + + +
+ +
+
+ + + +
+ +
+ + +

:

+ + +
+
+
+ +
+
+
+
-
+ + - - - + + \ No newline at end of file diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index 9c77b187a..e4d624856 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -80,373 +80,380 @@ $status = ipsec_smp_dump_status(); ?> -"> + + + -
- - - - - - + + + + + + + + + + + + + + + $ikesa) { + $con_id = substr($ikesa['peerconfig'], 3); + $ipsecconnected[$con_id] = $con_id; + + if (ipsec_phase1_status($status['query']['ikesalist']['ikesa'], $ikesa['id'])) { + $icon = "pass"; + } elseif(!isset($config['ipsec']['enable'])) { + $icon = "block"; + } else { + $icon = "reject"; + } + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- -
-
- - - - - - - - - - - - - - - - - $ikesa) { - $con_id = substr($ikesa['peerconfig'], 3); - $ipsecconnected[$con_id] = $con_id; - if (ipsec_phase1_status($status['query']['ikesalist']['ikesa'], $ikesa['id'])) { - $icon = "pass"; - } elseif(!isset($config['ipsec']['enable'])) { - $icon = "block"; - } else { - $icon = "reject"; - } -?> - - - - - - - - - - - - - - - - - -
- - - - - Port:' . htmlspecialchars($ikesa['local']['port']); - else - echo 'Unknown'; - if ($ikesa['local']['nat'] != 'false') - echo " NAT-T"; - } - ?> - - {$identity}"; - } else { - if (empty($identity)) - echo "Unknown"; - else - echo $identity; - } - } - ?> - - Port:' . htmlspecialchars($ikesa['remote']['port']); - else - echo 'Unknown'; - if ($ikesa['remote']['nat'] != 'false') - echo " NAT-T"; - } - ?> - - IKEv -
- +
+
+
+ + + +
+ + -
- - - "; - echo htmlspecialchars($ikesa['intalg']); - echo "
"; - echo htmlspecialchars($ikesa['prfalg']); - echo "
"; - echo htmlspecialchars($ikesa['dhgroup']); - ?> - 		-
- -
-
-
- 		- -
- - Connect VPN - -
- -
- - Disconnect VPN - - - Disconnect VPN Connection - -
- - 		- -
-
-
- - Show child SA entries -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -

- +

+ + + + + Port:' . htmlspecialchars($ikesa['local']['port']); + else + echo 'Unknown'; + if ($ikesa['local']['nat'] != 'false') + echo " NAT-T"; + } + ?> + + {$identity}"; + } else { + if (empty($identity)) + echo "Unknown"; + else + echo $identity; + } + } + ?> + + Port:' . htmlspecialchars($ikesa['remote']['port']); + else + echo 'Unknown'; + if ($ikesa['remote']['nat'] != 'false') + echo " NAT-T"; + } + ?> + + IKEv +
+ + + 		+ + + "; + echo htmlspecialchars($ikesa['intalg']); + echo "
"; + echo htmlspecialchars($ikesa['prfalg']); + echo "
"; + echo htmlspecialchars($ikesa['dhgroup']); + ?> + 		+
+ +
+
+
+ 		+ +
+ + Connect VPN + +
+ +
+ + Disconnect VPN + + + Disconnect VPN Connection + +
+ + 		+ +
+
+
+ - Show child SA entries +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ +
Disconnected +
+ 		+
+ + Connect VPN + +
+ 		+ +
+
+ +

+
here.

- + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/usr/local/www/diag_ipsec_leases.php b/usr/local/www/diag_ipsec_leases.php index 571259ddd..7d348ecf0 100644 --- a/usr/local/www/diag_ipsec_leases.php +++ b/usr/local/www/diag_ipsec_leases.php @@ -49,82 +49,77 @@ include("head.inc"); $mobile = ipsec_dump_mobile(); ?> + - - - - - - - - - -
- -
-
- - - - - - - 0): ?> - - - - - - - - - - - - - - - - - - -
- -
-
-

-
- - - - - - -
+ + +
+
+
+ + + +
+ + + +
+
+ +
+ + + + + + + + + 0): ?> + + + + + + + + + + + + + + + + + + +
+ +
+
+

+
+ +

-
- -
-
+ + + +

+
+ +

+ + + + + + -

-
 - -

- - - - + \ No newline at end of file diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index 001f5256e..846d27d12 100644 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -54,68 +54,71 @@ $sad = ipsec_dump_sad(); ?> - - - - - - - - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-

-
-
-
+ -

-
 - -

+ - - - +
+
+
+ + + +
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

+
+
+ + +

+
+ +

+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index 34f2566cb..d5f1b9039 100644 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -53,85 +53,87 @@ include("head.inc"); $spd = ipsec_dump_spd(); ?> - - - - - - - - - -
- -
-
- - - - - - - - - - - - - - - - - - - - -
- direction - -> - -
-
- - - - - - - - - - - - - - - - - -
in
out
-

-
-
-
+ -

-
 - -

+ - - - +
+
+
+ + + +
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ direction + -> + +
+
+ + + + + + + + + + + + + + + + + +
in
out
+

+
+
+ + +

+
+ +

+
+
+
+
+
+
+ + diff --git a/usr/local/www/diag_ipsec_tabs.php b/usr/local/www/diag_ipsec_tabs.php new file mode 100644 index 000000000..c50adc7b8 --- /dev/null +++ b/usr/local/www/diag_ipsec_tabs.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/usr/local/www/diag_limiter_info.php b/usr/local/www/diag_limiter_info.php index b6c0ecc7d..1d0960bb3 100644 --- a/usr/local/www/diag_limiter_info.php +++ b/usr/local/www/diag_limiter_info.php @@ -61,7 +61,7 @@ if($_REQUEST['getactivity']) { include("head.inc"); ?> - + -
-"; - print_info_box($savemsg); - echo "
"; - } - if ($input_errors) - print_input_errors($input_errors); -?> - - - - -
- - - - -
- - -
-
- -
-
-
-
- - - - + + + +
+
+
+
+ + "; + print_info_box($savemsg); + echo "
"; + } + if ($input_errors) + print_input_errors($input_errors); + ?> + +
+ +
+
+ + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 74d01b17d..fc4b919dd 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -67,71 +67,52 @@ include("head.inc"); ?> - + + - - - - - - - - - -
- -
- -
-
- - - - - - - - - -
-
- " /> -
- 		-
+ +
+
+
+ + + +
+ + + +
+
+ + + + + +
+ + +
+
+ + + " /> + + +
- " /> + " />
-
-
-
- - - + + + + + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 8983d7d3e..8b46de067 100644 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -57,42 +57,37 @@ include("head.inc"); ?> - + + - - - - - -
- -
-
- - - - - - -
-

- "/>
-
-
- - - \ No newline at end of file + +
+
+
+ + + +
+ + + + + +
+
+ +

+
+ +
+ " /> +
+ +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index f6b70602b..caaf4e91c 100644 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -62,43 +62,36 @@ include("head.inc"); ?> - + - - - - - -
- -
-
- - - - - - - -
-

- " />
NOTE: Clearing the log file will restart the DHCP daemon.
-
-
- - - + +
+
+
+ + + +
+ + + + + +
+
+ +

+
+ +
+ " /> +
+

NOTE: Clearing the log file will restart the DHCP daemon.

+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 5595fc668..c3a162796 100644 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -124,301 +124,298 @@ $shortcut_section = "firewall"; include("head.inc"); ?> - + + + + + - - - - - - + +
- -
- -
-
- " summary="main area"> - - - - - - - - - - - - - - - - - - - - - - - - ".find_rule_by_number_buffer($filterent['rulenum'],$filterent['tracker'],$filterent['act']).""); +
+
+
- $int = strtolower($filterent['interface']); - $proto = strtolower($filterent['proto']); - if($filterent['version'] == '6') { - $ipproto = "inet6"; - $filterent['srcip'] = "[{$filterent['srcip']}]"; - $filterent['dstip'] = "[{$filterent['dstip']}]"; - } else { - $ipproto = "inet"; - } - - $srcstr = $filterent['srcip'] . get_port_with_service($filterent['srcport'], $proto); - $src_htmlclass = str_replace(array('.', ':'), '-', $filterent['srcip']); - $dststr = $filterent['dstip'] . get_port_with_service($filterent['dstport'], $proto); - $dst_htmlclass = str_replace(array('.', ':'), '-', $filterent['dstip']); - ?> -
- - - - - - - - - - - - - - - - - - -
-
"> -
- - - - - - - - - - - - - - - - - - - - - -
-
-
- /> Pass
- /> Block
-
- 		-
-
- 		-
-
- 		-
-
- 		-
-
- 		-
-
-
-
-
- 		-
-
- 		-
-
- 		-
-
- 		-
" />
-
- ', '');?>   -    -
-
-
-
"> -
- - - - - - - - - - - -
-
-
- -
- 		-
-
- 		-
-
- 		-
 
-
" />
-
- ', '');?>   -
-
-
- -
" class="listtopic"> - -
-
- ', outputrule);"> - <?php echo $filterent['act'] .'/'. $filterent['tracker'];?> -
- - Direction=OUT - - - ');" title="" class="ICON-" border="0" src="/themes//images/icons/icon_log.gif" alt="Icon Reverse Resolve with DNS"/> - " title="" onclick="return confirm('')"> - Icon Easy Rule: Add to Block List - ';?> - - ');" title="" class="ICON-" border="0" src="/themes//images/icons/icon_log.gif" alt="Icon Reverse Resolve with DNS"/> - " title="" onclick="return confirm('')"> - Icon Easy Rule: Pass this traffic - ';?> -
-
-
-
- " /> -
-
+ + +
+ + + +
+
+ + + + +
+ +
"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ActionTime and interfaceSource and destination IP AddressSource and destination portProtocolProtocol
+ +
+ + " />
+
+ +
+
+
+
+ + + + +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + ".find_rule_by_number_buffer($filterent['rulenum'],$filterent['tracker'],$filterent['act']).""); + + $int = strtolower($filterent['interface']); + $proto = strtolower($filterent['proto']); + if($filterent['version'] == '6') { + $ipproto = "inet6"; + $filterent['srcip'] = "[{$filterent['srcip']}]"; + $filterent['dstip'] = "[{$filterent['dstip']}]"; + } else { + $ipproto = "inet"; + } + + $srcstr = $filterent['srcip'] . get_port_with_service($filterent['srcport'], $proto); + $src_htmlclass = str_replace(array('.', ':'), '-', $filterent['srcip']); + $dststr = $filterent['dstip'] . get_port_with_service($filterent['dstport'], $proto); + $dst_htmlclass = str_replace(array('.', ':'), '-', $filterent['dstip']); + ?> + + + + + + + + + + + + + + + + + +
" class="listtopic"> + +
+ ', outputrule);" title=""> + + Direction=OUT + + + ');" title="" class="ICON-" border="0" src="/themes//images/icons/icon_log.gif" alt="Icon Reverse Resolve with DNS"/> + " title="" onclick="return confirm('')"> + Icon Easy Rule: Add to Block List + ';?> + + ');" title="" class="ICON-" border="0" src="/themes//images/icons/icon_log.gif" alt="Icon Reverse Resolve with DNS"/> + " title="" onclick="return confirm('')"> + Icon Easy Rule: Pass this traffic + ';?> +
+
+
+
+
+ + +
+ " /> +
+ +

TCP Flags: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, W - CWR

+ + + + + + - - - + -

TCP Flags: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, W - CWR

- - - - - + + \ No newline at end of file diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index 02ec32e2b..dfbeea7a8 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -63,7 +63,7 @@ $shortcut_section = "firewall"; include("head.inc"); ?> - + - - - - - - - -
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ; -
- ', outputrule);"> - <?php echo $filterent['act'];?> - -
-
-
-

: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR

- - - + + +
+
+
+ + + +
+ + + +
+
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ .      +
+ ', outputrule);" title=""> + +
+
+ +

: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR

+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index e4c11e2a8..2a2022d3a 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -164,7 +164,7 @@ foreach ($filterlog as $fe) { } include("head.inc"); ?> - + @@ -181,56 +181,40 @@ include("head.inc"); ?> - - - - - - - -
- -
- -
-
- -
-
- +
+
+
+ + + +
+ + + +
+
+ + + + +


+

-
"; - stat_block($summary, $field , $entriesperblock); - echo "

"; -} -?> -
+ 
+							
";
+								stat_block($summary, $field , $entriesperblock);
+								echo "

";
+							}
+							?>
+
+
+ + + -
- - - + + diff --git a/usr/local/www/diag_logs_gateways.php b/usr/local/www/diag_logs_gateways.php index df1d25d99..28b43c465 100755 --- a/usr/local/www/diag_logs_gateways.php +++ b/usr/local/www/diag_logs_gateways.php @@ -69,71 +69,52 @@ include("head.inc"); ?> - + + - - - - - - - - - -
- -
- -
-
- - - - - - - - - -
-
- " /> -
- 		-
+ +
+
+
+ + + +
+ + + +
+
+ + + + + +
+ + +
+
+ + + " /> + + +
" />
-
-
-
- - - + + + + + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 79b63a916..a5c41f1de 100644 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -62,59 +62,53 @@ $shortcut_section = "ipsec"; include("head.inc"); ?> - + + + - - - - - - - -
- -
-
- - - - - \n"; - $entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3))); - echo "\n"; - echo "\n"; - echo "\n"; - } - ?> - - - -
" . $entry_date_time . "" . $logent[4] . " " . $logent[5] . "
-
-
- " /> -
-
+ +
+
+
+ + + +
+ + + + + +
+
+ +

+ +
+ + \n"; + $entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3))); + echo "\n"; + echo "\n"; + echo "\n"; + } + ?> +
" . $entry_date_time . "" . $logent[4] . " " . $logent[5] . "
+
+ +
+ " /> +
+ +
+
+
-
- - - + + + + \ No newline at end of file diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index b8ab79608..43025c6dc 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -57,45 +57,42 @@ include("head.inc"); ?> - + + - - - - - -
- -
-
- - - - - - -
-

-
- " /> -
-
-
-
- - - + +
+
+
+ + + +
+ + + + + +
+
+ +

+ +
+ + +
+
+ +
+ " /> +
+ +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index 56dcf518b..790bcf1ac 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -60,49 +60,43 @@ if ($_POST['clear']) include("head.inc"); ?> - + + + - - - - - - - -
- -
-
- - - - - - - - -
-
-
- " /> -
-
+ +
+
+
+ + + +
+ + + + + +
+
+ +

+ +
+ + +
+
+ +
+ " /> +
+ +
+
+
-
- - - + + + + \ No newline at end of file diff --git a/usr/local/www/diag_logs_pills.php b/usr/local/www/diag_logs_pills.php new file mode 100644 index 000000000..a15432b39 --- /dev/null +++ b/usr/local/www/diag_logs_pills.php @@ -0,0 +1,49 @@ + + +
    +
  • class="active">
    • +

\ No newline at end of file diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php index e9b3279ab..0d5a6ca16 100644 --- a/usr/local/www/diag_logs_ppp.php +++ b/usr/local/www/diag_logs_ppp.php @@ -58,49 +58,43 @@ $pgtitle = array(gettext("Status"),gettext("System logs"),gettext("PPP")); include("head.inc"); ?> - + + + - - - - - - - -
- -
-
- - - - - - - - -
-
-
- " /> -
-
+ +
+
+
+ + + +
+ + + + + +
+
+ +

+ +
+ + +
+
+ +
+ " /> +
+ +
+
+
-
- - - + + + + \ No newline at end of file diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index b7430d220..64d182368 100644 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -58,42 +58,43 @@ include("head.inc"); ?> - + + + - - - - - -
- -
-
- - - - - - -
-

-" />
-
-
- - - + +
+
+
+ + + +
+ + + + + +
+
+ +

+ +
+ + +
+
+ +
+ " /> +
+ +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_logs_resolver.php b/usr/local/www/diag_logs_resolver.php index f083c88a7..de1fa4321 100755 --- a/usr/local/www/diag_logs_resolver.php +++ b/usr/local/www/diag_logs_resolver.php @@ -69,71 +69,52 @@ include("head.inc"); ?> - + + - - - - - - - - - -
- -
- -
-
- - - - - - - - - -
-
- " /> -
- 		-
+ +
+
+
+ + + +
+ + + +
+
+ + + + + +
+ + +
+
+ + + " /> + + +
" />
-
-
-
- - - + + + + + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_logs_routing.php b/usr/local/www/diag_logs_routing.php index 0168e3c41..b24868f0e 100644 --- a/usr/local/www/diag_logs_routing.php +++ b/usr/local/www/diag_logs_routing.php @@ -57,54 +57,42 @@ include("head.inc"); ?> - + + - - - - - - - -
- -
- -
-
- - - - - - -
-

-" />
-
-
- - - + +
+
+
+ + + +
+ + + +
+
+ + + + + +
+ + +
+
+ +
+ " /> +
+ +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 805c7e3c8..7b87cd67f 100644 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -254,233 +254,232 @@ function check_everything() { //]]> - + -
- - - - - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Forward/Reverse Display /> -
GUI Log Entries to Display -
-
Log File Size (Bytes) -
- -

- - - . - . -
Log Firewall Default Blocks - /> -
- -
- /> -
- -
- /> -
-
- /> -
-
Web Server Log /> -
-
Raw Logs /> -
-
Filter descriptions - - -
- -
Local Logging onclick="enable_change(false)" /> - -
Reset Logs - " onclick="return confirm('')" /> -

- -
 
- -
- - -

- -
- -
- -
onclick="enable_change(false)" /> -
- - - - - - - - - - - - - - - - - -
 
-
- onclick="check_everything();" /> -

- /> -
- /> -
- /> -
- /> -
- /> -
- /> -
- /> -
- /> -
-
  " onclick="enable_change(true)" /> -
 
- . -
-
-
-
+ +
+
+
+ + + + +
+ + + +
+
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Forward/Reverse Display /> +
GUI Log Entries to Display +
+
Log File Size (Bytes) +
+ +

+ + + . + . +
Log Firewall Default Blocks + /> +
+ +
+ /> +
+ +
+ /> +
+
+ /> +
+
Web Server Log /> +
+
Raw Logs /> +
+
Filter descriptions + + +
+ +
Local Logging onclick="enable_change(false)" /> + +
Reset Logs + " onclick="return confirm('')" /> +

+ +
 
+ +
+ + +

+ +
+ +
+ +
onclick="enable_change(false)" /> +
+ + + + + + + + + + + + + + + + + +
 
+
+ onclick="check_everything();" /> +

+ /> +
+ /> +
+ /> +
+ /> +
+ /> +
+ /> +
+ /> +
+ /> +
+
  " onclick="enable_change(true)" /> +
 
+ . +
+
+
+
+
+
+
+
+
- - - + diff --git a/usr/local/www/diag_logs_tabs.php b/usr/local/www/diag_logs_tabs.php new file mode 100644 index 000000000..9b142b08d --- /dev/null +++ b/usr/local/www/diag_logs_tabs.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index d618a5029..8f07213de 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -117,78 +117,57 @@ function dump_clog_vpn($logfile, $tail) { include("head.inc"); ?> - + + + + - - - - - - -
- -
- -
-
- - - - - - - - - - - - - -
-
-
- - - " /> -
-
- - - + +
+
+
+ + + +
+ + + +
+
+ + + + + +
+ + + + + + + + + + +
+
+ +
+ + + " /> +
+ + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_logs_wireless.php b/usr/local/www/diag_logs_wireless.php index aa5593685..b7ad12c95 100644 --- a/usr/local/www/diag_logs_wireless.php +++ b/usr/local/www/diag_logs_wireless.php @@ -59,54 +59,43 @@ include("head.inc"); ?> - + + - - - - - - - -
- -
- -
-
- - - - - - -
-

-" />
-
-
- - - + +
+
+
+ + + +
+ + + +
+
+ + + + + +
+ + +
+
+ +
+ " /> +
+ + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_ndp.php b/usr/local/www/diag_ndp.php index 2a290d428..5e11c40b2 100644 --- a/usr/local/www/diag_ndp.php +++ b/usr/local/www/diag_ndp.php @@ -109,14 +109,10 @@ include("head.inc"); ?> - + -
- loader -

 

-
- - - - -
- - - - - - - - - - - - - - - - -
- {$mac_man[$mac_hi]}"; } - ?> - - - - -
-
- +
+
+ +
+ +
+
+ +
+ + + + + + + + + - - - + + + + + + + + + +
+ + + + + +
+ +
+ 		+ + + + + +
+ +
+ 		+ + + + + +
+ +
+ 		+ + + + + +
+ +
+
+ {$mac_man[$mac_hi]}"; } + ?> + + + + +
+ +
+ +
+
+ +
+ +
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index 38cb8c274..6e743fd2e 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -221,253 +221,286 @@ if ($_POST) { include("head.inc"); ?> - + - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- /> -
-
: -
- -
-
- -
-
- -
-
-
-
- -
-
-
- -
-
- -
" . gettext("Enter 0 (zero) for no count limit.");?> -
- -
" . +
+
+
+ +
+
+ + + +
+

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + +
+ +

+
+ /> +

+
:

+
+ +

+
+ +

+
+ +

+
+
+

+
+ + +

+
+ +

+
+ +

" . gettext("Enter 0 (zero) for no count limit.");?>

+
+ +

" . gettext("Note:") . " " . - gettext("This option does not affect the level of detail when downloading the packet capture.");?> -

- /> -
-
: -
  + gettext("This option does not affect the level of detail when downloading the packet capture.");?>

+
+ /> +

+
:

+
  +  "; + else { + echo " "; + } + if (file_exists($fp.$fn) and $processisrunning != true) { + echo " "; + echo ""; + echo "
" . gettext("The packet capture file was last updated:") . " " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)); + } + ?> +
+ +
+
+
+ + +  "; - else { - echo " "; - } - if (file_exists($fp.$fn) and $processisrunning != true) { - echo " "; - echo ""; - echo "
" . gettext("The packet capture file was last updated:") . " " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)); - } -?> -
- - - - - -
-"; - if ($processisrunning == true) - echo("" . gettext("Packet Capture is running.") . "
"); +if ($do_tcpdump) { + $matches = array(); - if ($do_tcpdump) { - $matches = array(); + if (in_array($fam, $fams)) + $matches[] = $fam; - if (in_array($fam, $fams)) - $matches[] = $fam; + if (in_array($proto, $protos)) { + $matches[] = fixup_not($proto); + } - if (in_array($proto, $protos)) { - $matches[] = fixup_not($proto); - } + if ($port != "") + $matches[] = "port ".fixup_not($port); - if ($port != "") - $matches[] = "port ".fixup_not($port); - - if ($host != "") { - $hostmatch = ""; - $hostcount = 0; - foreach ($hosts as $h) { - $h = fixup_host($h, $hostcount++); - if (!empty($h)) - $hostmatch .= " " . $h; - } - if (!empty($hostmatch)) - $matches[] = "({$hostmatch})"; - } - - if ($count != "0" ) { - $searchcount = "-c " . $count; - } else { - $searchcount = ""; - } - - $selectedif = convert_friendly_interface_to_real_interface_name($selectedif); - - if ($action == gettext("Start")) { - $matchstr = implode($matches, " and "); - echo("" . gettext("Packet Capture is running.") . "
"); - $cmd = "/usr/sbin/tcpdump -i {$selectedif} {$disablepromiscuous} {$searchcount} -s {$snaplen} -w {$fp}{$fn} " . escapeshellarg($matchstr); - // Debug - //echo $cmd; - mwexec_bg ($cmd); - } else { - //action = stop - echo("" . gettext("Packet Capture stopped.") . "

" . gettext("Packets Captured:") . "
"); -?> - - - -   -
-
+ if (!empty($hostmatch)) + $matches[] = "({$hostmatch})"; + } + + if ($count != "0" ) { + $searchcount = "-c " . $count; + } else { + $searchcount = ""; + } + + $selectedif = convert_friendly_interface_to_real_interface_name($selectedif); + + if ($action == gettext("Start")) { + $matchstr = implode($matches, " and "); + $title = gettext("Packet Capture is running."); + + $cmd = "/usr/sbin/tcpdump -i {$selectedif} {$disablepromiscuous} {$searchcount} -s {$snaplen} -w {$fp}{$fn} " . escapeshellarg($matchstr); + // Debug + //echo $cmd; + mwexec_bg ($cmd); + } else { + $show_data = true; + //action = stop + $title = gettext("Packet Capture stopped.") . " " . gettext("Packets Captured:"); + } +} + +if (!empty($title)): ?> + +
+
+
+

+
+ +
+ + + 

+
+ + +
+ +
+
+ + + + + + + - - diff --git a/usr/local/www/diag_pf_info.php b/usr/local/www/diag_pf_info.php index de5766798..624ebb91f 100644 --- a/usr/local/www/diag_pf_info.php +++ b/usr/local/www/diag_pf_info.php @@ -58,7 +58,7 @@ if($_REQUEST['getactivity']) { include("head.inc"); ?> - + -
-"; - print_info_box($savemsg); - echo "
"; - } - if ($input_errors) - print_input_errors($input_errors); -?> - - - - -
- - - - -
- - -
-
- -
-
-
-
- - - - + + +
+
+
+
+ + + "; + print_info_box($savemsg); + echo "
"; + } + if ($input_errors) + print_input_errors($input_errors); + ?> + +
+ +
+ +
+ + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php index d74feacee..860277302 100644 --- a/usr/local/www/diag_ping.php +++ b/usr/local/www/diag_ping.php @@ -83,34 +83,42 @@ if (!isset($do_ping)) { } include("head.inc"); ?> - + - - -
- -
- - - - - - - - - - - - - - - - -
-
- + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + +
-
-
-
-
-
  - " /> -
- "; - echo "" . gettext("Ping output") . ":
"; -?> - -"; - $ifscope = ''; - $command = "/sbin/ping"; - if ($ipproto == "ipv6") { - $command .= "6"; - $ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ipv6($sourceip); - if (is_linklocal($ifaddr)) - $ifscope = get_ll_scope($ifaddr); - } else { - $ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ip($sourceip); - } - if ($ifaddr && (is_ipaddr($host) || is_hostname($host))) { - $srcip = "-S" . escapeshellarg($ifaddr); - if (is_linklocal($host) && !strstr($host, "%") && !empty($ifscope)) - $host .= "%{$ifscope}"; - } +
 " />
+ + + + + + + + +
+ - $cmd = "{$command} {$srcip} -c" . escapeshellarg($count) . " " . escapeshellarg($host); - //echo "Ping command: {$cmd}\n"; - system($cmd); - echo(' '); - } - ?> -
  
- -
- - - +
+ +
+

+
+ +
+ 
+		
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php index b1d65cbcd..46a696638 100755 --- a/usr/local/www/diag_pkglogs.php +++ b/usr/local/www/diag_pkglogs.php @@ -84,55 +84,58 @@ $pgtitle = array(gettext("Status"),gettext("Package logs")); include("head.inc"); ?> - + - - -
-
'; - include("fend.inc"); - exit; - } - $tab_array = array(); - foreach($config['installedpackages']['package'] as $package) { - if(is_array($package['logging'])) { - if(!($logtab = $package['logging']['logtab'])) $logtab = $package['name']; - if($apkg == $package['name']) { - $curtab = $logtab; - $tab_array[] = array(sprintf(gettext("%s"),$logtab), true, "diag_pkglogs.php?pkg=".$package['name']); - } else { - $tab_array[] = array(sprintf(gettext("%s"),$logtab), false, "diag_pkglogs.php?pkg=".$package['name']); - } - } - } - display_top_tabs($tab_array); - ?> - - - -
- - - - - -
-
- + + +
+
+
+ + + +
+ + + +
+ + +
+ + + +
+
+ + +
+
+ +
- - - - - - +
+ + \ No newline at end of file diff --git a/usr/local/www/diag_resetstate.php b/usr/local/www/diag_resetstate.php index bb8af7435..f027bb250 100644 --- a/usr/local/www/diag_resetstate.php +++ b/usr/local/www/diag_resetstate.php @@ -65,72 +65,80 @@ $pgtitle = array(gettext("Diagnostics"), gettext("Reset state")); include("head.inc"); ?> - + + - - -
- - - -
- -
- - - - - - - - - - - - - - - - -
 

- -
-
-
-
-
-
-

-
 

- -
-
-
-
-
-

-
  - " /> -
-
-
- - - + + +
+
+
+ +
+ + + + +
+ +
+ +
+ +
+ + + + + +
+ + + +
+
+
+
+
+
+

+ + +

+ +
+
+
+
+
+

+ + " /> + + +
+
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php index d62e55af9..68447ecf8 100644 --- a/usr/local/www/diag_routes.php +++ b/usr/local/www/diag_routes.php @@ -73,7 +73,7 @@ $shortcut_section = "routing"; include('head.inc'); ?> - + @@ -89,16 +89,17 @@ include('head.inc'); params += "&resolve=true"; if (section == "IPv6") params += "&IPv6=true"; - var myAjax = new Ajax.Request( - url, + var myAjax = $.ajax( + { - method: 'post', - parameters: params, - onComplete: update_routes_callback + url:url, + type: 'post', + data: params, + success: update_routes_callback }); } - function update_routes_callback(transport) { + function update_routes_callback(data, textStatus, transport) { // First line contains section var responseTextArr = transport.responseText.split("\n"); var section = responseTextArr.shift(); @@ -107,7 +108,7 @@ include('head.inc'); var elements = 8; var tr_class = ''; - var thead = '' + section + '<\/strong><\/td><\/tr>' + "\n"; + var thead = ''; for (var i = 0; i < responseTextArr.length; i++) { if (responseTextArr[i] == "") continue; @@ -144,94 +145,118 @@ include('head.inc'); jQuery('#' + section + ' > tbody').html(tbody); } -//]]> - - - -
-
- - - - - - - - - - - - - - - - - -
- /> -
- -
- -
- -
- -
- -
  -" /> -
-
- -
-
+
+
+
+ +
+ + - - - - - - - -
IPv4
- - - - - - - -
IPv6
+
+ +
+

+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + +
/>  +

+
+

+
+ +

+
  + " /> +

+
+
+
+
+ +
+
+ +
+ +
+ +
+

IPv4

+
+ + + + + +
+
+
+ +
+ +
+ +
+

IPv6

+
+ + + + + +
+
+
+
+
+
-
- - - +include('foot.inc'); +?> \ No newline at end of file diff --git a/usr/local/www/diag_smart.php b/usr/local/www/diag_smart.php index 2cbc60bf1..d45f7293f 100644 --- a/usr/local/www/diag_smart.php +++ b/usr/local/www/diag_smart.php @@ -24,45 +24,22 @@ $closehead = false; include("head.inc"); ?> - - + + +
+
+
+ +
+ + - - - - -
- -
- -
- - - - - - - - - - - - - - - - - - -
-
-
-
-
-
-
- -
  - - " class="formbtn" /> -
-
- -
- - - - - - - - - - - - - - - - - - -
-
-
-
-
-
- -
  - - " class="formbtn" /> -
-
- -
- - - - - - - - - - - - - - - - - - -
-
-
-
- -
  - - " class="formbtn" /> -
-
- -
- - - - - - - - - - - - - - -
- -
  - - " class="formbtn" onclick="return confirm('')" /> -
-
+ + + + + +
+ +
+

+
+ +
+
+
+ + + + + + + + + + + + + + + +
+ + + + + +
+
+ +
  + + " /> +
+
+
+
+
+
+ + +
+ +
+ +
+

+
+ +
+
+
+ + + + + + + + + + + + + + + +
+
+ + + + +
+
+ +
  + + " /> +
+
+
+
+
+
+ + +
+ +
+ +
+

+
+ +
+
+
+ + + + + + + + + + + + + + + +
+
+ + +
+
+ +
  + + " /> +
+
+
+
+
+
+ + +
+ +
+ +
+

+
+ +
+
+
+ + + + + + + + + + + +
+ +
  + + " class="btn btn-primary" onclick="return confirm('')" /> +
+
+
+
+
+
' . gettext("Back") . ''; + echo '
' . gettext("Back") . ''; } ?>
" . $ulmsg . "

\n"; ?> - - - +
+
+ + + + + \ No newline at end of file diff --git a/usr/local/www/diag_sockets.php b/usr/local/www/diag_sockets.php index c3008d721..56fc97a62 100644 --- a/usr/local/www/diag_sockets.php +++ b/usr/local/www/diag_sockets.php @@ -46,7 +46,7 @@ $pgtitle = array(gettext("Diagnostics"),gettext("Sockets")); include('head.inc'); ?> - + -
- - - - - - - - - - -
Information about listening sockets for both IPv4 and IPv6.
For explanation about the meaning of the information listed for each socket click here.
To show information about both listening and connected sockets click this.
+
+
+
+ +
+ +

Information about listening sockets for both IPv4 and IPv6.

+

For explanation about the meaning of the information listed for each socket click here.

+

To show information about both listening and connected sockets click this.

+ + +
+ + - - - -
- - $line) { - if ($i == 0) - $class = 'listhdrr'; - else - $class = 'listlr'; - if (trim($line) == "") - continue; - print("\n"); - $j = 0; - foreach (explode(' ', $line) as $entry) { - if ($entry == '' || $entry == "ADDRESS") continue; - if ($i == 0) - print("\n"); - else - print("\n"); - if ($i > 0) - $class = 'listr'; - $j++; - } - print("\n"); - }?> -
$entry$entry
-
+ +
+ +
+ +
+

+
+ + + $line) { + if ($i == 0) + $class = 'listhdrr'; + else + $class = 'listlr'; + + if (trim($line) == "") + continue; + print("\n"); + $j = 0; + foreach (explode(' ', $line) as $entry) { + if ($entry == '' || $entry == "ADDRESS") continue; + if ($i == 0) + print("\n"); + else + print("\n"); + if ($i > 0) + $class = 'listr'; + $j++; + } + print("\n"); + }?> +
$entry$entry
+
+
-
- - - - - - - - - - - - -
Socket information explanation
-This page show the output for the commands: "sockstat -4lL" and "sockstat -6lL".
+
+ +
+ +
+

Socket information explanation

+
+ +
+

This page show the output for the commands: "sockstat -4lL" and "sockstat -6lL".
Or in case of showing all sockets the output for: "sockstat -4" and "sockstat -6".

-The information listed for each socket is:

USER The user who owns the socket.
COMMAND The command which holds the socket.
PID The process ID of the command which holds the socket.
FD The file descriptor number of the socket.
PROTO The transport protocol associated with the socket for Internet sockets, or the type of socket (stream or data-gram) for UNIX sockets.
ADDRESS (UNIX sockets only) For bound sockets, this is the file-name of the socket. For other sockets, it is the name, PID and file descriptor number of the peer, or ``(none)'' if the socket is neither bound nor connected.
LOCAL ADDRESS (Internet sockets only) The address the local end of the socket is bound to (see getsockname(2)).
FOREIGN ADDRESS (Internet sockets only) The address the foreign end of the socket is bound to (see getpeername(2)).
-
- - - +The information listed for each socket is:

+
+ + + + + + + + + + +
USER The user who owns the socket.
COMMAND The command which holds the socket.
PID The process ID of the command which holds the socket.
FD The file descriptor number of the socket.
PROTO The transport protocol associated with the socket for Internet sockets, or the type of socket (stream or data-gram) for UNIX sockets.
ADDRESS (UNIX sockets only) For bound sockets, this is the file-name of the socket.
For other sockets, it is the name, PID and file descriptor number of the peer, or ``(none)'' if the socket is neither bound nor connected.
LOCAL ADDRESS (Internet sockets only) The address the local end of the socket is bound to (see getsockname(2)).
FOREIGN ADDRESS (Internet sockets only) The address the foreign end of the socket is bound to (see getpeername(2)).
+ +
+ + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_states_summary.php b/usr/local/www/diag_states_summary.php index 3c5e297e4..ec7e94180 100644 --- a/usr/local/www/diag_states_summary.php +++ b/usr/local/www/diag_states_summary.php @@ -144,41 +144,49 @@ function build_port_info($portarr, $proto) { } function print_summary_table($label, $iparr, $sort = TRUE) { ?> - -

- - - - - - - - - - $ipinfo) { ?> - - - - - - - - - $protoinfo) { ?> - - - - - - - - - - - -
# #
    
  
+
+
+
+

+
+ +
+ + + + + + + + + + + $ipinfo) { ?> + + + + + + + + + $protoinfo) { ?> + + + + + + + + + + + +
# #
    
  
+
+
"; include("fbegin.inc"); - +?> +
+
+
+ + + + - - - +
+ + + + + \ No newline at end of file diff --git a/usr/local/www/diag_system_activity.php b/usr/local/www/diag_system_activity.php index cc5cc694a..c02c2062d 100644 --- a/usr/local/www/diag_system_activity.php +++ b/usr/local/www/diag_system_activity.php @@ -52,8 +52,10 @@ if($_REQUEST['getactivity']) { include("head.inc"); ?> - + + + -
-"; - print_info_box($savemsg); - echo "
"; - } - if ($input_errors) - print_input_errors($input_errors); -?> - - - - -
- - - - -
- - -
-
- -
-
-
-
- - - - + + +
+
+
+ +
+ + "; + print_info_box($savemsg); + echo "
"; + } + if ($input_errors) + print_input_errors($input_errors); + ?> + +
+ +
+
+ + + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php index 2afcd7b7a..38f5fc70c 100644 --- a/usr/local/www/diag_system_pftop.php +++ b/usr/local/www/diag_system_pftop.php @@ -90,9 +90,9 @@ if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes) } ?> - + -
+ -
-"; - print_info_box($savemsg); - echo "
"; - } - if ($input_errors) - print_input_errors($input_errors); -?> -
- - - - - - - - - -
-
- -
- 		-
- -
- 		-
- -
-
- - - - -
- - - - -
-
-
-
-
+ + +
+
+
+ +
+ + + +
+ + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + + + "; + print_info_box($savemsg); + echo "
"; + } + if ($input_errors) + print_input_errors($input_errors); + ?> + +
+ + +
+ + +
- - - + + + - - + + + \ No newline at end of file diff --git a/usr/local/www/diag_tables.php b/usr/local/www/diag_tables.php index e181c80a0..7fdd0eb12 100644 --- a/usr/local/www/diag_tables.php +++ b/usr/local/www/diag_tables.php @@ -95,8 +95,6 @@ include("head.inc"); - -
- - +
+
+
+ +
-

+ + + + + - - - - - - - - - - - - -
- - - - - delete - - -
" . gettext("No entries exist in this table.") . "  " . " " . gettext(" the latest bogon data."); - else - echo "
" . gettext("No entries exist in this table."); -?> + + +
+
+ +
- 0) - if( ($tablename == "bogons") || ($tablename == "bogonsv6") ) { - $last_updated = exec('/usr/bin/grep -i -m 1 -E "^# last updated" /etc/' . escapeshellarg($tablename)); - echo "
 $count " . gettext("entries in this table.") . "  " . " " . gettext(" the latest bogon data.") . "
" . "$last_updated"; - } - else - echo "
" . gettext("Delete") . " " . gettext("all") . " " . "$count " . gettext("entries in this table."); -?> -
- - - - - + + + + + + + + + + + + +
+ + + + + delete + + +
" . gettext("No entries exist in this table.") . "  " . " " . gettext(" the latest bogon data."); + else + echo "
" . gettext("No entries exist in this table."); + ?> + + 0) + if( ($tablename == "bogons") || ($tablename == "bogonsv6") ) { + $last_updated = exec('/usr/bin/grep -i -m 1 -E "^# last updated" /etc/' . escapeshellarg($tablename)); + echo "
 $count " . gettext("entries in this table.") . "  " . " " . gettext(" the latest bogon data.") . "
" . "$last_updated"; + } + else + echo "
" . gettext("Delete") . " " . gettext("all") . " " . "$count " . gettext("entries in this table."); + ?> +
+
+
+ +
+ + + + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_testport.php b/usr/local/www/diag_testport.php index b04a9d74d..14feacdde 100644 --- a/usr/local/www/diag_testport.php +++ b/usr/local/www/diag_testport.php @@ -99,104 +99,128 @@ if (!isset($do_testport)) { } include("head.inc"); ?> - + - -
- + + + + +
+
+
+ +
+ +




- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -

-
- /> -

-
- -
- -

- -
  - " /> -
- "; - echo "" . gettext("Port Test Results") . ":
"; - ?> - - "; - $result = ""; + + + +
+ +
+

+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+
/> +

+
+
+ +

it will result in an error. For example if you force IPv4 and use a hostname that only returns an AAAA IPv6 IP address, it will not work."); ?>

+
 " />
+
+ +
+ +
+ + + + + + +
+ + +
+ +
+

+
+ +
+ 
+		
+
 					echo htmlspecialchars($result);
 				}
 			}
-			echo ' ' ;
-		}
-		?>
-
- -
- - - + +?> + + + + + + + + + + \ No newline at end of file diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php index cbbc1cb7b..dafc0bb20 100644 --- a/usr/local/www/diag_traceroute.php +++ b/usr/local/www/diag_traceroute.php @@ -47,7 +47,7 @@ $pgtitle = array(gettext("Diagnostics"),gettext("Traceroute")); include("head.inc"); ?> - + - -
- - - - - - - - - - - - -
-
- + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
-
- -
- -
- /> -
- /> -
  - " /> -
- - - -

- - -
+
/>
/>
 " />
+ +

+ +

+ +

+ + + + + + + + + +
+ + +
+ +
+

+
+ +
+ 
+		
 \n";
-	echo "" . gettext("Traceroute output:") . "
\n";
-	ob_end_flush();
+		
+							$useicmp = isset($_REQUEST['useicmp']) ? "-I" : "";
+							$n = isset($resolve) ? "" : "-n";
+						
+							$command = "/usr/sbin/traceroute";
+							if ($ipproto == "ipv6") {
+								$command .= "6";
+								$ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ipv6($sourceip);
+							} else {
+								$ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ip($sourceip);
+							}
+						
+							if ($ifaddr && (is_ipaddr($host) || is_hostname($host)))
+								$srcip = "-s " . escapeshellarg($ifaddr);
+						
+							$cmd = "{$command} {$n} {$srcip} -w 2 {$useicmp} -m " . escapeshellarg($ttl) . " " . escapeshellarg($host);
+						
+							//echo "Traceroute command: {$cmd}\n";
+							system($cmd);
+
 ?>
-	
-";
-	$useicmp = isset($_REQUEST['useicmp']) ? "-I" : "";
-	$n = isset($resolve) ? "" : "-n";
+
+
+
+
+ + + + - $command = "/usr/sbin/traceroute"; - if ($ipproto == "ipv6") { - $command .= "6"; - $ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ipv6($sourceip); - } else { - $ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ip($sourceip); - } - - if ($ifaddr && (is_ipaddr($host) || is_hostname($host))) - $srcip = "-s " . escapeshellarg($ifaddr); - - $cmd = "{$command} {$n} {$srcip} -w 2 {$useicmp} -m " . escapeshellarg($ttl) . " " . escapeshellarg($host); - - //echo "Traceroute command: {$cmd}\n"; - system($cmd); - echo " "; -} ?> -
- - - - + \ No newline at end of file diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php index 17729b64c..6592d64a4 100644 --- a/usr/local/www/edit.php +++ b/usr/local/www/edit.php @@ -94,7 +94,7 @@ outputJavaScriptFileInline("javascript/base64.js"); ?> - + - - -  
-EOF2; - + echo ""; } function verify_gzip_file($fname) { @@ -312,11 +299,11 @@ function print_info_box_np($msg, $name="apply",$value="", $showapply=false) { $nifty_background = "#FFF"; if(stristr($msg, gettext("apply")) != false || stristr($msg, gettext("save")) != false || stristr($msg, gettext("create")) != false || $showapply) { - $savebutton = ""; - $savebutton .= ""; + $savebutton = "
"; + $savebutton .= ""; if($_POST['if']) $savebutton .= ""; - $savebutton.=""; + $savebutton.="
"; } $nifty_redbox = "#990000"; $nifty_blackbox = "#000000"; @@ -334,39 +321,16 @@ function print_info_box_np($msg, $name="apply",$value="", $showapply=false) { } if(!$savebutton) { - $savebutton = ""; + $savebutton = ''; } echo << - - -
- - - - - {$savebutton} - -
-    exclamation - - {$msg} -
-
-
-

 

-
- - - - +
+ +
EOFnp; } @@ -1028,22 +992,23 @@ function display_top_tabs(& $tab_array, $no_drop_down = false) { echo "//]]>\n"; echo ""; } else { - echo "
\n"; echo "\n"; - echo "
    \n"; + echo "
      \n"; $tabscounter = 0; foreach ($tab_array as $ta) { if ($ta[1] == true) { - echo "
    • {$ta[0]}
      • \n"; + echo "
    • {$ta[0]}
      • \n"; } else { - echo "
    • {$ta[0]}
      • \n"; + echo "
    • {$ta[0]}
      • \n"; } $tabscounter++; } - echo "
    \n
\n"; + echo "\n"; } } + + function add_package_tabs($tabgroup, & $tab_array) { global $config, $g; diff --git a/usr/local/www/halt.php b/usr/local/www/halt.php index cd3de11e1..408fd59dd 100755 --- a/usr/local/www/halt.php +++ b/usr/local/www/halt.php @@ -55,22 +55,36 @@ $pgtitle = array(gettext("Diagnostics"),gettext("Halt system")); include('head.inc'); ?> - + - -
-
-
- -
-

-

- " /> - " /> -

-
- - - - + +
+
+
+
+ + + 
+			
+
+ + + +
+

+ +
+ " /> + " /> +
+

+
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc old mode 100755 new mode 100644 index afdee938f..adca9d946 --- a/usr/local/www/head.inc +++ b/usr/local/www/head.inc @@ -8,105 +8,97 @@ $g['theme'] = get_current_theme(); $pagetitle = gentitle( $pgtitle ); ?> - - - - <?php echo($config['system']['hostname'] . "." . $config['system']['domain'] . " - " . $pagetitle); ?> - - - - "; - else: - echo ""; - endif; - ?> + + + + + - - "; ?> - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + \n"; + } + closedir($dh); + } + } + + ?> + + - - \n"; ?> + + + + + \n"; - echo "\t\n"; - } - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - if(file_exists("{$g['www_path']}/javascript/global.js")) - echo "\t\n"; - /* - * Find all javascript files that need to be included - * for this page ... from the arrays ... :) - * Coded by: Erik Kristensen - */ - - $dir = trim(basename($_SERVER["SCRIPT_FILENAME"], '.php')); - $path = "{$g['www_path']}/javascript/" . $dir . "/"; - if (is_dir($path)) { - if ($dh = opendir($path)) { - while (($file = readdir($dh)) !== false) { - if (is_dir($file)) - continue; - echo "\t\n"; - } - closedir($dh); - } - } - -if (!isset($closehead)) - echo ""; - + /* If this page is being remotely managed then do not allow the loading of the contents. */ if($config['remote_managed_pages']['item']) { foreach($config['remote_managed_pages']['item'] as $rmp) { if($rmp == $_SERVER['SCRIPT_NAME']) { - include("fbegin.inc"); + //include("fbegin.inc"); print_info_box_np("This page is currently being managed by a remote machine."); - include("fend.inc"); + //include("fend.inc"); exit; } } } - -?> +?> \ No newline at end of file diff --git a/usr/local/www/ifstats.php b/usr/local/www/ifstats.php index 7be2ace35..a1a6f67f5 100644 --- a/usr/local/www/ifstats.php +++ b/usr/local/www/ifstats.php @@ -47,7 +47,7 @@ $realif = get_real_interface($if); if(!$realif) - $realif = $if; // Need for IPsec case interface. + $realif = $if; // Need for IPSec case interface. $ifinfo = pfSense_get_interface_stats($realif); diff --git a/usr/local/www/index.html b/usr/local/www/index.html new file mode 100644 index 000000000..c919b909d --- /dev/null +++ b/usr/local/www/index.html @@ -0,0 +1,24 @@ + + + +
+ + + +

+ Begin installation +

+ + + +
+ + + diff --git a/usr/local/www/javascript/sorttable.js b/usr/local/www/javascript/sorttable.js index f150e56e7..eb8a72387 100644 --- a/usr/local/www/javascript/sorttable.js +++ b/usr/local/www/javascript/sorttable.js @@ -161,7 +161,7 @@ sorttable = { sortfwdind = document.createElement('span'); sortfwdind.id = "sorttable_sortfwdind"; sortfwdind.innerHTML = stIsIE ? ' 6' : ' ▾'; - this.appendChild(sortfwdind); + //this.appendChild(sortfwdind); // build an array to sort. This is a Schwartzian transform thing, // i.e., we "decorate" each row with the actual sort key, diff --git a/usr/local/www/load_balancer_monitor_edit.php b/usr/local/www/load_balancer_monitor_edit.php index d9ef17506..13e8f1c12 100644 --- a/usr/local/www/load_balancer_monitor_edit.php +++ b/usr/local/www/load_balancer_monitor_edit.php @@ -355,7 +355,7 @@ function updateType(t){   " /> - " onclick="window.location.href=''" /> +i " onclick="window.location.href=''" /> diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index f819fb731..418eb59a7 100644 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -88,7 +88,7 @@ include("head.inc"); - + - - - + \ No newline at end of file diff --git a/usr/local/www/reboot.php b/usr/local/www/reboot.php index 1a9a52ad1..62c5e31fa 100755 --- a/usr/local/www/reboot.php +++ b/usr/local/www/reboot.php @@ -49,23 +49,34 @@ $pgtitle = array(gettext("Diagnostics"),gettext("Reboot System")); include("head.inc"); ?> - + - - - -
-
-
- -
-

-

- " /> - " /> -

-
- - - - + + +
+
+
+
+ + + + + 
+			
+
+ +
+

+
+ " /> + " /> +
+

+
+ +
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/shortcuts.inc b/usr/local/www/shortcuts.inc index d192c74cc..05b1d6589 100644 --- a/usr/local/www/shortcuts.inc +++ b/usr/local/www/shortcuts.inc @@ -93,7 +93,7 @@ function get_shortcut_main_link($shortcut_section, $addspace = true, $service = break; } if(!empty($link) && ($_SERVER['REQUEST_URI'] != "/{$link}")) - return "{$space}\"plus\""; + return "{$space}Main page"; } function get_shortcut_status_link($shortcut_section, $addspace = true, $service = array()) { @@ -117,14 +117,14 @@ function get_shortcut_status_link($shortcut_section, $addspace = true, $service break; } if(!empty($link)) - return "{$space}\"status\""; + return "{$space}Status"; } function get_shortcut_log_link($shortcut_section, $addspace = true) { global $g, $shortcuts; $space = ($addspace) ? " " : "" ; if(!empty($shortcut_section) && !empty($shortcuts[$shortcut_section]['log'])) { - return "{$space}\"logs\""; + return "{$space}Log"; } } diff --git a/usr/local/www/status_dhcp_leases.php b/usr/local/www/status_dhcp_leases.php index ed1a8c3c8..6d49b4833 100644 --- a/usr/local/www/status_dhcp_leases.php +++ b/usr/local/www/status_dhcp_leases.php @@ -88,8 +88,14 @@ include("head.inc"); ?> - + + +
+
+
+ + 0) { ?> - - - - - - - - -\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; -} - -?> -
{$fspans}{$data['name']}{$fspane}{$fspans}{$data['mystate']}{$fspane}{$fspans}" . adjust_gmt($data['mydate']) . "{$fspane}{$fspans}{$data['peerstate']}{$fspane}{$fspans}" . adjust_gmt($data['peerdate']) . "{$fspane}  
+
+
+
+ + + + + + + + + \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + + ?> +
{$fspans}{$data['name']}{$fspane}{$fspans}{$data['mystate']}{$fspane}{$fspans}" . adjust_gmt($data['mydate']) . "{$fspane}{$fspans}{$data['peerstate']}{$fspane}{$fspans}" . adjust_gmt($data['peerdate']) . "{$fspane}  
+
+
+
-
+
+
+
+ + + + + + + + + + + "; + $fspane = " "; + } else { + $fspans = ""; + $fspane = " "; + } + $lip = ip2ulong($data['ip']); + if ($data['act'] == "static") { + foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { + if(is_array($dhcpifconf['staticmap'])) { + foreach ($dhcpifconf['staticmap'] as $staticent) { + if ($data['ip'] == $staticent['ipaddr']) { + $data['if'] = $dhcpif; + break; + } + } + } + /* exit as soon as we have an interface */ + if ($data['if'] != "") + break; + } + } else { + foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { + if (!is_array($dhcpifconf['range'])) + continue; + if (($lip >= ip2ulong($dhcpifconf['range']['from'])) && ($lip <= ip2ulong($dhcpifconf['range']['to']))) { + $data['if'] = $dhcpif; + break; + } + } + } + echo "\n"; + echo "\n"; + $mac=$data['mac']; + $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); + if ($data['online'] != "online") { + if(isset($mac_man[$mac_hi])){ // Manufacturer for this MAC is defined + echo "\n"; + }else{ + echo "\n"; + } + }else{ + if(isset($mac_man[$mac_hi])){ // Manufacturer for this MAC is defined + echo "\n"; + }else{ + echo "\n"; + } + } + echo "\n"; + if ($data['type'] != "static") { + echo "\n"; + echo "\n"; + } else { + echo "\n"; + echo "\n"; + } + echo "\n"; + echo "\n"; + echo "\n"; + } + } + + ?> +
{$fspans}{$data['ip']}{$fspane}{$fspans}{$mac}
{$mac_man[$mac_hi]}{$fspane}		{$fspans}{$data['mac']}{$fspane}{$fspans}{$mac}
{$mac_man[$mac_hi]}{$fspane}		{$fspans}{$data['mac']}{$fspane}{$fspans}" . htmlentities($data['hostname']) . "{$fspane}{$fspans}" . adjust_gmt($data['start']) . "{$fspane}{$fspans}" . adjust_gmt($data['end']) . "{$fspane}{$fspans} n/a {$fspane}{$fspans} n/a {$fspane}{$fspans}{$data['online']}{$fspane}{$fspans}{$data['act']}{$fspane} "; + if ($data['type'] == "dynamic") { + echo ""; + echo "\"add\" \n"; + } else { + echo "\"add\" \n"; + } + + echo ""; + echo "\"add\" \n"; + + /* Only show the button for offline dynamic leases */ + if (($data['type'] == "dynamic") && ($data['online'] != "online")) { + echo ""; + echo "\"delete\" \n"; + } + echo "
+
+
+
+ + +
- - - - - - - - - - -"; - $fspane = " "; - } else { - $fspans = ""; - $fspane = " "; - } - $lip = ip2ulong($data['ip']); - if ($data['act'] == "static") { - foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { - if(is_array($dhcpifconf['staticmap'])) { - foreach ($dhcpifconf['staticmap'] as $staticent) { - if ($data['ip'] == $staticent['ipaddr']) { - $data['if'] = $dhcpif; - break; - } - } - } - /* exit as soon as we have an interface */ - if ($data['if'] != "") - break; - } - } else { - foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { - if (!is_array($dhcpifconf['range'])) - continue; - if (($lip >= ip2ulong($dhcpifconf['range']['from'])) && ($lip <= ip2ulong($dhcpifconf['range']['to']))) { - $data['if'] = $dhcpif; - break; - } - } - } - echo "\n"; - echo "\n"; - $mac=$data['mac']; - $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); - if ($data['online'] != "online") { - if(isset($mac_man[$mac_hi])){ // Manufacturer for this MAC is defined - echo "\n"; - }else{ - echo "\n"; - } - }else{ - if(isset($mac_man[$mac_hi])){ // Manufacturer for this MAC is defined - echo "\n"; - }else{ - echo "\n"; - } - } - echo "\n"; - if ($data['type'] != "static") { - echo "\n"; - echo "\n"; - } else { - echo "\n"; - echo "\n"; - } - echo "\n"; - echo "\n"; - echo "\n"; - } -} - -?> -
{$fspans}{$data['ip']}{$fspane}{$fspans}{$mac}
{$mac_man[$mac_hi]}{$fspane}		{$fspans}{$data['mac']}{$fspane}{$fspans}{$mac}
{$mac_man[$mac_hi]}{$fspane}		{$fspans}{$data['mac']}{$fspane}{$fspans}" . htmlentities($data['hostname']) . "{$fspane}{$fspans}" . adjust_gmt($data['start']) . "{$fspane}{$fspans}" . adjust_gmt($data['end']) . "{$fspane}{$fspans} n/a {$fspane}{$fspans} n/a {$fspane}{$fspans}{$data['online']}{$fspane}{$fspans}{$data['act']}{$fspane} "; - if ($data['type'] == "dynamic") { - echo ""; - echo "\"add\" \n"; - } else { - echo "\"add\" \n"; - } +
+ + + + " /> + + + " /> + +
+ +

?

+ - echo ""; - echo "\"add\" \n"; + + + + - /* Only show the button for offline dynamic leases */ - if (($data['type'] == "dynamic") && ($data['online'] != "online")) { - echo ""; - echo "\"delete\" \n"; - } - echo "
-
-
- - - -" /> - - -" /> - -
- -

?

- - - - - + \ No newline at end of file diff --git a/usr/local/www/status_dhcpv6_leases.php b/usr/local/www/status_dhcpv6_leases.php index 9eeda114b..55808111e 100644 --- a/usr/local/www/status_dhcpv6_leases.php +++ b/usr/local/www/status_dhcpv6_leases.php @@ -94,8 +94,14 @@ include("head.inc"); ?> - + + +
+
+
+ + $ifarr) { if ($_GET['order']) usort($leases, "leasecmp"); + + + + /* only print pool status when we have one */ if(count($pools) > 0) { ?> - - - - - - - - -\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; -} -?> -
{$fspans}{$data['name']}{$fspane}{$fspans}{$data['mystate']}{$fspane}{$fspans}" . adjust_gmt($data['mydate']) . "{$fspane}{$fspans}{$data['peerstate']}{$fspane}{$fspans}" . adjust_gmt($data['peerdate']) . "{$fspane}  
+
+
+
+ + + + + + + + + \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + + ?> +
{$fspans}{$data['name']}{$fspane}{$fspans}{$data['mystate']}{$fspane}{$fspans}" . adjust_gmt($data['mydate']) . "{$fspane}{$fspans}{$data['peerstate']}{$fspane}{$fspans}" . adjust_gmt($data['peerdate']) . "{$fspane}  
+
+
+
-
+
+
+
+ + + + + + + + + + + + "; + $fspane = " "; + } else { + $fspans = ""; + $fspane = " "; + } + + if ($data['act'] == "static") { + foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) { + if(is_array($dhcpifconf['staticmap'])) { + foreach ($dhcpifconf['staticmap'] as $staticent) { + if ($data['ip'] == $staticent['ipaddr']) { + $data['if'] = $dhcpif; + break; + } + } + } + /* exit as soon as we have an interface */ + if ($data['if'] != "") + break; + } + } else { + $data['if'] = convert_real_interface_to_friendly_interface_name(guess_interface_from_ip($data['ip'])); + } + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + if ($data['type'] != "static") { + echo "\n"; + echo "\n"; + } else { + echo "\n"; + echo "\n"; + } + echo "\n"; + echo "\n"; + + if ($data['type'] == "dynamic") { + echo "\n"; + } else { + echo "\n"; + } + + /* Only show the button for offline dynamic leases */ + if (($data['type'] == "dynamic") && ($data['online'] != "online")) { + echo "\n"; + } + echo "\n"; + } + } + ?> +
{$fspans}{$data['ip']}{$fspane}{$fspans}{$data['iaid']}{$fspane}{$fspans}{$data['duid']}{$fspane}{$fspans}"; + if (!empty($data['hostname'])) { + echo htmlentities($data['hostname']) . "
"; + } + + $mac=trim($ndpdata[$data['ip']]['mac']); + if (!empty($mac)) { + $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); + print htmlentities($mac); + if(isset($mac_man[$mac_hi])){ print "
{$mac_man[$mac_hi]}"; } + } + + echo "{$fspane} 		{$fspans}" . adjust_gmt($data['start']) . "{$fspane}{$fspans}" . adjust_gmt($data['end']) . "{$fspane}{$fspans} n/a {$fspane}{$fspans} n/a {$fspane}{$fspans}{$data['online']}{$fspane}{$fspans}{$data['act']}{$fspane}"; + echo "\"add\""; + echo "\"add\""; + echo "\"delete\"
+
+
+
+ + +
+
+ +
+

Delegated Prefixes

+
+ +
+ + + + + + + + + + "; + $fspane = " "; + } else { + $fspans = ""; + $fspane = " "; + } + + if ($data['act'] == "static") { + foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) { + if(is_array($dhcpifconf['staticmap'])) { + foreach ($dhcpifconf['staticmap'] as $staticent) { + if ($data['ip'] == $staticent['ipaddr']) { + $data['if'] = $dhcpif; + break; + } + } + } + /* exit as soon as we have an interface */ + if ($data['if'] != "") + break; + } + } else { + $data['if'] = convert_real_interface_to_friendly_interface_name(guess_interface_from_ip($data['ip'])); + } + echo "\n"; + if ($mappings[$data['iaid'] . $data['duid']]) { + $dip = "
Routed To: {$mappings[$data['iaid'] . $data['duid']]}"; + } + echo "\n"; + echo "\n"; + echo "\n"; + if ($data['type'] != "static") { + echo "\n"; + echo "\n"; + } else { + echo "\n"; + echo "\n"; + } + echo "\n"; + echo "\n"; + } + } + ?> +
{$fspans}{$data['prefix']}{$dip}{$fspane}{$fspans}{$data['iaid']}{$fspane}{$fspans}{$data['duid']}{$fspane}{$fspans}" . adjust_gmt($data['start']) . "{$fspane}{$fspans}" . adjust_gmt($data['end']) . "{$fspane}{$fspans} n/a {$fspane}{$fspans} n/a {$fspane}{$fspans}{$data['act']}{$fspane}
+
+
+
+ +
- - - - - - - - - - - -"; - $fspane = " "; - } else { - $fspans = ""; - $fspane = " "; - } + + + + + " /> + + + " /> + + + +

?

+ - if ($data['act'] == "static") { - foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) { - if(is_array($dhcpifconf['staticmap'])) { - foreach ($dhcpifconf['staticmap'] as $staticent) { - if ($data['ip'] == $staticent['ipaddr']) { - $data['if'] = $dhcpif; - break; - } - } - } - /* exit as soon as we have an interface */ - if ($data['if'] != "") - break; - } - } else { - $data['if'] = convert_real_interface_to_friendly_interface_name(guess_interface_from_ip($data['ip'])); - } - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - if ($data['type'] != "static") { - echo "\n"; - echo "\n"; - } else { - echo "\n"; - echo "\n"; - } - echo "\n"; - echo "\n"; - - if ($data['type'] == "dynamic") { - echo "\n"; - } else { - echo "\n"; - } - - /* Only show the button for offline dynamic leases */ - if (($data['type'] == "dynamic") && ($data['online'] != "online")) { - echo "\n"; - } - echo "\n"; - } -} -?> -
{$fspans}{$data['ip']}{$fspane}{$fspans}{$data['iaid']}{$fspane}{$fspans}{$data['duid']}{$fspane}{$fspans}"; - if (!empty($data['hostname'])) { - echo htmlentities($data['hostname']) . "
"; - } + + + + - $mac=trim($ndpdata[$data['ip']]['mac']); - if (!empty($mac)) { - $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); - print htmlentities($mac); - if(isset($mac_man[$mac_hi])){ print "
{$mac_man[$mac_hi]}"; } - } - - echo "{$fspane} 		{$fspans}" . adjust_gmt($data['start']) . "{$fspane}{$fspans}" . adjust_gmt($data['end']) . "{$fspane}{$fspans} n/a {$fspane}{$fspans} n/a {$fspane}{$fspans}{$data['online']}{$fspane}{$fspans}{$data['act']}{$fspane}"; - echo "\"add\""; - echo "\"add\""; - echo "\"delete\"
-
-

Delegated Prefixes

- - - - - - - - - -"; - $fspane = " "; - } else { - $fspans = ""; - $fspane = " "; - } - - if ($data['act'] == "static") { - foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) { - if(is_array($dhcpifconf['staticmap'])) { - foreach ($dhcpifconf['staticmap'] as $staticent) { - if ($data['ip'] == $staticent['ipaddr']) { - $data['if'] = $dhcpif; - break; - } - } - } - /* exit as soon as we have an interface */ - if ($data['if'] != "") - break; - } - } else { - $data['if'] = convert_real_interface_to_friendly_interface_name(guess_interface_from_ip($data['ip'])); - } - echo "\n"; - if ($mappings[$data['iaid'] . $data['duid']]) { - $dip = "
Routed To: {$mappings[$data['iaid'] . $data['duid']]}"; - } - echo "\n"; - echo "\n"; - echo "\n"; - if ($data['type'] != "static") { - echo "\n"; - echo "\n"; - } else { - echo "\n"; - echo "\n"; - } - echo "\n"; - echo "\n"; - } -} -?> -
{$fspans}{$data['prefix']}{$dip}{$fspane}{$fspans}{$data['iaid']}{$fspane}{$fspans}{$data['duid']}{$fspane}{$fspans}" . adjust_gmt($data['start']) . "{$fspane}{$fspans}" . adjust_gmt($data['end']) . "{$fspane}{$fspans} n/a {$fspane}{$fspans} n/a {$fspane}{$fspans}{$data['act']}{$fspane}
-
-
- - - -" /> - - -" /> - -
- -

?

- - - - - + \ No newline at end of file diff --git a/usr/local/www/status_filter_reload.php b/usr/local/www/status_filter_reload.php index 9b0471669..599fe1cf7 100644 --- a/usr/local/www/status_filter_reload.php +++ b/usr/local/www/status_filter_reload.php @@ -65,29 +65,46 @@ if($_POST['syncfilter']) { include("head.inc"); ?> - + -
-
- - -     - - -
-


-
- -
- -
-
- -
- -
.
+
+
+
+ + + +
+ +
+
+
+
+ + +      + + +
+


+ +
+ +
+ +
+
+ +
+ +
.
+
+
+
+
+
+
- - - - + diff --git a/usr/local/www/status_gateway_groups.php b/usr/local/www/status_gateway_groups.php index 29677c6bd..0001763ad 100755 --- a/usr/local/www/status_gateway_groups.php +++ b/usr/local/www/status_gateway_groups.php @@ -55,111 +55,124 @@ include("head.inc"); ?> - + + - - - - -
- -
-
- - - - - - - - - - + + + + +
- - - - - +
+
+ + + +
+ + + +
+
- echo "
"; - foreach($priorities as $number => $tier) { - echo ""; - } - echo "\n"; - - /* inverse gateway group to gateway priority */ - $priority_arr = array(); - foreach($gateway_group['item'] as $item) { - $itemsplit = explode("|", $item); - $priority_arr[$itemsplit[1]][] = $itemsplit[0]; - } - ksort($priority_arr); - $p = 1; - foreach($priority_arr as $number => $tier) { - /* for each priority process the gateways */ - foreach($tier as $member) { - /* we always have $priority_count fields */ - echo ""; - $c = 1; - while($c <= $priority_count) { - $monitor = lookup_gateway_monitor_ip_by_name($member); - if($p == $c) { - $status = $gateways_status[$monitor]['status']; - if (stristr($status, "down")) { - $online = gettext("Offline"); - $bgcolor = "#F08080"; // lightcoral - } elseif (stristr($status, "loss")) { - $online = gettext("Warning, Packetloss"); - $bgcolor = "#F0E68C"; // khaki - } elseif (stristr($status, "delay")) { - $online = gettext("Warning, Latency"); - $bgcolor = "#F0E68C"; // khaki - } elseif ($status == "none") { - $online = gettext("Online"); - $bgcolor = "#90EE90"; // lightgreen - } else { - $online = gettext("Gathering data"); - $bgcolor = "#ADD8E6"; // lightblue +
+ + +
" . sprintf(gettext("Tier %s"), $number) . "
+ + + + + + + + + - - - + $priority_count = count($priorities); + ksort($priorities); + + echo ""; + foreach($priorities as $number => $tier) { + echo ""; + } + echo "\n"; + + /* inverse gateway group to gateway priority */ + $priority_arr = array(); + foreach($gateway_group['item'] as $item) { + $itemsplit = explode("|", $item); + $priority_arr[$itemsplit[1]][] = $itemsplit[0]; + } + ksort($priority_arr); + $p = 1; + foreach($priority_arr as $number => $tier) { + /* for each priority process the gateways */ + foreach($tier as $member) { + /* we always have $priority_count fields */ + echo ""; + $c = 1; + while($c <= $priority_count) { + $monitor = lookup_gateway_monitor_ip_by_name($member); + if($p == $c) { + $status = $gateways_status[$monitor]['status']; + if (stristr($status, "down")) { + $online = gettext("Offline"); + $bgcolor = "#F08080"; // lightcoral + } elseif (stristr($status, "loss")) { + $online = gettext("Warning, Packetloss"); + $bgcolor = "#F0E68C"; // khaki + } elseif (stristr($status, "delay")) { + $online = gettext("Warning, Latency"); + $bgcolor = "#F0E68C"; // khaki + } elseif ($status == "none") { + $online = gettext("Online"); + $bgcolor = "#90EE90"; // lightgreen + } else { + $online = gettext("Gathering data"); + $bgcolor = "#ADD8E6"; // lightblue + } + echo ""; + } else { + echo ""; + } + $c++; + } + echo "\n"; + } + $p++; + } + ?> +
+ + + + +  ". htmlspecialchars($member) .", $online "; - } else { - echo ""; - } - $c++; - } - echo "\n"; - } - $p++; - } - ?> -
 
- 		-   -
" . sprintf(gettext("Tier %s"), $number) . "
 ". htmlspecialchars($member) .", $online  
+ 		+   +
+
+ + + + + + -
-
- - - - - - + diff --git a/usr/local/www/status_gateways.php b/usr/local/www/status_gateways.php index 858a179ed..f48df2d62 100644 --- a/usr/local/www/status_gateways.php +++ b/usr/local/www/status_gateways.php @@ -53,108 +53,121 @@ $shortcut_section = "gateways"; include("head.inc"); ?> - - - - - - -
- -
-
- - - - - - - - - - - $gateway) { - ?> - - - - - - - - - - -
- - - - - - - - - - - - - - "; - ?> -
 $online 
"; - $lastchange = $gateways_status[$gname]['lastcheck']; - if(!empty($lastchange)) { - echo gettext("Last check:") . '
' . $lastchange; - } - echo "
-
-
-
+ - - - + + +
+
+
+ + + +
+ + + +
+
+ +
+ + + + + + + + + + + + + $gateway) { + ?> + + + + + + + + + +
+ + + + + + + + + + + + + + "; + ?> +
 $online 
"; + $lastchange = $gateways_status[$gname]['lastcheck']; + if(!empty($lastchange)) { + echo gettext("Last check:") . '
' . $lastchange; + } + echo "
+ +
+
+
+
+
+
+
+
+ + diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php index 745780421..11082323f 100644 --- a/usr/local/www/status_graph.php +++ b/usr/local/www/status_graph.php @@ -116,7 +116,7 @@ include("head.inc"); ?> - + - - + \ No newline at end of file diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index 4e10fe118..cf8d18d8a 100644 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -62,413 +62,434 @@ include("head.inc"); ?> - + - - $ifname): - $ifinfo = get_interface_info($ifdescr); - // Load MAC-Manufacturer table - $mac_man = load_mac_manufacturer_table(); -?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- (, ) -
- -
- DHCP - -
- - -    - - -
-
- DHCP6 - -
- - -    - - -
-
-
- - -    - - -
-
-
- - -    - - -
-
-
- - -    - - -
-
-
- - - - - " /> - - - " /> - - -
-
- -
- -
- -
- -
- -
- kbit/s -
- kbit/s -
- kbit/s -
- kbit/s -
- " . $mac . " - " . htmlspecialchars($mac_man[$mac_hi]); print ""; } - else {print htmlspecialchars($mac);} - ?> -
- -   -
- -
- - -
- -   -
- -   -
- -
- - -
- "; - } - ?> -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- "; - echo $interrupt_sec . " " . gettext("rate"); - ?> -
-
+
+
+ +
+ +
+
+ +
+ + + $ifname): + $ifinfo = get_interface_info($ifdescr); + // Load MAC-Manufacturer table + $mac_man = load_mac_manufacturer_table(); + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ (, ) +
+ +
+ DHCP + +
+ + +    + + +
+
+ DHCP6 + +
+ + +    + + +
+
+
+ + +    + + +
+
+
+ + +    + + +
+
+
+ + +    + + +
+
+
+ + + + + " /> + + + " /> + + +
+
+ +
+ +
+ +
+ +
+ +
+ kbit/s +
+ kbit/s +
+ kbit/s +
+ kbit/s +
+ " . $mac . " - " . htmlspecialchars($mac_man[$mac_hi]); print ""; } + else {print htmlspecialchars($mac);} + ?> +
+ +   +
+ +
+ + +
+ +   +
+ +   +
+ +
+ + +
+ "; + } + ?> +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ "; + echo $interrupt_sec . " " . gettext("rate"); + ?> +
+ +
+

','')?>


+
+
+
+
+ +
+
+
-','')?> - - - - + \ No newline at end of file diff --git a/usr/local/www/status_lb_pool.php b/usr/local/www/status_lb_pool.php index 0e39316e9..3745e925c 100644 --- a/usr/local/www/status_lb_pool.php +++ b/usr/local/www/status_lb_pool.php @@ -106,123 +106,137 @@ if ($_POST) { } ?> - - -
-
-"));?>
- - - - - -
- -
-
- - - - - - - - - - - - - - - - - - - - -
- - - - - - "; - switch ($pool['mode']) { - case 'loadbalance': - echo "\n"; - break; - case 'failover': - echo "\n"; - break; - } - echo ""; - } - } - ?> -
 {$server['ip']['addr']}:{$pool['port']}  "; -# echo " {$server['ip']['addr']}:{$pool['port']} "; - if($server['ip']['avail']) - echo " ({$server['ip']['avail']}) "; - echo " 
- 		- - - -
- " /> - " /> -
-
-
-
- - - + + + + +
+
+
+ +
+ "));?> + + +
+ + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + "; + switch ($pool['mode']) { + case 'loadbalance': + echo "\n"; + break; + case 'failover': + echo "\n"; + break; + } + echo ""; + } + } + ?> +
 {$server['ip']['addr']}:{$pool['port']}  "; + # echo " {$server['ip']['addr']}:{$pool['port']} "; + if($server['ip']['avail']) + echo " ({$server['ip']['avail']}) "; + echo " 
+ 		+ + + +
+ + " /> + " /> + +
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/status_lb_vs.php b/usr/local/www/status_lb_vs.php index 5ea0af455..798dfc8e9 100644 --- a/usr/local/www/status_lb_vs.php +++ b/usr/local/www/status_lb_vs.php @@ -57,89 +57,105 @@ $pgtitle = array(gettext("Status"),gettext("Load Balancer"),gettext("Virtual Ser include("head.inc"); ?> - - - - - - -
- -
-
- - - - - - - - - - - - - - - - - - -
- - - -
- 		- - "; - } - } - } - ?> -
{$server}
- 		- - -
- Last: {$rdr_a[$vsent['name']]['last']}\n"; - if (!empty($rdr_a[$vsent['name']]['average'])) - echo "
Average: {$rdr_a[$vsent['name']]['average']}\n"; - ?> - 		- -
-
-
- - - + + + + +
+
+
+ +
+ "));?> + + +
+ + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + +
+ + + +
+ 		+ + "; + } + } + } + ?> +
{$server}
+ 		+ + +
+ Last: {$rdr_a[$vsent['name']]['last']}\n"; + if (!empty($rdr_a[$vsent['name']]['average'])) + echo "
Average: {$rdr_a[$vsent['name']]['average']}\n"; + ?> + 		+ +
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/status_ntpd.php b/usr/local/www/status_ntpd.php index 1bda7a40d..49a27afbf 100644 --- a/usr/local/www/status_ntpd.php +++ b/usr/local/www/status_ntpd.php @@ -160,112 +160,129 @@ $pgtitle = array(gettext("Status"),gettext("NTP")); $shortcut_section = "ntp"; include("head.inc"); ?> - + + + - - -
- - -
Network Time Protocol Status
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Statistics unavailable because ntpq and ntpdc queries are disabled in the NTP service settings. -
- No peers found, is the ntp service running?. -
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - ' . gettext("Clock Altitude") . ''; $gps_goo_lnk++;}?> - ' . gettext("Satellites") . ''; $gps_goo_lnk++;}?> - - - - - - - ' . $gps_alt . ' ' . $gps_alt_unit . '';}?> - '; - if (isset($gps_satview)) {echo 'in view ' . intval($gps_satview);} - if (isset($gps_sat) && isset($gps_satview)) {echo ', ';} - if (isset($gps_sat)) {echo 'in use ' . $gps_sat;} - echo ''; - } - ?> - - - - - -
(° ) (° )
Google Maps Link
- -
- - - + + + +
+
+ +
+ +
+
+
+

Network Time Protocol Status

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Statistics unavailable because ntpq and ntpdc queries are disabled in the NTP service settings. +
+ No peers found, is the ntp service running?. +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + ' . gettext("Clock Altitude") . ''; $gps_goo_lnk++;}?> + ' . gettext("Satellites") . ''; $gps_goo_lnk++;}?> + + + + + + + ' . $gps_alt . ' ' . $gps_alt_unit . '';}?> + + + + + + +
(° ) (° ) + +
Google Maps Link
+ +
+
+
+
+
+
+
+ + diff --git a/usr/local/www/status_openvpn.php b/usr/local/www/status_openvpn.php index 726f5d70d..13ee59406 100644 --- a/usr/local/www/status_openvpn.php +++ b/usr/local/www/status_openvpn.php @@ -107,9 +107,10 @@ $clients = openvpn_get_active_clients(); include("head.inc"); ?> -"> + + - + - - - - - - - - "> - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - + +
+
+ +
+ +
+
+
+

Network Time Protocol Status

+
+ +
+ + + + + +
+
+ + + + + + +
+ +
+ + + + + + + + + + + + "> + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + " + title="" alt="delete" /> +
+ + + + +
+ +
+ 		 
+
+ +
+ " /> - +

+
+ + + + + + + + + +
+ + +
+ + + + + + + + + +
+ +
+ + + + + + + + + + + + + + "> + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ +
+
+
+ + +
+ + + + + + + + +
+ +
+ + + + + + + + + + + + + + "> + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ +
+
+
+ + + " . gettext("NOTE") . ": " . gettext("If you have custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page."); + } + + if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) { + echo gettext("No OpenVPN instance defined"); + } + ?> + + + + + + + + - -
- - - - - - - - - - - - - " - title="" alt="delete" /> -
- - - - -
- -
- 		 
- - - - -
-" /> - -

-
- - - - - - - - - -
- - -
- - - - - - - - - -
- -
- - - - - - - - - - - - - - "> - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- -
-
-
- - -
- - - - - - - - -
- -
- - - - - - - - - - - - - - "> - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- -
-
-
- -" . gettext("NOTE") . ": " . gettext("If you have custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page."); -} - -if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) { - echo gettext("No OpenVPN instance defined"); -} -?> - - - + - - + + + \ No newline at end of file diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php index 04252ee92..1a2471d89 100644 --- a/usr/local/www/status_queues.php +++ b/usr/local/www/status_queues.php @@ -124,69 +124,94 @@ $pgtitle = array(gettext("Status"),gettext("Traffic shaper"),gettext("Queues")); $shortcut_section = "trafficshaper"; include("head.inc"); ?> - + -"; - exit;} -?> - -
- - - - - - - - - - - - - - - - - - -
- - -
-

- :
- .
- . -

+ + +
+
+ +
+ +
+
+ + +
+

+
+ + +
+

+
+ + + + + +
+
+ + + + + + + + + + + + + +
+ + +
+
+ +

+ :
+ .
+ . +

+
+ + + +
+
+
+
+
+ + - - - - + + - - - - - + + - - - + window.setTimeout('update_graph_images()', 355000); + //]]> + + +
+
+
- - - - - - - +
+ + diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php index 4c3e35a7b..2c5d55a85 100644 --- a/usr/local/www/status_rrd_graph_settings.php +++ b/usr/local/www/status_rrd_graph_settings.php @@ -120,141 +120,105 @@ $pgtitle = array(gettext("Status"),gettext("RRD Graphs")); include("head.inc"); ?> - - - - -
- - - - - - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- onclick="enable_change(false)" /> - -
- - -
- - -
- - -
  - " onclick="enable_change(true)" /> -
  - " onclick="return confirm('')" /> -
 
- -
-
-
-
- - - + + + + +
+
+
+ + + + +
+ + + +
+
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

+
+ +

+
+ +

+
  + " onclick="enable_change(true)" /> + " onclick="return confirm('')" /> +
+
+ +


+ + +

+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/status_rrd_graph_tabs.php b/usr/local/www/status_rrd_graph_tabs.php new file mode 100644 index 000000000..a06615a25 --- /dev/null +++ b/usr/local/www/status_rrd_graph_tabs.php @@ -0,0 +1,42 @@ + \ No newline at end of file diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index c08f773fa..b143852f1 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -69,61 +69,74 @@ include("head.inc"); ?> - + - - -
- - - - - - - - - - 0) { - uasort($services, "service_name_compare"); - foreach($services as $service) { - if (empty($service['name'])) - continue; - if (empty($service['description'])) - $service['description'] = get_pkg_descr($service['name']); - echo "\n"; - echo "\n"; - // if service is running then listr else listbg - $bgclass = null; - if (get_service_status($service)) - $bgclass = "listr"; - else - $bgclass = "listbg"; - echo "\n"; - echo "\n"; - } -} else { - echo "\n"; -} - -?> - -
" . $service['name'] . "" . $service['description'] . "" . get_service_status_icon($service, true, true) . "" . get_service_control_links($service); - $scut = get_shortcut_by_service_name($service['name']); - if (!empty($scut)) { - echo get_shortcut_main_link($scut, true, $service); - echo get_shortcut_status_link($scut, true, $service); - echo get_shortcut_log_link($scut, true); - } - echo "
" . gettext("No services found") . " .
-
- - - - +
+
+
+ + + +
+ +
+
+ +
+ + + + + + + + + + 0) { + uasort($services, "service_name_compare"); + foreach($services as $service) { + if (empty($service['name'])) + continue; + if (empty($service['description'])) + $service['description'] = get_pkg_descr($service['name']); + echo "\n"; + echo "\n"; + // if service is running then listr else listbg + $bgclass = null; + if (get_service_status($service)) + $bgclass = "listr"; + else + $bgclass = "listbg"; + echo "\n"; + echo "\n"; + } + } else { + echo "\n"; + } + + ?> + +
" . $service['name'] . "" . $service['description'] . "" . get_service_status_icon($service, true, true) . "" . get_service_control_links($service); + $scut = get_shortcut_by_service_name($service['name']); + if (!empty($scut)) { + echo get_shortcut_main_link($scut, true, $service); + echo get_shortcut_status_link($scut, true, $service); + echo get_shortcut_log_link($scut, true); + } + echo "
" . gettext("No services found") . " .
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/status_upnp.php b/usr/local/www/status_upnp.php index 72c939800..6a30811d9 100644 --- a/usr/local/www/status_upnp.php +++ b/usr/local/www/status_upnp.php @@ -59,67 +59,76 @@ $pgtitle = array(gettext("Status"),gettext("UPnP & NAT-PMP Status")); $shortcut_section = "upnp"; include("head.inc"); ?> - + - - -
- - - - - - - -
-
- " /> . -
-
- - - - - - - - - (.*) port (.*)/", $rdr_entry, $matches)) - $rdr_proto = $matches[2]; - $rdr_port = $matches[3]; - $rdr_label =$matches[4]; - $rdr_ip = $matches[5]; - $rdr_iport = $matches[6]; - ?> - - - - - - - - -
- - - - - - - - - -
-
-
- - - + + +
+
+ +
+ + + + +
+
+ + +
+

+
+ + + +
+ + + + + + + + + + (.*) port (.*)/", $rdr_entry, $matches)) + $rdr_proto = $matches[2]; + $rdr_port = $matches[3]; + $rdr_label =$matches[4]; + $rdr_ip = $matches[5]; + $rdr_iport = $matches[6]; + ?> + + + + + + + + +
+ + + + + + + + + +
+
+ +
+ " /> . +
+ + +
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/system.php b/usr/local/www/system.php index c5cfe5209..d26f34d2e 100644 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -284,241 +284,263 @@ include("head.inc"); ?> - - -
- - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
- firewall - -
-
- - -
- - -
-
- - - - - - - - - - - - - -
- - - - - -
-
- - -
- -
- -
- -
- /> - - - -
- -
-
- /> - - - -
- - -
- -
- - - -
- -
- - - -
- - - - -
 
  - - - - . - -
 
  - " /> -
-
-
-
- - - + + + + +
+
+ +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ firewall + +
+
+ + +
+ + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + +
+ +
+ +
+ +
+ /> + + + +
+ +
+
+ /> + + + +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + +
  + + + + . + +
  + " /> +
+
+
+ +
+
+ +
+ +
+
+ + diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index 4982b66a4..f736b3226 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -271,350 +271,362 @@ include("head.inc"); ?> - - - -function prot_change() { + +
+
+ +
+ +
+ + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + onclick="prot_change()" /> + +     + onclick="prot_change()" /> + + +
+ + + + +
+ +
+ +
+ + + +
+ +
+ + + +
+ /> + +
+ +
+ /> + +
+ +
+ /> + +
+ +
+ + /> + +
+ + +
+ /> + +
+ DNS Rebinding attacks. " . + "This blocks private IP responses from your configured DNS servers. Check this box to disable this protection if it interferes with " . + "webConfigurator access or name resolution in your environment. "); ?> +
+ +
+ +
+ +
+ /> + +
+ Wikipedia."); ?> +
+ /> + +
+ +
+ " . sprintf(gettext("This option has been automatically disabled because a conflicting cryptographic accelerator card has been detected (%s)."), $hwcrypto) . "

"; + } ?> + Wikipedia."); ?> +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ /> + +
+ /> + +
+ + + +
+ +
+ +
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ /> + + null modem serial cable or adapter is required to use the serial console."); ?> +
+ bps +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ /> + +
+ +
 
 " />
- if (document.iform.https_proto.checked) - document.getElementById("ssl_opts").style.display=""; - else - document.getElementById("ssl_opts").style.display="none"; -} +
+ +
+ +
+
+ +
+ +
+
-//]]> - - -
- - - - - - - -
- -
-
- - -   - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - onclick="prot_change()" /> - -     - onclick="prot_change()" /> - - -
- - - - -
- -
- -
- - - -
- -
- - - -
- /> - -
- -
- /> - -
- -
- /> - -
- -
- - /> - -
- - -
- /> - -
- DNS Rebinding attacks. " . - "This blocks private IP responses from your configured DNS servers. Check this box to disable this protection if it interferes with " . - "webConfigurator access or name resolution in your environment. "); ?> -
- -
- -
- -
- /> - -
- Wikipedia."); ?> -
- /> - -
- -
- " . sprintf(gettext("This option has been automatically disabled because a conflicting cryptographic accelerator card has been detected (%s)."), $hwcrypto) . "

"; - } ?> - Wikipedia."); ?> -
 
- /> - -
- /> - -
- - - -
- -
- -
 
- /> - - null modem serial cable or adapter is required to use the serial console."); ?> -
- bps -
-
- -
-
 
- /> - -
- -
 
 " />
 
-
-
-
- "; ?> - - + + - - + + + + + + + +
+
+ +
+ +
+ + + +
- +
+ + + + + + + /> + +
+
+ +
. + + + + + + + /> + +
+ + + + + + +
+ +
+ +
+ +
+
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + + + + + + /> + +
+ +
+ + + + Disable Auto-added VPN rules + + /> + +
+ + + + + + Disable reply-to + + /> + +
+ +
+ + + + Disable Negate rules + + /> + +
+ +
+ + + + + + +
+ +
+ + + + + + + /> + +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + 1): ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

+ +

+ +

+ +
+
+ +

+ +
+ /> + +

+ +

+ +
+ /> + +
+ +

+ +
+ + +
+ + + + + + + + +
 " />
+ +
+ + + +
+ +
+ + + + + -var descs=new Array(5); -descs[0]=""; -descs[1]=""; -descs[2]=""; -descs[3]=""; - -function update_description(itemnum) { - document.forms[0].info.value=descs[itemnum]; - -} - -//]]> - - - -
- - - - - - - -
- -
-
- - -   - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1): ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- /> -
- -
- /> -
- -
- -
- - -
- -
- /> - -
-
- -
. - -
- /> - -
-
- -
- -
- -
- -
-
- -
- -
- -
- -
- -
- -
- - - - - - -
- /> - -
- -
-
Disable Auto-added VPN rules - /> - -
- - -
Disable reply-to - /> - -
- -
-
Disable Negate rules - /> - -
- -
-
- -
- -
- -
- /> - -
- -
-
 
- -
- -
 
- -
- -

- -

- -

- -
-
- -

- -
- /> - -

- -

- -
- /> - -
- -

- -
- - -
 
 " />
-
-
-
- - - - + diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index abfdda50c..a454153fa 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -78,10 +78,6 @@ $pconfig['powerd_battery_mode'] = "hadp"; if (!empty($config['system']['powerd_battery_mode'])) $pconfig['powerd_battery_mode'] = $config['system']['powerd_battery_mode']; -$pconfig['powerd_normal_mode'] = "hadp"; -if (!empty($config['system']['powerd_normal_mode'])) - $pconfig['powerd_normal_mode'] = $config['system']['powerd_normal_mode']; - $crypto_modules = array('glxsb' => gettext("AMD Geode LX Security Block"), 'aesni' => gettext("AES-NI CPU-based Acceleration")); @@ -167,7 +163,6 @@ if ($_POST) { $config['system']['powerd_ac_mode'] = $_POST['powerd_ac_mode']; $config['system']['powerd_battery_mode'] = $_POST['powerd_battery_mode']; - $config['system']['powerd_normal_mode'] = $_POST['powerd_normal_mode']; if($_POST['crypto_hardware']) $config['system']['crypto_hardware'] = $_POST['crypto_hardware']; @@ -247,191 +242,185 @@ include("head.inc"); ?> - - - -
- - - - - - - -
- -
-
- - -   - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +
+
+ +
+ +
+ + + +
+ + + +
+ +
- " class="formfld unknown" /> -
- -
- " class="formfld unknown" /> -
- -
- " class="formfld unknown" /> -
- -
- " class="formfld unknown" /> -
- -
- onclick="sticky_checked(this)" /> -
- -
- " class="formfld unknown" /> -
- -
- /> -
- -
 
- /> -
-
-  :  - -    -  :  - -
-  :  - -

- -
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ " class="formfld unknown" /> +
+ +
+ " class="formfld unknown" /> +
+ +
+ " class="formfld unknown" /> +
+ +
+ " class="formfld unknown" /> +
+ +
+ onclick="sticky_checked(this)" /> +
+ +
+ " class="formfld unknown" /> +
+ +
+ /> +
+ +
+ + + + + + + + + + + + + +
+ /> +
+
+  :  + +    +  :  + +

+ +
+ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
 
- -
- -

- -
 
  - VPN > IPsec on the Advanced Settings tab."); ?> -
 
- /> -
- -
 
- /> -
- -
- /> -
- -
- /> -
- -
- onclick="tmpvar_checked(this)" /> -
- -
- " class="formfld unknown" /> MB -
- -
- " class="formfld unknown" /> MB -
- -
- - -
- -
-
-
- - -
- -
-
-
 
- -
- -
 
- /> -
- -
  - " /> -
-
-
-
+ + + + + + + + + + + + + + + +
+ +
+ +

+ +
+ + + + + + + + + + + + + + +
  + VPN > IPsec on the Advanced Settings tab."); ?> +
+ + + + + + + + + + + + + + + +
+ /> +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ /> +
+ +
+ /> +
+ +
+ /> +
+ +
+ onclick="tmpvar_checked(this)" /> +
+ +
+ " class="formfld unknown" /> MB +
+ +
+ " class="formfld unknown" /> MB +
+ +
+ + +
+ +
+
+
+ + +
+ +
+
+
+ + + + + + + + + + + + + + + +
+ +
+ +
+ - - - + + + + + + + + + + + + + + + + + + + +
+ /> +
+ +
  + " /> +
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php index 24114904c..e1c9070ed 100644 --- a/usr/local/www/system_advanced_network.php +++ b/usr/local/www/system_advanced_network.php @@ -159,191 +159,192 @@ include("head.inc"); ?> - - - - + + + + - -
- - - - - - - -
- -
-
- - -   - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ +
+ +
+ + + +
-
- - - - - - - - - - -*/ -?> - - - - - - - -
- onclick="enable_change(false)" /> -
-
-
-
-
- onclick="enable_change(false)" /> -
-
-
-  :  - -
- /> -
-
-
 
- /> -
- -
- /> -
- -
-   - -
- /> -
- -
-   - -
- /> -
- -
-   - -
- /> -
- -
 
Flowtable support
Enable Flowtable - /> - Enable flowtable support
- Enables infrastructure for caching flows as a means of accelerating L3 and L2 lookups - as well as providing stateful load balancing when used with RADIX_MPATH.
-
 
 " />
-
-
-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+ onclick="enable_change(false)" /> +
+
+
+
+
+ onclick="enable_change(false)" /> +
+
+
+  :  + +
+ /> +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + ?> + +
+ /> +
+ +
+ /> +
+ +
+   + +
+ /> +
+ +
+   + +
+ /> +
+ +
+   + +
+ /> +
+ +
 
Flowtable support
Enable Flowtable + /> + Enable flowtable support
+ Enables infrastructure for caching flows as a means of accelerating L3 and L2 lookups + as well as providing stateful load balancing when used with RADIX_MPATH.
+
+ + + + + + +
 " />
+ +
+ +
+ + + + + + + + + - - - + \ No newline at end of file diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php index 2ead28d17..29ec969ac 100644 --- a/usr/local/www/system_advanced_notifications.php +++ b/usr/local/www/system_advanced_notifications.php @@ -165,189 +165,206 @@ include("head.inc"); ?> - - -
- -
- - - - - - - -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- checked="checked" />
- -
- ' />
- -
- ' />
- -
- ' />
- -
- ' />
- -
-   - - -
-
 
- checked="checked" />
- -
- ' />
- -
- ' />
- -
- />Enable SMTP over SSL/TLS
- />Enable STARTTLS
-
- ' />
- -
- ' />
- -
- ' />
- -
- ' />
- -
-   - - -
-
 
- /> - -
- -
 
-   - - -
-
-
-
+ + + + +
+
+ +
+ +
+ +
+ +
+ + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ checked="checked" />
+ +
+ ' />
+ +
+ ' />
+ +
+ ' />
+ +
+ ' />
+ +
+   + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ checked="checked" />
+ +
+ ' />
+ +
+ ' />
+ +
+ />Enable SMTP over SSL/TLS
+ />Enable STARTTLS
+
+ ' />
+ +
+ ' />
+ +
+ ' />
+ +
+ ' />
+ +
+   + + +
+
 
+ + + + + + + + + + + + + + + + + + + + + + +
+ /> + +
+ +
 
+   + + +
+ +
+ +
+
+
+
+
+
+ - - - + + + diff --git a/usr/local/www/system_advanced_sysctl.php b/usr/local/www/system_advanced_sysctl.php index 7dcf3dfcf..214c19056 100644 --- a/usr/local/www/system_advanced_sysctl.php +++ b/usr/local/www/system_advanced_sysctl.php @@ -130,147 +130,142 @@ include("head.inc"); ?> - + -
- -
- - - - - - - - - - - - - -
- -
-
- - -   - - -
- -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - ')"> - - -
-
- - - - - -
- - - -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
  - " /> - " onclick="window.location.href=''" /> - - - -
-
-
-
- - - + + + +
+
+ +
+ +
+ +
+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + ')" class="btn btn-default"> + + +
+
+ + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
  + " /> + " onclick="window.location.href=''" /> + + + + +
+
+ + +
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/system_advanced_tabs.php b/usr/local/www/system_advanced_tabs.php new file mode 100644 index 000000000..665f5212e --- /dev/null +++ b/usr/local/www/system_advanced_tabs.php @@ -0,0 +1,16 @@ + + + \ No newline at end of file diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index 57057e127..7ddb99727 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -304,11 +304,12 @@ if ($_POST) { include("head.inc"); ?> -"> +"> + + - - - - - - - - -
- -
-
+ + +
+
+ +
+ + + +
+ + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
:   + +
:   + +   + +   + +
:   + +   + +   + +
:   + +   + +   + +
:   + +   + +   + +
:   + +   + +   + +
+
+ + + + + + +
  + " /> + + + +
+
+ + + + + + + + + + + + + + + + + " . gettext("self-signed") . ""; + else + $issuer_name = "" . gettext("external") . ""; + $subj = htmlspecialchars($subj); + $issuer = htmlspecialchars($issuer); + $certcount = 0; + + $issuer_ca = lookup_ca($ca['caref']); + if ($issuer_ca) + $issuer_name = $issuer_ca['descr']; + + // TODO : Need gray certificate icon + + if($ca['prv']) { + $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; + $internal = "YES"; + + } else { + $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; + $internal = "NO"; + } + foreach ($a_cert as $cert) + if ($cert['caref'] == $ca['refid']) + $certcount++; + foreach ($a_ca as $cert) + if ($cert['caref'] == $ca['refid']) + $certcount++; + ?> + + + + + + + + + + + + + + + + + +
+ + + + + +
+ CA + + +
+ 		   
+ + + + + + + + + + + +
 :
 :
+ 		+ + " alt="" width="17" height="17" border="0" /> + + + " alt="" width="17" height="17" border="0" /> + + + + " alt="" width="17" height="17" border="0" /> + + + ')"> + " alt="" width="17" height="17" border="0" /> + +
+ + " alt="" width="17" height="17" border="0" /> + +
+

+ +

+
+ + + - -
- - - - - - - - - - - - - - - - -
- -
- -
+
+
+
+
+
- - - - - - - - - - - - - - - - - - - - - - - -
- -
- -

- -
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
:   - -
:   - -   - -   - -
:   - -   - -   - -
:   - -   - -   - -
:   - -   - -   - -
:   - -   - -   - -
-
- - - - - - -
  - " /> - - - -
- - - - - - - - - - - - - - " . gettext("self-signed") . ""; - else - $issuer_name = "" . gettext("external") . ""; - $subj = htmlspecialchars($subj); - $issuer = htmlspecialchars($issuer); - $certcount = 0; - - $issuer_ca = lookup_ca($ca['caref']); - if ($issuer_ca) - $issuer_name = $issuer_ca['descr']; - - // TODO : Need gray certificate icon - - if($ca['prv']) { - $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; - $internal = "YES"; - - } else { - $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; - $internal = "NO"; - } - foreach ($a_cert as $cert) - if ($cert['caref'] == $ca['refid']) - $certcount++; - foreach ($a_ca as $cert) - if ($cert['caref'] == $ca['refid']) - $certcount++; - ?> - - - - - - - - - - - - - - - - -
- - - - - -
- CA - - -
- 		   
- - - - - - - - - - - -
 :
 :
- 		- - " alt="" width="17" height="17" border="0" /> - - - " alt="" width="17" height="17" border="0" /> - - - - " alt="" width="17" height="17" border="0" /> - - - ')"> - " alt="" width="17" height="17" border="0" /> - -
- - " alt="" width="17" height="17" border="0" /> - -
-

- -

-
- - - -
-
- - - + \ No newline at end of file diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 0772ae69c..e7ecb66e5 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -468,7 +468,7 @@ if ($_POST) { include("head.inc"); ?> -"> +"> - - - - - - +
- -
-
+ + +
+
+ +
+ +
+ + + +
-
- + +
@@ -624,40 +619,41 @@ function internalca_change() {
- - - - - - - - - - - - - - - - +
- -
- -
- -
- -
+ + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
- - - - - - - - +
+ + + + + + + @@ -849,170 +845,173 @@ function internalca_change() {
- - - - - - - - - - - - - - - - - - - +
- - bits -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
:   - -
:   - -   - ex: -   - -
:   - -   - ex: -   - -
:   - -   - ex: -   - -
:   - -   - ex: -   - -
:   - -   - ex: -   - -
-
+ + + + + + + + + + + + + + + + + + +
+ + bits +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
:   + +
:   + +   + ex: +   + +
:   + +   + ex: +   + +
:   + +   + ex: +   + +
:   + +   + ex: +   + +
:   + +   + ex: +   + +
+
- - - - - - - - - - - +
- - - - -
+ + + + + + + + + + +
+ + + + +
- +
  - " /> + " /> @@ -1024,7 +1023,7 @@ function internalca_change() { - +
> - -
@@ -1065,7 +1064,7 @@ function internalca_change() { "response subject verification. "); ?>
- " /> + " /> @@ -1077,14 +1076,17 @@ function internalca_change() { - - - - - - - - +
+ + + + + + + + + + '; ?> - -
- CA + @@ -1141,7 +1142,7 @@ function internalca_change() {    
- +
@@ -1178,37 +1179,47 @@ function internalca_change() { - + @@ -1216,6 +1227,7 @@ function internalca_change() { +
  : - - " alt="" width="17" height="17" border="0" /> - - - " alt="" width="17" height="17" border="0" /> - - - " alt="" width="17" height="17" border="0" /> - - - ')"> - " alt="" width="17" height="17" border="0" /> - - - -   - - " alt="" width="17" height="17" border="0" /> - - + + + + + + + + + + + + +
+ "> + + + + "> + + + + "> + + + + ')" title=""> + + + + "> + + +
- - " alt="" width="17" height="17" border="0" /> + " class="btn btn-primary"> +
 
@@ -1224,7 +1236,7 @@ function internalca_change() {
- + - - + \ No newline at end of file diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php index 35794f661..2eb38a5f1 100644 --- a/usr/local/www/system_crlmanager.php +++ b/usr/local/www/system_crlmanager.php @@ -249,411 +249,405 @@ if ($_POST) { include("head.inc"); ?> -"> - - -function method_change() { - method = document.iform.method.value; - - switch (method) { - case "internal": - document.getElementById("existing").style.display="none"; - document.getElementById("internal").style.display=""; - break; - case "existing": - document.getElementById("existing").style.display=""; - document.getElementById("internal").style.display="none"; - break; - } -} - -//]]> - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
+ +
+
+ +
+ +
+ + + +
- - - - - - - - - - - - - - - - -
- -
- -
- -
- - - - - - - - - - - - - -
- -
- -
- - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- - - - - - -
  - " /> - - - -
- +
+ + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ + + + + + +
  + " /> + + + +
+
- -
- - - - - - - - - - - - - - - - - -
- -
- -
-
  - " /> - - -
-
+ + +
+ + + + + + + + + + + + + + + + + +
+ +
+ +
+
  + " /> + + +
+
- -
- - - - - - - - - - - - - - - - - - - - $cert): - $name = htmlspecialchars($cert['descr']); - ?> - - - - - - - - - - - - - - - - - - - -
-      -  
- - - - - - - ')"> - " alt="" width="17" height="17" border="0" /> - -
-      -  
- : - : - - - - - " /> -  
-
+ + +
+ + + + + + + + + + + + + + + + + + + + $cert): + $name = htmlspecialchars($cert['descr']); + ?> + + + + + + + + + + + + + + + + + + + +
+      +  
+ + + + + + + " onclick="return confirm('')" class="btn btn-default"> + + +
+      +  
+ : + : + + + + + " /> +  
+
+ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-

- -

-
+

+ +

+
+ + + + + +
+ CA + + +
+ 		+ + + " alt="" width="17" height="17" border="0" /> + + + + " alt="" width="17" height="17" border="0" /> + + +
+ + "> + + + + "> + + + + "> + + + + ')" class="btn btn-default"> + "> + + +
 
- $i = 0; - foreach($a_ca as $ca): - $name = htmlspecialchars($ca['descr']); + - if($ca['prv']) { - $cainternal = "YES"; - } else - $cainternal = "NO"; - ?> -
- - - - - -
- CA - - -
- 		- - - " alt="" width="17" height="17" border="0" /> - - - - " alt="" width="17" height="17" border="0" /> - - -
- - " alt="" width="17" height="17" border="0" /> - - - - " alt="" width="17" height="17" border="0" /> - - - - " alt="" width="17" height="17" border="0" /> - - - - ')"> - " alt="" width="17" height="17" border="0" /> - - -
 
+ + + + + - - - -
- - - + diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 37fdf9309..677595aac 100644 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -202,115 +202,131 @@ $pgtitle = array(gettext("System"),gettext("Firmware")); include("head.inc"); ?> - -
- - - - - - "") print_info_box($fwinfo); ?> - -" . $sig_warning . "
" . gettext("This means that the image you uploaded " . - "is not an official/supported image and may lead to unexpected behavior or security " . - "compromises. Only install images that come from sources that you trust, and make sure ". - "that the image has not been tampered with.") . "

". - gettext("Do you want to install this image anyway (on your own risk)?"); -print_info_box($sig_warning); -if(stristr($_FILES['ulfile']['name'],"nanobsd")) - echo "\n"; -?> - " /> - " /> - - - - - - - - -
- -
-
- - - - - - - - - - - - - - - -
  - - - " /> -
- -
- - " /> -
  - - - -
- - -
- - " /> - - - - -
  - - - - -
- - - - - -
-
-
+ - - -
- - + + + +
+
+ +
+ + + "") print_info_box($fwinfo); ?> + +
+ + + +
+ +
+ + + + + + + " . $sig_warning . "
" . gettext("This means that the image you uploaded " . + "is not an official/supported image and may lead to unexpected behavior or security " . + "compromises. Only install images that come from sources that you trust, and make sure ". + "that the image has not been tampered with.") . "

". + gettext("Do you want to install this image anyway (on your own risk)?"); + + print_info_box($sig_warning); + + if(stristr($_FILES['ulfile']['name'],"nanobsd")) + echo "\n"; + ?> + + " /> + " /> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  + + + " /> +
+ +
+ + " /> +
  + + + +
+ + +
+ + " /> + + + + +
  + + + + + +
+ + + + + + +
+ + + + +
+ +
+
+
+
+
+ diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index 47e9761fd..f133c2eef 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -63,77 +63,77 @@ include("head.inc"); ?> - - - - - + -
- - - - - - - -
- -
- - - - -
- - - - -
- + +
+
+ +
+ +
+ + + +
-
- - - - -
- - -
- -
-
-
- - - -
- - -
-
-
-
+
- + + + + +
+ + + + +
+ + + + + + + +
+ + +
+ +
+
+
+ + + +
+ + +
+
+
+ + + + + + + + + - - - diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php index d09bda60f..58249cae6 100644 --- a/usr/local/www/system_firmware_check.php +++ b/usr/local/www/system_firmware_check.php @@ -51,67 +51,80 @@ include("head.inc"); ?> - + -
- - - - - - - -
- -
- - - - - - - -
- - + +
+
+ +
+ +
+ + + +
+ + + +
+ +
+ + + +
+ + + + + + + + +
+ + +
+ +
+
+
+ + + + + + + " /> +
+ + + + -
- - -
- -
-
-
- - - - - " /> -
-
+ + + + + + +

@@ -192,8 +205,7 @@ $txt .= " " . gettext("New version") .": ". htmlspecialchars($remote_version $txt .= " " . gettext("Update source") .": ". $updater_url . "\\n"; update_output_window($txt); ?> +

- - - - + + diff --git a/usr/local/www/system_firmware_restorefullbackup.php b/usr/local/www/system_firmware_restorefullbackup.php index 7d635bf3f..9838bc29e 100644 --- a/usr/local/www/system_firmware_restorefullbackup.php +++ b/usr/local/www/system_firmware_restorefullbackup.php @@ -106,90 +106,101 @@ include("head.inc"); ?> - + - - -

-

- -" . gettext("The firewall is now rebooting."));?>
-
- -
- - - - - - - -
- -
-
- - - - - - - -"; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - if($counter == 0) { - echo ""; - echo ""; - echo ""; - } -?> - - - -
"; - echo " $arf"; - echo ""; - echo date ("F d Y H:i:s", filemtime($arf)); - echo ""; - echo format_bytes($size); - echo ""; - echo ""; - echo gettext("Delete"); - echo " | "; - echo ""; - echo gettext("Download"); - echo ""; - echo "
"; - echo gettext("Could not locate any previous backups."); - echo "
-  
- -
- " /> -
-
-
-
+ + +
+
+ +
+ +
+ + + +
+ +

+ +

+ + " . gettext("The firewall is now rebooting."));?>
+
+ + + +
+ + + + + + + + + + + + + + "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + if($counter == 0) { + echo ""; + echo ""; + echo ""; + } + ?> + + + + + + +
"; + echo " $arf"; + echo ""; + echo date ("F d Y H:i:s", filemtime($arf)); + echo ""; + echo format_bytes($size); + echo ""; + echo ""; + echo gettext("Delete"); + echo " | "; + echo ""; + echo gettext("Download"); + echo ""; + echo "
"; + echo gettext("Could not locate any previous backups."); + echo "
+  
+ +
+ " /> +
+
+ +
+
+
+
+
- - - - + diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php index c79d959d5..5d08344b0 100644 --- a/usr/local/www/system_firmware_settings.php +++ b/usr/local/www/system_firmware_settings.php @@ -101,173 +101,205 @@ function enable_altfirmwareurl(enable_over) { //]]> - - + - -
- - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -

-
- />
- - -
- - -
- - -
 
- /> -
- -
- /> -
- -
 
- /> -
- -
- - -
- -
- - -
- - -
- - -
- - -
- -
  - " /> -
-
- - - + +
+
+ +
+ +
+ + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ +

+
+ />
+ + +
+ + +
+ + +
+ + + + + + + + + + + + + + + + + + + +
+ /> +
+ +
+ /> +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ /> +
+ +
+ + +
+ +
+ + +
+ + +
+ + +
+ + +
+ +
+ + + + + + + +
  + " /> +
+ +
+ +
+ +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/usr/local/www/system_firmware_tabs.php b/usr/local/www/system_firmware_tabs.php new file mode 100644 index 000000000..5b3ea6c52 --- /dev/null +++ b/usr/local/www/system_firmware_tabs.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/usr/local/www/system_gateways.php b/usr/local/www/system_gateways.php index 58de70001..edc92c070 100644 --- a/usr/local/www/system_gateways.php +++ b/usr/local/www/system_gateways.php @@ -185,220 +185,231 @@ include("head.inc"); ?> - - - -
- - -

-" . gettext("You must apply the changes in order for them to take effect."));?>

- - - - - - - - -
- -
-
- - - - - - - - - - - -"; - $i = 0; - foreach ($a_gateways as $gateway): - if (isset($gateway['disabled']) || isset($gateway['inactive'])) { - $textss = ""; - $iconfn = "pass_d"; - } else { - $textss = ""; - $iconfn = "pass"; - } -?> - - - - - - - - - - - - - - - - -
   - - - - - -
- - add - -
-
- - - -   - - - - " alt="icon" /> - - - " alt="icon" /> - - - " alt="icon" /> - - -(default)"; - echo $textse; -?> - - - - - - - - - - - - - - - - - - - - - - - - -
- - edit - - - ')"> - delete - -
- - add - -
-
- - - - - -
- - " border="0" alt="delete" /> - - " - onclick="return confirm('')" /> - - - - edit - -
-
-
-
-
- - - + + + + + + +
+
+ +
+ + " . gettext("You must apply the changes in order for them to take effect.")); + ?> + +
+ + + +
+ +
+ +
+ + + + + + + + + + + + + + + + "; + $i = 0; + foreach ($a_gateways as $gateway): + if (isset($gateway['disabled']) || isset($gateway['inactive'])) { + $textss = ""; + $iconfn = "pass_d"; + } else { + $textss = ""; + $iconfn = "pass"; + } + ?> + + + + + + + + + + + + + + + + + + +
  + + + + + +
+ + add + +
+
+ + + + +   + + + + " alt="icon" /> + + + " alt="icon" /> + + + " alt="icon" /> + + + (default)"; + echo $textse; + ?> + + + + + + + + + + + + + + + + + + + + + + + + +
+ + edit + + + ')"> + delete + +
+ + add + +
+
+ + + + + +
+ + " border="0" alt="delete" /> + + " + onclick="return confirm('')" /> + + + + edit + +
+
+ +
+ +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/usr/local/www/system_gateways_tabs.php b/usr/local/www/system_gateways_tabs.php new file mode 100644 index 000000000..e69de29bb diff --git a/usr/local/www/system_hasync.php b/usr/local/www/system_hasync.php index 17eff6255..d0ba41bb2 100755 --- a/usr/local/www/system_hasync.php +++ b/usr/local/www/system_hasync.php @@ -101,259 +101,284 @@ $pgtitle = array(gettext("System"),gettext("High Availability Sync")); $shortcut_section = "carp"; include("head.inc"); ?> - + + -
- - - - -
-
+ + +
+
+ +
+ +
+
+ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
State Synchronization Settings (pfsync)
Synchronize States - /> -
- pfsync transfers state insertion, update, and deletion messages between firewalls. Each firewall sends these messages out via multicast on a specified interface, using the PFSYNC protocol (IP Protocol 240). It also listens on that interface for similar messages from other firewalls, and imports them into the local state table.

This setting should be enabled on all members of a failover group.

NOTE: Clicking save will force a configuration sync if it is enabled! (see Configuration Synchronization Settings below)

-
Synchronize Interface - -
- If Synchronize States is enabled, it will utilize this interface for communication.
- NOTE: We recommend setting this to a interface other than LAN! A dedicated interface works the best.
- NOTE: You must define a IP on each machine participating in this failover group.
- NOTE: You must have an IP assigned to the interface on any participating sync nodes. -
pfsync Synchronize Peer IP - ' /> -
- Setting this option will force pfsync to synchronize its state table to this IP address. The default is directed multicast. -
 
Configuration Synchronization Settings (XMLRPC Sync)
Synchronize Config to IP - ' /> -
- Enter the IP address of the firewall to which the selected configuration sections should be synchronized.
-
- NOTE: XMLRPC sync is currently only supported over connections using the same protocol and port as this system - make sure the remote system's port and protocol are set accordingly!
-
- NOTE: Do not use the Synchronize Config to IP and password option on backup cluster members! -
Remote System Username - ' /> -
- Enter the webConfigurator username of the system entered above for synchronizing your configuration.
-
- NOTE: Do not use the Synchronize Config to IP and username option on backup cluster members! -
Remote System Password - ' /> -
- Enter the webConfigurator password of the system entered above for synchronizing your configuration.
-
- NOTE: Do not use the Synchronize Config to IP and password option on backup cluster members! -
Synchronize Users and Groups - /> -
- When this option is enabled, this system will automatically sync the users and groups over to the other HA host when changes are made. -
Synchronize Auth Servers - /> -
- When this option is enabled, this system will automatically sync the authentication servers (e.g. LDAP, RADIUS) over to the other HA host when changes are made. -
Synchronize Certificates - /> -
- When this option is enabled, this system will automatically sync the Certificate Authorities, Certificates, and Certificate Revocation Lists over to the other HA host when changes are made. -
Synchronize rules - /> -
- When this option is enabled, this system will automatically sync the firewall rules to the other HA host when changes are made. -
Synchronize Firewall Schedules - /> -
- When this option is enabled, this system will automatically sync the firewall schedules to the other HA host when changes are made. -
Synchronize aliases - /> -
- When this option is enabled, this system will automatically sync the aliases over to the other HA host when changes are made. -
Synchronize NAT - /> -
- When this option is enabled, this system will automatically sync the NAT rules over to the other HA host when changes are made. -
Synchronize IPsec - /> -
- When this option is enabled, this system will automatically sync the IPsec configuration to the other HA host when changes are made. -
Synchronize OpenVPN - /> -
- When this option is enabled, this system will automatically sync the OpenVPN configuration to the other HA host when changes are made. Using this option implies "Synchronize Certificates" as they are required for OpenVPN. -
Synchronize DHCPD - /> -
- When this option is enabled, this system will automatically sync the DHCP Server settings over to the other HA host when changes are made. This only applies to DHCP for IPv4. -
Synchronize Wake on LAN - /> -
- When this option is enabled, this system will automatically sync the WoL configuration to the other HA host when changes are made. -
Synchronize Static Routes - /> -
- When this option is enabled, this system will automatically sync the Static Route configuration to the other HA host when changes are made. -
Synchronize Load Balancer - /> -
- When this option is enabled, this system will automatically sync the Load Balancer configuration to the other HA host when changes are made. -
Synchronize Virtual IPs - /> -
- When this option is enabled, this system will automatically sync the CARP Virtual IPs to the other HA host when changes are made. -
Synchronize traffic shaper(queues) - /> -
- When this option is enabled, this system will automatically sync the traffic shaper configuration for queues to the other HA host when changes are made. -
Synchronize traffic shaper(limiter) - /> -
- When this option is enabled, this system will automatically sync the traffic shaper configuration for limiters to the other HA host when changes are made. -
Synchronize traffic shaper(layer7) - /> -
- When this option is enabled, this system will automatically sync the traffic shaper configuration for layer7 to the other HA host when changes are made. -
Synchronize DNS Forwarder - /> -
- When this option is enabled, this system will automatically sync the DNS Forwarder configuration to the other HA host when changes are made. -
Synchronize Captive Portal - /> -
- When this option is enabled, this system will automatically sync the Captive Portal configuration to the other HA host when changes are made. -
 
  - - - " onclick="window.location.href=''" /> -
- -
-
-
- - - +
+ + + + + + + + + + + + + + + + + + + + + + + + +
State Synchronization Settings (pfsync)
Synchronize States + /> +
+ pfsync transfers state insertion, update, and deletion messages between firewalls. Each firewall sends these messages out via multicast on a specified interface, using the PFSYNC protocol (IP Protocol 240). It also listens on that interface for similar messages from other firewalls, and imports them into the local state table.

This setting should be enabled on all members of a failover group.

NOTE: Clicking save will force a configuration sync if it is enabled! (see Configuration Synchronization Settings below)

+
Synchronize Interface + +
+ If Synchronize States is enabled, it will utilize this interface for communication.
+ NOTE: We recommend setting this to a interface other than LAN! A dedicated interface works the best.
+ NOTE: You must define a IP on each machine participating in this failover group.
+ NOTE: You must have an IP assigned to the interface on any participating sync nodes. +
pfsync Synchronize Peer IP + ' /> +
+ Setting this option will force pfsync to synchronize its state table to this IP address. The default is directed multicast. +
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Configuration Synchronization Settings (XMLRPC Sync)
Synchronize Config to IP + ' /> +
+ Enter the IP address of the firewall to which the selected configuration sections should be synchronized.
+
+ NOTE: XMLRPC sync is currently only supported over connections using the same protocol and port as this system - make sure the remote system's port and protocol are set accordingly!
+
+ NOTE: Do not use the Synchronize Config to IP and password option on backup cluster members! +
Remote System Username + ' /> +
+ Enter the webConfigurator username of the system entered above for synchronizing your configuration.
+
+ NOTE: Do not use the Synchronize Config to IP and username option on backup cluster members! +
Remote System Password + ' /> +
+ Enter the webConfigurator password of the system entered above for synchronizing your configuration.
+
+ NOTE: Do not use the Synchronize Config to IP and password option on backup cluster members! +
Synchronize Users and Groups + /> +
+ When this option is enabled, this system will automatically sync the users and groups over to the other HA host when changes are made. +
Synchronize Auth Servers + /> +
+ When this option is enabled, this system will automatically sync the authentication servers (e.g. LDAP, RADIUS) over to the other HA host when changes are made. +
Synchronize Certificates + /> +
+ When this option is enabled, this system will automatically sync the Certificate Authorities, Certificates, and Certificate Revocation Lists over to the other HA host when changes are made. +
Synchronize rules + /> +
+ When this option is enabled, this system will automatically sync the firewall rules to the other HA host when changes are made. +
Synchronize Firewall Schedules + /> +
+ When this option is enabled, this system will automatically sync the firewall schedules to the other HA host when changes are made. +
Synchronize aliases + /> +
+ When this option is enabled, this system will automatically sync the aliases over to the other HA host when changes are made. +
Synchronize NAT + /> +
+ When this option is enabled, this system will automatically sync the NAT rules over to the other HA host when changes are made. +
Synchronize IPsec + /> +
+ When this option is enabled, this system will automatically sync the IPsec configuration to the other HA host when changes are made. +
Synchronize OpenVPN + /> +
+ When this option is enabled, this system will automatically sync the OpenVPN configuration to the other HA host when changes are made. Using this option implies "Synchronize Certificates" as they are required for OpenVPN. +
Synchronize DHCPD + /> +
+ When this option is enabled, this system will automatically sync the DHCP Server settings over to the other HA host when changes are made. This only applies to DHCP for IPv4. +
Synchronize Wake on LAN + /> +
+ When this option is enabled, this system will automatically sync the WoL configuration to the other HA host when changes are made. +
Synchronize Static Routes + /> +
+ When this option is enabled, this system will automatically sync the Static Route configuration to the other HA host when changes are made. +
Synchronize Load Balancer + /> +
+ When this option is enabled, this system will automatically sync the Load Balancer configuration to the other HA host when changes are made. +
Synchronize Virtual IPs + /> +
+ When this option is enabled, this system will automatically sync the CARP Virtual IPs to the other HA host when changes are made. +
Synchronize traffic shaper(queues) + /> +
+ When this option is enabled, this system will automatically sync the traffic shaper configuration for queues to the other HA host when changes are made. +
Synchronize traffic shaper(limiter) + /> +
+ When this option is enabled, this system will automatically sync the traffic shaper configuration for limiters to the other HA host when changes are made. +
Synchronize traffic shaper(layer7) + /> +
+ When this option is enabled, this system will automatically sync the traffic shaper configuration for layer7 to the other HA host when changes are made. +
Synchronize DNS Forwarder + /> +
+ When this option is enabled, this system will automatically sync the DNS Forwarder configuration to the other HA host when changes are made. +
Synchronize Captive Portal + /> +
+ When this option is enabled, this system will automatically sync the Captive Portal configuration to the other HA host when changes are made. +
 
  + + + " onclick="window.location.href=''" /> +
+
+ + + + + + + + + + + + + diff --git a/usr/local/www/system_manager_tabs.php b/usr/local/www/system_manager_tabs.php new file mode 100644 index 000000000..34f719e7b --- /dev/null +++ b/usr/local/www/system_manager_tabs.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/usr/local/www/system_tabs.php b/usr/local/www/system_tabs.php new file mode 100644 index 000000000..21b1ee841 --- /dev/null +++ b/usr/local/www/system_tabs.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.eot b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.eot new file mode 100644 index 000000000..fd6630a61 Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.eot differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.otf b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.otf new file mode 100755 index 000000000..597072f58 Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.otf differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.svg b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.svg new file mode 100644 index 000000000..31d477b8f --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.svg @@ -0,0 +1,5882 @@ + + + + +Created by FontXChange 20110222 at Wed Oct 15 12:25:40 2014 + By Nick Noordijk +Copyright 2010, 2012 Adobe Systems Incorporated. All Rights Reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff new file mode 100644 index 000000000..2fbc3f8ec Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot new file mode 100644 index 000000000..0828b5a41 Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.otf b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.otf new file mode 100755 index 000000000..38941ae72 Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.otf differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.svg b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.svg new file mode 100644 index 000000000..c894564e8 --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.svg @@ -0,0 +1,6184 @@ + + + + +Created by FontXChange 20110222 at Wed Oct 15 12:25:40 2014 + By Nick Noordijk +Copyright 2010, 2012 Adobe Systems Incorporated. All Rights Reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff new file mode 100644 index 000000000..9ae0af8b6 Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot new file mode 100644 index 000000000..18dd23d83 Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.otf b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.otf new file mode 100755 index 000000000..fd41bcf1c Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.otf differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.svg b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.svg new file mode 100644 index 000000000..e342d8fe9 --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.svg @@ -0,0 +1,6126 @@ + + + + +Created by FontXChange 20110222 at Wed Oct 15 12:25:40 2014 + By Nick Noordijk +Copyright 2010, 2012 Adobe Systems Incorporated. All Rights Reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff new file mode 100644 index 000000000..ae0fecd9c Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.eot b/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.eot new file mode 100755 index 000000000..4a4ca865d Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.eot differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.svg b/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.svg new file mode 100755 index 000000000..e3e2dc739 --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf b/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf new file mode 100755 index 000000000..67fa00bf8 Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf differ diff --git a/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.woff b/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.woff new file mode 100755 index 000000000..8c54182aa Binary files /dev/null and b/usr/local/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.woff differ diff --git a/usr/local/www/themes/opnsense/assets/javascripts/bootstrap-sprockets.js b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap-sprockets.js new file mode 100755 index 000000000..1abde496e --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap-sprockets.js @@ -0,0 +1,12 @@ +//= require ./bootstrap/affix +//= require ./bootstrap/alert +//= require ./bootstrap/button +//= require ./bootstrap/carousel +//= require ./bootstrap/collapse +//= require ./bootstrap/dropdown +//= require ./bootstrap/tab +//= require ./bootstrap/transition +//= require ./bootstrap/scrollspy +//= require ./bootstrap/modal +//= require ./bootstrap/tooltip +//= require ./bootstrap/popover diff --git a/usr/local/www/themes/opnsense/assets/javascripts/bootstrap.js b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap.js new file mode 100755 index 000000000..30409f488 --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap.js @@ -0,0 +1,2107 @@ +/* ======================================================================== + * Bootstrap: affix.js v3.2.0 + * http://getbootstrap.com/javascript/#affix + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // AFFIX CLASS DEFINITION + // ====================== + + var Affix = function (element, options) { + this.options = $.extend({}, Affix.DEFAULTS, options) + + this.$target = $(this.options.target) + .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) + + this.$element = $(element) + this.affixed = + this.unpin = + this.pinnedOffset = null + + this.checkPosition() + } + + Affix.VERSION = '3.2.0' + + Affix.RESET = 'affix affix-top affix-bottom' + + Affix.DEFAULTS = { + offset: 0, + target: window + } + + Affix.prototype.getPinnedOffset = function () { + if (this.pinnedOffset) return this.pinnedOffset + this.$element.removeClass(Affix.RESET).addClass('affix') + var scrollTop = this.$target.scrollTop() + var position = this.$element.offset() + return (this.pinnedOffset = position.top - scrollTop) + } + + Affix.prototype.checkPositionWithEventLoop = function () { + setTimeout($.proxy(this.checkPosition, this), 1) + } + + Affix.prototype.checkPosition = function () { + if (!this.$element.is(':visible')) return + + var scrollHeight = $(document).height() + var scrollTop = this.$target.scrollTop() + var position = this.$element.offset() + var offset = this.options.offset + var offsetTop = offset.top + var offsetBottom = offset.bottom + + if (typeof offset != 'object') offsetBottom = offsetTop = offset + if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) + + var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false : + offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' : + offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false + + if (this.affixed === affix) return + if (this.unpin != null) this.$element.css('top', '') + + var affixType = 'affix' + (affix ? '-' + affix : '') + var e = $.Event(affixType + '.bs.affix') + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + this.affixed = affix + this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null + + this.$element + .removeClass(Affix.RESET) + .addClass(affixType) + .trigger($.Event(affixType.replace('affix', 'affixed'))) + + if (affix == 'bottom') { + this.$element.offset({ + top: scrollHeight - this.$element.height() - offsetBottom + }) + } + } + + + // AFFIX PLUGIN DEFINITION + // ======================= + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.affix') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.affix + + $.fn.affix = Plugin + $.fn.affix.Constructor = Affix + + + // AFFIX NO CONFLICT + // ================= + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } + + + // AFFIX DATA-API + // ============== + + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + var data = $spy.data() + + data.offset = data.offset || {} + + if (data.offsetBottom) data.offset.bottom = data.offsetBottom + if (data.offsetTop) data.offset.top = data.offsetTop + + Plugin.call($spy, data) + }) + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: alert.js v3.2.0 + * http://getbootstrap.com/javascript/#alerts + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // ALERT CLASS DEFINITION + // ====================== + + var dismiss = '[data-dismiss="alert"]' + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.VERSION = '3.2.0' + + Alert.prototype.close = function (e) { + var $this = $(this) + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = $(selector) + + if (e) e.preventDefault() + + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } + + $parent.trigger(e = $.Event('close.bs.alert')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + // detach from parent, fire event then clean up data + $parent.detach().trigger('closed.bs.alert').remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent + .one('bsTransitionEnd', removeElement) + .emulateTransitionEnd(150) : + removeElement() + } + + + // ALERT PLUGIN DEFINITION + // ======================= + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + var old = $.fn.alert + + $.fn.alert = Plugin + $.fn.alert.Constructor = Alert + + + // ALERT NO CONFLICT + // ================= + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + + // ALERT DATA-API + // ============== + + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: button.js v3.2.0 + * http://getbootstrap.com/javascript/#buttons + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // BUTTON PUBLIC CLASS DEFINITION + // ============================== + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Button.DEFAULTS, options) + this.isLoading = false + } + + Button.VERSION = '3.2.0' + + Button.DEFAULTS = { + loadingText: 'loading...' + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() + + state = state + 'Text' + + if (data.resetText == null) $el.data('resetText', $el[val]()) + + $el[val](data[state] == null ? this.options[state] : data[state]) + + // push to event loop to allow forms to submit + setTimeout($.proxy(function () { + if (state == 'loadingText') { + this.isLoading = true + $el.addClass(d).attr(d, d) + } else if (this.isLoading) { + this.isLoading = false + $el.removeClass(d).removeAttr(d) + } + }, this), 0) + } + + Button.prototype.toggle = function () { + var changed = true + var $parent = this.$element.closest('[data-toggle="buttons"]') + + if ($parent.length) { + var $input = this.$element.find('input') + if ($input.prop('type') == 'radio') { + if ($input.prop('checked') && this.$element.hasClass('active')) changed = false + else $parent.find('.active').removeClass('active') + } + if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') + } + + if (changed) this.$element.toggleClass('active') + } + + + // BUTTON PLUGIN DEFINITION + // ======================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + var old = $.fn.button + + $.fn.button = Plugin + $.fn.button.Constructor = Button + + + // BUTTON NO CONFLICT + // ================== + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + + // BUTTON DATA-API + // =============== + + $(document).on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + Plugin.call($btn, 'toggle') + e.preventDefault() + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: carousel.js v3.2.0 + * http://getbootstrap.com/javascript/#carousel + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // CAROUSEL CLASS DEFINITION + // ========================= + + var Carousel = function (element, options) { + this.$element = $(element).on('keydown.bs.carousel', $.proxy(this.keydown, this)) + this.$indicators = this.$element.find('.carousel-indicators') + this.options = options + this.paused = + this.sliding = + this.interval = + this.$active = + this.$items = null + + this.options.pause == 'hover' && this.$element + .on('mouseenter.bs.carousel', $.proxy(this.pause, this)) + .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) + } + + Carousel.VERSION = '3.2.0' + + Carousel.DEFAULTS = { + interval: 5000, + pause: 'hover', + wrap: true + } + + Carousel.prototype.keydown = function (e) { + switch (e.which) { + case 37: this.prev(); break + case 39: this.next(); break + default: return + } + + e.preventDefault() + } + + Carousel.prototype.cycle = function (e) { + e || (this.paused = false) + + this.interval && clearInterval(this.interval) + + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + + return this + } + + Carousel.prototype.getItemIndex = function (item) { + this.$items = item.parent().children('.item') + return this.$items.index(item || this.$active) + } + + Carousel.prototype.to = function (pos) { + var that = this + var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active')) + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid" + if (activeIndex == pos) return this.pause().cycle() + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + Carousel.prototype.pause = function (e) { + e || (this.paused = true) + + if (this.$element.find('.next, .prev').length && $.support.transition) { + this.$element.trigger($.support.transition.end) + this.cycle(true) + } + + this.interval = clearInterval(this.interval) + + return this + } + + Carousel.prototype.next = function () { + if (this.sliding) return + return this.slide('next') + } + + Carousel.prototype.prev = function () { + if (this.sliding) return + return this.slide('prev') + } + + Carousel.prototype.slide = function (type, next) { + var $active = this.$element.find('.item.active') + var $next = next || $active[type]() + var isCycling = this.interval + var direction = type == 'next' ? 'left' : 'right' + var fallback = type == 'next' ? 'first' : 'last' + var that = this + + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() + } + + if ($next.hasClass('active')) return (this.sliding = false) + + var relatedTarget = $next[0] + var slideEvent = $.Event('slide.bs.carousel', { + relatedTarget: relatedTarget, + direction: direction + }) + this.$element.trigger(slideEvent) + if (slideEvent.isDefaultPrevented()) return + + this.sliding = true + + isCycling && this.pause() + + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)]) + $nextIndicator && $nextIndicator.addClass('active') + } + + var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid" + if ($.support.transition && this.$element.hasClass('slide')) { + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + $active + .one('bsTransitionEnd', function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { + that.$element.trigger(slidEvent) + }, 0) + }) + .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000) + } else { + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger(slidEvent) + } + + isCycling && this.cycle() + + return this + } + + + // CAROUSEL PLUGIN DEFINITION + // ========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.carousel') + var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) + var action = typeof option == 'string' ? option : options.slide + + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.pause().cycle() + }) + } + + var old = $.fn.carousel + + $.fn.carousel = Plugin + $.fn.carousel.Constructor = Carousel + + + // CAROUSEL NO CONFLICT + // ==================== + + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + + + // CAROUSEL DATA-API + // ================= + + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var href + var $this = $(this) + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7 + if (!$target.hasClass('carousel')) return + var options = $.extend({}, $target.data(), $this.data()) + var slideIndex = $this.attr('data-slide-to') + if (slideIndex) options.interval = false + + Plugin.call($target, options) + + if (slideIndex) { + $target.data('bs.carousel').to(slideIndex) + } + + e.preventDefault() + }) + + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + Plugin.call($carousel, $carousel.data()) + }) + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: collapse.js v3.2.0 + * http://getbootstrap.com/javascript/#collapse + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() + } + + Collapse.VERSION = '3.2.0' + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var actives = this.$parent && this.$parent.find('> .panel > .in') + + if (actives && actives.length) { + var hasData = actives.data('bs.collapse') + if (hasData && hasData.transitioning) return + Plugin.call(actives, 'hide') + hasData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing')[dimension](0) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('collapse in')[dimension]('') + this.transitioning = 0 + this.$element + .trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one('bsTransitionEnd', $.proxy(complete, this)) + .emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element[dimension](this.$element[dimension]())[0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse') + .removeClass('in') + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .trigger('hidden.bs.collapse') + .removeClass('collapsing') + .addClass('collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one('bsTransitionEnd', $.proxy(complete, this)) + .emulateTransitionEnd(350) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data && options.toggle && option == 'show') option = !option + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.collapse + + $.fn.collapse = Plugin + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) { + var href + var $this = $(this) + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7 + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + + if (!data || !data.transitioning) { + if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + } + + Plugin.call($target, option) + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: dropdown.js v3.2.0 + * http://getbootstrap.com/javascript/#dropdowns + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle="dropdown"]' + var Dropdown = function (element) { + $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.VERSION = '3.2.0' + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we use a backdrop because click events don't delegate + $('
').insertAfter($(this)).on('click', clearMenus) + } + + var relatedTarget = { relatedTarget: this } + $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $this.trigger('focus') + + $parent + .toggleClass('open') + .trigger('shown.bs.dropdown', relatedTarget) + } + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27)/.test(e.keyCode)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).trigger('focus') + return $this.trigger('click') + } + + var desc = ' li:not(.divider):visible a' + var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc) + + if (!$items.length) return + + var index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index = 0 + + $items.eq(index).trigger('focus') + } + + function clearMenus(e) { + if (e && e.which === 3) return + $(backdrop).remove() + $(toggle).each(function () { + var $parent = getParent($(this)) + var relatedTarget = { relatedTarget: this } + if (!$parent.hasClass('open')) return + $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) + if (e.isDefaultPrevented()) return + $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget) + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + + // DROPDOWN PLUGIN DEFINITION + // ========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.dropdown') + + if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + var old = $.fn.dropdown + + $.fn.dropdown = Plugin + $.fn.dropdown.Constructor = Dropdown + + + // DROPDOWN NO CONFLICT + // ==================== + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== + + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: tab.js v3.2.0 + * http://getbootstrap.com/javascript/#tabs + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // TAB CLASS DEFINITION + // ==================== + + var Tab = function (element) { + this.element = $(element) + } + + Tab.VERSION = '3.2.0' + + Tab.prototype.show = function () { + var $this = this.element + var $ul = $this.closest('ul:not(.dropdown-menu)') + var selector = $this.data('target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + if ($this.parent('li').hasClass('active')) return + + var previous = $ul.find('.active:last a')[0] + var e = $.Event('show.bs.tab', { + relatedTarget: previous + }) + + $this.trigger(e) + + if (e.isDefaultPrevented()) return + + var $target = $(selector) + + this.activate($this.closest('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown.bs.tab', + relatedTarget: previous + }) + }) + } + + Tab.prototype.activate = function (element, container, callback) { + var $active = container.find('> .active') + var transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if (element.parent('.dropdown-menu')) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active + .one('bsTransitionEnd', next) + .emulateTransitionEnd(150) : + next() + + $active.removeClass('in') + } + + + // TAB PLUGIN DEFINITION + // ===================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tab') + + if (!data) $this.data('bs.tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.tab + + $.fn.tab = Plugin + $.fn.tab.Constructor = Tab + + + // TAB NO CONFLICT + // =============== + + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } + + + // TAB DATA-API + // ============ + + $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + Plugin.call($(this), 'show') + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: transition.js v3.2.0 + * http://getbootstrap.com/javascript/#transitions + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) + // ============================================================ + + function transitionEnd() { + var el = document.createElement('bootstrap') + + var transEndEventNames = { + WebkitTransition : 'webkitTransitionEnd', + MozTransition : 'transitionend', + OTransition : 'oTransitionEnd otransitionend', + transition : 'transitionend' + } + + for (var name in transEndEventNames) { + if (el.style[name] !== undefined) { + return { end: transEndEventNames[name] } + } + } + + return false // explicit for ie8 ( ._.) + } + + // http://blog.alexmaccaw.com/css-transitions + $.fn.emulateTransitionEnd = function (duration) { + var called = false + var $el = this + $(this).one('bsTransitionEnd', function () { called = true }) + var callback = function () { if (!called) $($el).trigger($.support.transition.end) } + setTimeout(callback, duration) + return this + } + + $(function () { + $.support.transition = transitionEnd() + + if (!$.support.transition) return + + $.event.special.bsTransitionEnd = { + bindType: $.support.transition.end, + delegateType: $.support.transition.end, + handle: function (e) { + if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments) + } + } + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: scrollspy.js v3.2.0 + * http://getbootstrap.com/javascript/#scrollspy + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // SCROLLSPY CLASS DEFINITION + // ========================== + + function ScrollSpy(element, options) { + var process = $.proxy(this.process, this) + + this.$body = $('body') + this.$scrollElement = $(element).is('body') ? $(window) : $(element) + this.options = $.extend({}, ScrollSpy.DEFAULTS, options) + this.selector = (this.options.target || '') + ' .nav li > a' + this.offsets = [] + this.targets = [] + this.activeTarget = null + this.scrollHeight = 0 + + this.$scrollElement.on('scroll.bs.scrollspy', process) + this.refresh() + this.process() + } + + ScrollSpy.VERSION = '3.2.0' + + ScrollSpy.DEFAULTS = { + offset: 10 + } + + ScrollSpy.prototype.getScrollHeight = function () { + return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight) + } + + ScrollSpy.prototype.refresh = function () { + var offsetMethod = 'offset' + var offsetBase = 0 + + if (!$.isWindow(this.$scrollElement[0])) { + offsetMethod = 'position' + offsetBase = this.$scrollElement.scrollTop() + } + + this.offsets = [] + this.targets = [] + this.scrollHeight = this.getScrollHeight() + + var self = this + + this.$body + .find(this.selector) + .map(function () { + var $el = $(this) + var href = $el.data('target') || $el.attr('href') + var $href = /^#./.test(href) && $(href) + + return ($href + && $href.length + && $href.is(':visible') + && [[$href[offsetMethod]().top + offsetBase, href]]) || null + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) + }) + } + + ScrollSpy.prototype.process = function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + var scrollHeight = this.getScrollHeight() + var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height() + var offsets = this.offsets + var targets = this.targets + var activeTarget = this.activeTarget + var i + + if (this.scrollHeight != scrollHeight) { + this.refresh() + } + + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets[targets.length - 1]) && this.activate(i) + } + + if (activeTarget && scrollTop <= offsets[0]) { + return activeTarget != (i = targets[0]) && this.activate(i) + } + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate(targets[i]) + } + } + + ScrollSpy.prototype.activate = function (target) { + this.activeTarget = target + + $(this.selector) + .parentsUntil(this.options.target, '.active') + .removeClass('active') + + var selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' + + var active = $(selector) + .parents('li') + .addClass('active') + + if (active.parent('.dropdown-menu').length) { + active = active + .closest('li.dropdown') + .addClass('active') + } + + active.trigger('activate.bs.scrollspy') + } + + + // SCROLLSPY PLUGIN DEFINITION + // =========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.scrollspy') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.scrollspy + + $.fn.scrollspy = Plugin + $.fn.scrollspy.Constructor = ScrollSpy + + + // SCROLLSPY NO CONFLICT + // ===================== + + $.fn.scrollspy.noConflict = function () { + $.fn.scrollspy = old + return this + } + + + // SCROLLSPY DATA-API + // ================== + + $(window).on('load.bs.scrollspy.data-api', function () { + $('[data-spy="scroll"]').each(function () { + var $spy = $(this) + Plugin.call($spy, $spy.data()) + }) + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: modal.js v3.2.0 + * http://getbootstrap.com/javascript/#modals + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // MODAL CLASS DEFINITION + // ====================== + + var Modal = function (element, options) { + this.options = options + this.$body = $(document.body) + this.$element = $(element) + this.$backdrop = + this.isShown = null + this.scrollbarWidth = 0 + + if (this.options.remote) { + this.$element + .find('.modal-content') + .load(this.options.remote, $.proxy(function () { + this.$element.trigger('loaded.bs.modal') + }, this)) + } + } + + Modal.VERSION = '3.2.0' + + Modal.DEFAULTS = { + backdrop: true, + keyboard: true, + show: true + } + + Modal.prototype.toggle = function (_relatedTarget) { + return this.isShown ? this.hide() : this.show(_relatedTarget) + } + + Modal.prototype.show = function (_relatedTarget) { + var that = this + var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) + + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + this.isShown = true + + this.checkScrollbar() + this.$body.addClass('modal-open') + + this.setScrollbar() + this.escape() + + this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(that.$body) // don't move modals dom position + } + + that.$element + .show() + .scrollTop(0) + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .attr('aria-hidden', false) + + that.enforceFocus() + + var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) + + transition ? + that.$element.find('.modal-dialog') // wait for modal to slide in + .one('bsTransitionEnd', function () { + that.$element.trigger('focus').trigger(e) + }) + .emulateTransitionEnd(300) : + that.$element.trigger('focus').trigger(e) + }) + } + + Modal.prototype.hide = function (e) { + if (e) e.preventDefault() + + e = $.Event('hide.bs.modal') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + this.$body.removeClass('modal-open') + + this.resetScrollbar() + this.escape() + + $(document).off('focusin.bs.modal') + + this.$element + .removeClass('in') + .attr('aria-hidden', true) + .off('click.dismiss.bs.modal') + + $.support.transition && this.$element.hasClass('fade') ? + this.$element + .one('bsTransitionEnd', $.proxy(this.hideModal, this)) + .emulateTransitionEnd(300) : + this.hideModal() + } + + Modal.prototype.enforceFocus = function () { + $(document) + .off('focusin.bs.modal') // guard against infinite focus loop + .on('focusin.bs.modal', $.proxy(function (e) { + if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { + this.$element.trigger('focus') + } + }, this)) + } + + Modal.prototype.escape = function () { + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) { + e.which == 27 && this.hide() + }, this)) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.bs.modal') + } + } + + Modal.prototype.hideModal = function () { + var that = this + this.$element.hide() + this.backdrop(function () { + that.$element.trigger('hidden.bs.modal') + }) + } + + Modal.prototype.removeBackdrop = function () { + this.$backdrop && this.$backdrop.remove() + this.$backdrop = null + } + + Modal.prototype.backdrop = function (callback) { + var that = this + var animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
') + .appendTo(this.$body) + + this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) { + if (e.target !== e.currentTarget) return + this.options.backdrop == 'static' + ? this.$element[0].focus.call(this.$element[0]) + : this.hide.call(this) + }, this)) + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + if (!callback) return + + doAnimate ? + this.$backdrop + .one('bsTransitionEnd', callback) + .emulateTransitionEnd(150) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + var callbackRemove = function () { + that.removeBackdrop() + callback && callback() + } + $.support.transition && this.$element.hasClass('fade') ? + this.$backdrop + .one('bsTransitionEnd', callbackRemove) + .emulateTransitionEnd(150) : + callbackRemove() + + } else if (callback) { + callback() + } + } + + Modal.prototype.checkScrollbar = function () { + if (document.body.clientWidth >= window.innerWidth) return + this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar() + } + + Modal.prototype.setScrollbar = function () { + var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) + if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) + } + + Modal.prototype.resetScrollbar = function () { + this.$body.css('padding-right', '') + } + + Modal.prototype.measureScrollbar = function () { // thx walsh + var scrollDiv = document.createElement('div') + scrollDiv.className = 'modal-scrollbar-measure' + this.$body.append(scrollDiv) + var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth + this.$body[0].removeChild(scrollDiv) + return scrollbarWidth + } + + + // MODAL PLUGIN DEFINITION + // ======================= + + function Plugin(option, _relatedTarget) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.modal') + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option](_relatedTarget) + else if (options.show) data.show(_relatedTarget) + }) + } + + var old = $.fn.modal + + $.fn.modal = Plugin + $.fn.modal.Constructor = Modal + + + // MODAL NO CONFLICT + // ================= + + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } + + + // MODAL DATA-API + // ============== + + $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + var href = $this.attr('href') + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7 + var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + + if ($this.is('a')) e.preventDefault() + + $target.one('show.bs.modal', function (showEvent) { + if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown + $target.one('hidden.bs.modal', function () { + $this.is(':visible') && $this.trigger('focus') + }) + }) + Plugin.call($target, option, this) + }) + +}(jQuery); + +/* ======================================================================== + * Bootstrap: tooltip.js v3.2.0 + * http://getbootstrap.com/javascript/#tooltip + * Inspired by the original jQuery.tipsy by Jason Frame + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // TOOLTIP PUBLIC CLASS DEFINITION + // =============================== + + var Tooltip = function (element, options) { + this.type = + this.options = + this.enabled = + this.timeout = + this.hoverState = + this.$element = null + + this.init('tooltip', element, options) + } + + Tooltip.VERSION = '3.2.0' + + Tooltip.DEFAULTS = { + animation: true, + placement: 'top', + selector: false, + template: '', + trigger: 'hover focus', + title: '', + delay: 0, + html: false, + container: false, + viewport: { + selector: 'body', + padding: 0 + } + } + + Tooltip.prototype.init = function (type, element, options) { + this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport) + + var triggers = this.options.trigger.split(' ') + + for (var i = triggers.length; i--;) { + var trigger = triggers[i] + + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin' + var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout' + + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + Tooltip.prototype.getDefaults = function () { + return Tooltip.DEFAULTS + } + + Tooltip.prototype.getOptions = function (options) { + options = $.extend({}, this.getDefaults(), this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay, + hide: options.delay + } + } + + return options + } + + Tooltip.prototype.getDelegateOptions = function () { + var options = {} + var defaults = this.getDefaults() + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }) + + return options + } + + Tooltip.prototype.enter = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget).data('bs.' + this.type) + + if (!self) { + self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) + $(obj.currentTarget).data('bs.' + this.type, self) + } + + clearTimeout(self.timeout) + + self.hoverState = 'in' + + if (!self.options.delay || !self.options.delay.show) return self.show() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + Tooltip.prototype.leave = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget).data('bs.' + this.type) + + if (!self) { + self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) + $(obj.currentTarget).data('bs.' + this.type, self) + } + + clearTimeout(self.timeout) + + self.hoverState = 'out' + + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + Tooltip.prototype.show = function () { + var e = $.Event('show.bs.' + this.type) + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + + var inDom = $.contains(document.documentElement, this.$element[0]) + if (e.isDefaultPrevented() || !inDom) return + var that = this + + var $tip = this.tip() + + var tipId = this.getUID(this.type) + + this.setContent() + $tip.attr('id', tipId) + this.$element.attr('aria-describedby', tipId) + + if (this.options.animation) $tip.addClass('fade') + + var placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + var autoToken = /\s?auto?\s?/i + var autoPlace = autoToken.test(placement) + if (autoPlace) placement = placement.replace(autoToken, '') || 'top' + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + .addClass(placement) + .data('bs.' + this.type, this) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + var pos = this.getPosition() + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (autoPlace) { + var orgPlacement = placement + var $parent = this.$element.parent() + var parentDim = this.getPosition($parent) + + placement = placement == 'bottom' && pos.top + pos.height + actualHeight - parentDim.scroll > parentDim.height ? 'top' : + placement == 'top' && pos.top - parentDim.scroll - actualHeight < 0 ? 'bottom' : + placement == 'right' && pos.right + actualWidth > parentDim.width ? 'left' : + placement == 'left' && pos.left - actualWidth < parentDim.left ? 'right' : + placement + + $tip + .removeClass(orgPlacement) + .addClass(placement) + } + + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) + + this.applyPlacement(calculatedOffset, placement) + + var complete = function () { + that.$element.trigger('shown.bs.' + that.type) + that.hoverState = null + } + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one('bsTransitionEnd', complete) + .emulateTransitionEnd(150) : + complete() + } + } + + Tooltip.prototype.applyPlacement = function (offset, placement) { + var $tip = this.tip() + var width = $tip[0].offsetWidth + var height = $tip[0].offsetHeight + + // manually read margins because getBoundingClientRect includes difference + var marginTop = parseInt($tip.css('margin-top'), 10) + var marginLeft = parseInt($tip.css('margin-left'), 10) + + // we must check for NaN for ie 8/9 + if (isNaN(marginTop)) marginTop = 0 + if (isNaN(marginLeft)) marginLeft = 0 + + offset.top = offset.top + marginTop + offset.left = offset.left + marginLeft + + // $.fn.offset doesn't round pixel values + // so we use setOffset directly with our own function B-0 + $.offset.setOffset($tip[0], $.extend({ + using: function (props) { + $tip.css({ + top: Math.round(props.top), + left: Math.round(props.left) + }) + } + }, offset), 0) + + $tip.addClass('in') + + // check to see if placing tip in new offset caused the tip to resize itself + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + offset.top = offset.top + height - actualHeight + } + + var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight) + + if (delta.left) offset.left += delta.left + else offset.top += delta.top + + var arrowDelta = delta.left ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight + var arrowPosition = delta.left ? 'left' : 'top' + var arrowOffsetPosition = delta.left ? 'offsetWidth' : 'offsetHeight' + + $tip.offset(offset) + this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], arrowPosition) + } + + Tooltip.prototype.replaceArrow = function (delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') + } + + Tooltip.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + Tooltip.prototype.hide = function () { + var that = this + var $tip = this.tip() + var e = $.Event('hide.bs.' + this.type) + + this.$element.removeAttr('aria-describedby') + + function complete() { + if (that.hoverState != 'in') $tip.detach() + that.$element.trigger('hidden.bs.' + that.type) + } + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + $tip.removeClass('in') + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one('bsTransitionEnd', complete) + .emulateTransitionEnd(150) : + complete() + + this.hoverState = null + + return this + } + + Tooltip.prototype.fixTitle = function () { + var $e = this.$element + if ($e.attr('title') || typeof ($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + Tooltip.prototype.hasContent = function () { + return this.getTitle() + } + + Tooltip.prototype.getPosition = function ($element) { + $element = $element || this.$element + var el = $element[0] + var isBody = el.tagName == 'BODY' + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : null, { + scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop(), + width: isBody ? $(window).width() : $element.outerWidth(), + height: isBody ? $(window).height() : $element.outerHeight() + }, isBody ? { top: 0, left: 0 } : $element.offset()) + } + + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + + } + + Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) { + var delta = { top: 0, left: 0 } + if (!this.$viewport) return delta + + var viewportPadding = this.options.viewport && this.options.viewport.padding || 0 + var viewportDimensions = this.getPosition(this.$viewport) + + if (/right|left/.test(placement)) { + var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll + var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight + if (topEdgeOffset < viewportDimensions.top) { // top overflow + delta.top = viewportDimensions.top - topEdgeOffset + } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow + delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset + } + } else { + var leftEdgeOffset = pos.left - viewportPadding + var rightEdgeOffset = pos.left + viewportPadding + actualWidth + if (leftEdgeOffset < viewportDimensions.left) { // left overflow + delta.left = viewportDimensions.left - leftEdgeOffset + } else if (rightEdgeOffset > viewportDimensions.width) { // right overflow + delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset + } + } + + return delta + } + + Tooltip.prototype.getTitle = function () { + var title + var $e = this.$element + var o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + Tooltip.prototype.getUID = function (prefix) { + do prefix += ~~(Math.random() * 1000000) + while (document.getElementById(prefix)) + return prefix + } + + Tooltip.prototype.tip = function () { + return (this.$tip = this.$tip || $(this.options.template)) + } + + Tooltip.prototype.arrow = function () { + return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')) + } + + Tooltip.prototype.validate = function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + Tooltip.prototype.enable = function () { + this.enabled = true + } + + Tooltip.prototype.disable = function () { + this.enabled = false + } + + Tooltip.prototype.toggleEnabled = function () { + this.enabled = !this.enabled + } + + Tooltip.prototype.toggle = function (e) { + var self = this + if (e) { + self = $(e.currentTarget).data('bs.' + this.type) + if (!self) { + self = new this.constructor(e.currentTarget, this.getDelegateOptions()) + $(e.currentTarget).data('bs.' + this.type, self) + } + } + + self.tip().hasClass('in') ? self.leave(self) : self.enter(self) + } + + Tooltip.prototype.destroy = function () { + clearTimeout(this.timeout) + this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) + } + + + // TOOLTIP PLUGIN DEFINITION + // ========================= + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + + if (!data && option == 'destroy') return + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.tooltip + + $.fn.tooltip = Plugin + $.fn.tooltip.Constructor = Tooltip + + + // TOOLTIP NO CONFLICT + // =================== + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(jQuery); + +/* ======================================================================== + * Bootstrap: popover.js v3.2.0 + * http://getbootstrap.com/javascript/#popovers + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // POPOVER PUBLIC CLASS DEFINITION + // =============================== + + var Popover = function (element, options) { + this.init('popover', element, options) + } + + if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') + + Popover.VERSION = '3.2.0' + + Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right', + trigger: 'click', + content: '', + template: '' + }) + + + // NOTE: POPOVER EXTENDS tooltip.js + // ================================ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) + + Popover.prototype.constructor = Popover + + Popover.prototype.getDefaults = function () { + return Popover.DEFAULTS + } + + Popover.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + var content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events + this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' + ](content) + + $tip.removeClass('fade top bottom left right in') + + // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do + // this manually by checking the contents. + if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() + } + + Popover.prototype.hasContent = function () { + return this.getTitle() || this.getContent() + } + + Popover.prototype.getContent = function () { + var $e = this.$element + var o = this.options + + return $e.attr('data-content') + || (typeof o.content == 'function' ? + o.content.call($e[0]) : + o.content) + } + + Popover.prototype.arrow = function () { + return (this.$arrow = this.$arrow || this.tip().find('.arrow')) + } + + Popover.prototype.tip = function () { + if (!this.$tip) this.$tip = $(this.options.template) + return this.$tip + } + + + // POPOVER PLUGIN DEFINITION + // ========================= + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + + if (!data && option == 'destroy') return + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.popover + + $.fn.popover = Plugin + $.fn.popover.Constructor = Popover + + + // POPOVER NO CONFLICT + // =================== + + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } + +}(jQuery); + diff --git a/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/affix.js b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/affix.js new file mode 100755 index 000000000..7d404ebee --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/affix.js @@ -0,0 +1,142 @@ +/* ======================================================================== + * Bootstrap: affix.js v3.2.0 + * http://getbootstrap.com/javascript/#affix + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // AFFIX CLASS DEFINITION + // ====================== + + var Affix = function (element, options) { + this.options = $.extend({}, Affix.DEFAULTS, options) + + this.$target = $(this.options.target) + .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) + + this.$element = $(element) + this.affixed = + this.unpin = + this.pinnedOffset = null + + this.checkPosition() + } + + Affix.VERSION = '3.2.0' + + Affix.RESET = 'affix affix-top affix-bottom' + + Affix.DEFAULTS = { + offset: 0, + target: window + } + + Affix.prototype.getPinnedOffset = function () { + if (this.pinnedOffset) return this.pinnedOffset + this.$element.removeClass(Affix.RESET).addClass('affix') + var scrollTop = this.$target.scrollTop() + var position = this.$element.offset() + return (this.pinnedOffset = position.top - scrollTop) + } + + Affix.prototype.checkPositionWithEventLoop = function () { + setTimeout($.proxy(this.checkPosition, this), 1) + } + + Affix.prototype.checkPosition = function () { + if (!this.$element.is(':visible')) return + + var scrollHeight = $(document).height() + var scrollTop = this.$target.scrollTop() + var position = this.$element.offset() + var offset = this.options.offset + var offsetTop = offset.top + var offsetBottom = offset.bottom + + if (typeof offset != 'object') offsetBottom = offsetTop = offset + if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) + + var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false : + offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' : + offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false + + if (this.affixed === affix) return + if (this.unpin != null) this.$element.css('top', '') + + var affixType = 'affix' + (affix ? '-' + affix : '') + var e = $.Event(affixType + '.bs.affix') + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + this.affixed = affix + this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null + + this.$element + .removeClass(Affix.RESET) + .addClass(affixType) + .trigger($.Event(affixType.replace('affix', 'affixed'))) + + if (affix == 'bottom') { + this.$element.offset({ + top: scrollHeight - this.$element.height() - offsetBottom + }) + } + } + + + // AFFIX PLUGIN DEFINITION + // ======================= + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.affix') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.affix + + $.fn.affix = Plugin + $.fn.affix.Constructor = Affix + + + // AFFIX NO CONFLICT + // ================= + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } + + + // AFFIX DATA-API + // ============== + + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + var data = $spy.data() + + data.offset = data.offset || {} + + if (data.offsetBottom) data.offset.bottom = data.offsetBottom + if (data.offsetTop) data.offset.top = data.offsetTop + + Plugin.call($spy, data) + }) + }) + +}(jQuery); diff --git a/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/alert.js b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/alert.js new file mode 100755 index 000000000..0efd92cba --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/alert.js @@ -0,0 +1,92 @@ +/* ======================================================================== + * Bootstrap: alert.js v3.2.0 + * http://getbootstrap.com/javascript/#alerts + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // ALERT CLASS DEFINITION + // ====================== + + var dismiss = '[data-dismiss="alert"]' + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.VERSION = '3.2.0' + + Alert.prototype.close = function (e) { + var $this = $(this) + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = $(selector) + + if (e) e.preventDefault() + + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } + + $parent.trigger(e = $.Event('close.bs.alert')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + // detach from parent, fire event then clean up data + $parent.detach().trigger('closed.bs.alert').remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent + .one('bsTransitionEnd', removeElement) + .emulateTransitionEnd(150) : + removeElement() + } + + + // ALERT PLUGIN DEFINITION + // ======================= + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + var old = $.fn.alert + + $.fn.alert = Plugin + $.fn.alert.Constructor = Alert + + + // ALERT NO CONFLICT + // ================= + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + + // ALERT DATA-API + // ============== + + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) + +}(jQuery); diff --git a/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/button.js b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/button.js new file mode 100755 index 000000000..dc3164f86 --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/button.js @@ -0,0 +1,110 @@ +/* ======================================================================== + * Bootstrap: button.js v3.2.0 + * http://getbootstrap.com/javascript/#buttons + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // BUTTON PUBLIC CLASS DEFINITION + // ============================== + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Button.DEFAULTS, options) + this.isLoading = false + } + + Button.VERSION = '3.2.0' + + Button.DEFAULTS = { + loadingText: 'loading...' + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() + + state = state + 'Text' + + if (data.resetText == null) $el.data('resetText', $el[val]()) + + $el[val](data[state] == null ? this.options[state] : data[state]) + + // push to event loop to allow forms to submit + setTimeout($.proxy(function () { + if (state == 'loadingText') { + this.isLoading = true + $el.addClass(d).attr(d, d) + } else if (this.isLoading) { + this.isLoading = false + $el.removeClass(d).removeAttr(d) + } + }, this), 0) + } + + Button.prototype.toggle = function () { + var changed = true + var $parent = this.$element.closest('[data-toggle="buttons"]') + + if ($parent.length) { + var $input = this.$element.find('input') + if ($input.prop('type') == 'radio') { + if ($input.prop('checked') && this.$element.hasClass('active')) changed = false + else $parent.find('.active').removeClass('active') + } + if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') + } + + if (changed) this.$element.toggleClass('active') + } + + + // BUTTON PLUGIN DEFINITION + // ======================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + var old = $.fn.button + + $.fn.button = Plugin + $.fn.button.Constructor = Button + + + // BUTTON NO CONFLICT + // ================== + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + + // BUTTON DATA-API + // =============== + + $(document).on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + Plugin.call($btn, 'toggle') + e.preventDefault() + }) + +}(jQuery); diff --git a/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/carousel.js b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/carousel.js new file mode 100755 index 000000000..b7da1ba53 --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/carousel.js @@ -0,0 +1,223 @@ +/* ======================================================================== + * Bootstrap: carousel.js v3.2.0 + * http://getbootstrap.com/javascript/#carousel + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // CAROUSEL CLASS DEFINITION + // ========================= + + var Carousel = function (element, options) { + this.$element = $(element).on('keydown.bs.carousel', $.proxy(this.keydown, this)) + this.$indicators = this.$element.find('.carousel-indicators') + this.options = options + this.paused = + this.sliding = + this.interval = + this.$active = + this.$items = null + + this.options.pause == 'hover' && this.$element + .on('mouseenter.bs.carousel', $.proxy(this.pause, this)) + .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) + } + + Carousel.VERSION = '3.2.0' + + Carousel.DEFAULTS = { + interval: 5000, + pause: 'hover', + wrap: true + } + + Carousel.prototype.keydown = function (e) { + switch (e.which) { + case 37: this.prev(); break + case 39: this.next(); break + default: return + } + + e.preventDefault() + } + + Carousel.prototype.cycle = function (e) { + e || (this.paused = false) + + this.interval && clearInterval(this.interval) + + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + + return this + } + + Carousel.prototype.getItemIndex = function (item) { + this.$items = item.parent().children('.item') + return this.$items.index(item || this.$active) + } + + Carousel.prototype.to = function (pos) { + var that = this + var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active')) + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid" + if (activeIndex == pos) return this.pause().cycle() + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + Carousel.prototype.pause = function (e) { + e || (this.paused = true) + + if (this.$element.find('.next, .prev').length && $.support.transition) { + this.$element.trigger($.support.transition.end) + this.cycle(true) + } + + this.interval = clearInterval(this.interval) + + return this + } + + Carousel.prototype.next = function () { + if (this.sliding) return + return this.slide('next') + } + + Carousel.prototype.prev = function () { + if (this.sliding) return + return this.slide('prev') + } + + Carousel.prototype.slide = function (type, next) { + var $active = this.$element.find('.item.active') + var $next = next || $active[type]() + var isCycling = this.interval + var direction = type == 'next' ? 'left' : 'right' + var fallback = type == 'next' ? 'first' : 'last' + var that = this + + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() + } + + if ($next.hasClass('active')) return (this.sliding = false) + + var relatedTarget = $next[0] + var slideEvent = $.Event('slide.bs.carousel', { + relatedTarget: relatedTarget, + direction: direction + }) + this.$element.trigger(slideEvent) + if (slideEvent.isDefaultPrevented()) return + + this.sliding = true + + isCycling && this.pause() + + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)]) + $nextIndicator && $nextIndicator.addClass('active') + } + + var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid" + if ($.support.transition && this.$element.hasClass('slide')) { + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + $active + .one('bsTransitionEnd', function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { + that.$element.trigger(slidEvent) + }, 0) + }) + .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000) + } else { + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger(slidEvent) + } + + isCycling && this.cycle() + + return this + } + + + // CAROUSEL PLUGIN DEFINITION + // ========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.carousel') + var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) + var action = typeof option == 'string' ? option : options.slide + + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.pause().cycle() + }) + } + + var old = $.fn.carousel + + $.fn.carousel = Plugin + $.fn.carousel.Constructor = Carousel + + + // CAROUSEL NO CONFLICT + // ==================== + + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + + + // CAROUSEL DATA-API + // ================= + + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var href + var $this = $(this) + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7 + if (!$target.hasClass('carousel')) return + var options = $.extend({}, $target.data(), $this.data()) + var slideIndex = $this.attr('data-slide-to') + if (slideIndex) options.interval = false + + Plugin.call($target, options) + + if (slideIndex) { + $target.data('bs.carousel').to(slideIndex) + } + + e.preventDefault() + }) + + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + Plugin.call($carousel, $carousel.data()) + }) + }) + +}(jQuery); diff --git a/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/collapse.js b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/collapse.js new file mode 100755 index 000000000..e4e6d7933 --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/collapse.js @@ -0,0 +1,170 @@ +/* ======================================================================== + * Bootstrap: collapse.js v3.2.0 + * http://getbootstrap.com/javascript/#collapse + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() + } + + Collapse.VERSION = '3.2.0' + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var actives = this.$parent && this.$parent.find('> .panel > .in') + + if (actives && actives.length) { + var hasData = actives.data('bs.collapse') + if (hasData && hasData.transitioning) return + Plugin.call(actives, 'hide') + hasData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing')[dimension](0) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('collapse in')[dimension]('') + this.transitioning = 0 + this.$element + .trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one('bsTransitionEnd', $.proxy(complete, this)) + .emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element[dimension](this.$element[dimension]())[0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse') + .removeClass('in') + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .trigger('hidden.bs.collapse') + .removeClass('collapsing') + .addClass('collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one('bsTransitionEnd', $.proxy(complete, this)) + .emulateTransitionEnd(350) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data && options.toggle && option == 'show') option = !option + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.collapse + + $.fn.collapse = Plugin + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) { + var href + var $this = $(this) + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7 + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + + if (!data || !data.transitioning) { + if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + } + + Plugin.call($target, option) + }) + +}(jQuery); diff --git a/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/dropdown.js b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/dropdown.js new file mode 100755 index 000000000..88f118c2d --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/dropdown.js @@ -0,0 +1,151 @@ +/* ======================================================================== + * Bootstrap: dropdown.js v3.2.0 + * http://getbootstrap.com/javascript/#dropdowns + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle="dropdown"]' + var Dropdown = function (element) { + $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.VERSION = '3.2.0' + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we use a backdrop because click events don't delegate + $('
').insertAfter($(this)).on('click', clearMenus) + } + + var relatedTarget = { relatedTarget: this } + $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $this.trigger('focus') + + $parent + .toggleClass('open') + .trigger('shown.bs.dropdown', relatedTarget) + } + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27)/.test(e.keyCode)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).trigger('focus') + return $this.trigger('click') + } + + var desc = ' li:not(.divider):visible a' + var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc) + + if (!$items.length) return + + var index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index = 0 + + $items.eq(index).trigger('focus') + } + + function clearMenus(e) { + if (e && e.which === 3) return + $(backdrop).remove() + $(toggle).each(function () { + var $parent = getParent($(this)) + var relatedTarget = { relatedTarget: this } + if (!$parent.hasClass('open')) return + $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) + if (e.isDefaultPrevented()) return + $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget) + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + + // DROPDOWN PLUGIN DEFINITION + // ========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.dropdown') + + if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + var old = $.fn.dropdown + + $.fn.dropdown = Plugin + $.fn.dropdown.Constructor = Dropdown + + + // DROPDOWN NO CONFLICT + // ==================== + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== + + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown) + +}(jQuery); diff --git a/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/jquery.js b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/jquery.js new file mode 100644 index 000000000..e5ace116b --- /dev/null +++ b/usr/local/www/themes/opnsense/assets/javascripts/bootstrap/jquery.js @@ -0,0 +1,4 @@ +/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b) +},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthx",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*\s*$/g,ib={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("