mirror of
https://github.com/pi-hole/web.git
synced 2024-12-06 19:36:21 +01:00
Merge branch 'release/v5.0' into fix/queries_over_time
This commit is contained in:
Dan Schaper
GitHub
@@ -5,7 +5,7 @@
|
||||
<a href="https://pi-hole.net"><img src="https://pi-hole.github.io/graphics/Screenshots/pihole-dashboard.png" alt="Pi-hole Web interface"></a><br/>
|
||||
</p>
|
||||
|
||||
Pi-hole[®](https://pi-hole.net/trademark-rules-and-brand-guidelines/)'s Web interface (based off of [AdminLTE](https://almsaeedstudio.com)) provides a central location to manage your Pi-hole and review the statistics generated by FTLDNS[™](https://pi-hole.net/trademark-rules-and-brand-guidelines/).
|
||||
Pi-hole[®](https://pi-hole.net/trademark-rules-and-brand-guidelines/)'s Web interface (based off of [AdminLTE](https://github.com/ColorlibHQ/AdminLTE)) provides a central location to manage your Pi-hole and review the statistics generated by FTLDNS[™](https://pi-hole.net/trademark-rules-and-brand-guidelines/).
|
||||
|
||||
- **Easy-to-interpret**: simple graphs and beautiful colors make Pi-hole's stats easy to understand
|
||||
- **Responsive**: looks great on desktop, tablets, and mobile devices
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
require "scripts/pi-hole/php/header.php";
|
||||
|
||||
$list = $_GET['l'] ?? '';
|
||||
$list = isset($_GET['l']) ? $_GET['l'] : '';
|
||||
|
||||
if ($list == "white")
|
||||
{
|
||||
|
||||
@@ -363,7 +363,7 @@ $("#queryOverTimeChart").click(function(evt) {
|
||||
|
||||
//get value by index
|
||||
var from = label / 1000;
|
||||
var until = label / 1000 + 600;
|
||||
var until = label / 1000 + interval;
|
||||
window.location.href = "db_queries.php?from=" + from + "&until=" + until;
|
||||
}
|
||||
|
||||
|
||||
@@ -183,6 +183,10 @@ function initTable() {
|
||||
"</button>";
|
||||
$("td:eq(4)", row).html(button);
|
||||
},
|
||||
dom:
|
||||
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
|
||||
"<'row'<'col-sm-12'<'table-responsive'tr>>>" +
|
||||
"<'row'<'col-sm-5'i><'col-sm-7'p>>",
|
||||
lengthMenu: [
|
||||
[10, 25, 50, 100, -1],
|
||||
[10, 25, 50, 100, "All"]
|
||||
|
||||
@@ -189,6 +189,10 @@ function initTable() {
|
||||
"</button>";
|
||||
$("td:eq(2)", row).html(button);
|
||||
},
|
||||
dom:
|
||||
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
|
||||
"<'row'<'col-sm-12'<'table-responsive'tr>>>" +
|
||||
"<'row'<'col-sm-5'i><'col-sm-7'p>>",
|
||||
lengthMenu: [
|
||||
[10, 25, 50, 100, -1],
|
||||
[10, 25, 50, 100, "All"]
|
||||
|
||||
@@ -200,6 +200,10 @@ function initTable() {
|
||||
"</button>";
|
||||
$("td:eq(5)", row).html(button);
|
||||
},
|
||||
dom:
|
||||
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
|
||||
"<'row'<'col-sm-12'<'table-responsive'tr>>>" +
|
||||
"<'row'<'col-sm-5'i><'col-sm-7'p>>",
|
||||
lengthMenu: [
|
||||
[10, 25, 50, 100, -1],
|
||||
[10, 25, 50, 100, "All"]
|
||||
|
||||
@@ -144,6 +144,10 @@ $(document).ready(function() {
|
||||
$("td:eq(3)", row).html(button);
|
||||
}
|
||||
},
|
||||
dom:
|
||||
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
|
||||
"<'row'<'col-sm-12'<'table-responsive'tr>>>" +
|
||||
"<'row'<'col-sm-5'i><'col-sm-7'p>>",
|
||||
lengthMenu: [
|
||||
[10, 25, 50, 100, -1],
|
||||
[10, 25, 50, 100, "All"]
|
||||
|
||||
@@ -742,26 +742,7 @@ function updateSummaryData(runOnce) {
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
var isMobile = {
|
||||
Windows: function() {
|
||||
return /IEMobile/i.test(navigator.userAgent);
|
||||
},
|
||||
Android: function() {
|
||||
return /Android/i.test(navigator.userAgent);
|
||||
},
|
||||
BlackBerry: function() {
|
||||
return /BlackBerry/i.test(navigator.userAgent);
|
||||
},
|
||||
iOS: function() {
|
||||
return /iPhone|iPad|iPod/i.test(navigator.userAgent);
|
||||
},
|
||||
any: function() {
|
||||
return isMobile.Android() || isMobile.BlackBerry() || isMobile.iOS() || isMobile.Windows();
|
||||
}
|
||||
};
|
||||
|
||||
// Pull in data via AJAX
|
||||
|
||||
updateSummaryData();
|
||||
|
||||
var blockedColor = "#999";
|
||||
|
||||
@@ -228,6 +228,11 @@ $(document).ready(function() {
|
||||
buttontext = "";
|
||||
}
|
||||
|
||||
// Add extra label when blocking happend during deep CNAME inspection
|
||||
if (blocked && data.length > 6 && data[6] === "3") {
|
||||
fieldtext += "<br>CNAME";
|
||||
}
|
||||
|
||||
$(row).addClass(colorClass);
|
||||
$("td:eq(4)", row).html(fieldtext);
|
||||
$("td:eq(6)", row).html(buttontext);
|
||||
|
||||
@@ -209,7 +209,7 @@ if ($_POST['action'] == 'get_groups') {
|
||||
// Loop over results
|
||||
$ips = array();
|
||||
while ($res = $query->fetchArray(SQLITE3_ASSOC)) {
|
||||
$ips[$res['ip']] = $res['name'];
|
||||
$ips[$res['ip']] = $res['name'] !== null ? $res['name'] : '';
|
||||
}
|
||||
$FTLdb->close();
|
||||
|
||||
|
||||
@@ -201,6 +201,7 @@
|
||||
<meta name="msapplication-TileImage" content="img/logo.svg">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
|
||||
<link rel="stylesheet" href="style/vendor/SourceSansPro/SourceSansPro.css">
|
||||
<link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap.min.css">
|
||||
|
||||
<link rel="stylesheet" href="style/vendor/font-awesome-5.11.2/css/all.min.css">
|
||||
@@ -256,7 +257,7 @@ if($auth) {
|
||||
<div class="wrapper">
|
||||
<header class="main-header">
|
||||
<!-- Logo -->
|
||||
<a href="https://pi-hole.net/" class="logo" rel="noopener" target="_blank">
|
||||
<a href="index.php" class="logo">
|
||||
<!-- mini logo for sidebar mini 50x50 pixels -->
|
||||
<span class="logo-mini">P<b>h</b></span>
|
||||
<!-- logo for regular state and mobile devices -->
|
||||
|
||||
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
||||
@import url(SourceSansPro/SourceSansPro.css);/*!
|
||||
/*!
|
||||
* AdminLTE v2.1.2
|
||||
* Author: Almsaeed Studio
|
||||
* Website: Almsaeed Studio <http://almsaeedstudio.com>
|
||||
|
||||
Reference in New Issue
Block a user