Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 04:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into fix/IEonceagain

Browse Source
This commit is contained in:
DL6ER
2017-01-14 13:27:00 +01:00
parent 5114e4cbd5 192d01fa3c
commit 3aa1ffe114
7 changed files with 134 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/pi-hole/js/queryads.js
View File

@@ -24,7 +24,7 @@ function eventsource() {
}
var host = window.location.host;
var source = new EventSource("http://"+host+"/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact);
var source = new EventSource("/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact);
// Reset and show field
ta.empty();

11
scripts/pi-hole/js/settings.js
View File

@@ -2,6 +2,17 @@ $(function () {
$("[data-mask]").inputmask();
});
$(function(){
$("#custom1val").ipAddress({s:4});
$("#custom2val").ipAddress({s:4});
$("#custom3val").ipAddress({v:6});
$("#custom4val").ipAddress({v:6});
$("#DHCPfrom").ipAddress({s:4});
$("#DHCPto").ipAddress({s:4});
$("#DHCProuter").ipAddress({s:4});
});
$(".confirm-reboot").confirm({
text: "Are you sure you want to send a reboot command to your Pi-Hole?",
title: "Confirmation required",