pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v4.3' into fix/query_table_aditional_sorting_by_id

Browse Source
This commit is contained in:
DL6ER
2019-05-05 20:34:27 +02:00
committed by GitHub
parent c4df1bcced 39922e64b6
commit 7afa31c6d1
5 changed files with 2 additions and 1709 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/js/network.js
+1 -1
View File
@@ -143,7 +143,7 @@ $(document).ready(function() {
{data: "firstSeen", "width" : "8%", "render": function (data, type, full, meta) { if(type === "display"){return moment.unix(data).format("Y-MM-DD [<br class='hidden-lg'>]HH:mm:ss z");}else{return data;} }},
{data: "lastQuery", "width" : "8%", "render": function (data, type, full, meta) { if(type === "display"){return moment.unix(data).format("Y-MM-DD [<br class='hidden-lg'>]HH:mm:ss z");}else{return data;} }},
{data: "numQueries", "width" : "9%", "render": $.fn.dataTable.render.text() },
{data: "", "width" : "6%" }
{data: "", "width" : "6%", "orderable" : false }
],
"lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
"stateSave": true,
scripts/pi-hole/js/settings.js
-2
View File
@@ -5,8 +5,6 @@
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
$(function () {
$("[data-mask]").inputmask();
$("[data-static]").on("click", function(){
var row = $(this).closest("tr");
var mac = row.find("#MAC").text();
scripts/vendor/jquery.inputmask.extensions.js
Generated Vendored
-72
View File
@@ -1,72 +0,0 @@
/*
Input Mask plugin extensions
http://github.com/RobinHerbots/jquery.inputmask
Copyright (c) 2010 - 2014 Robin Herbots
Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
Version: 0.0.0
Modified by DL6ER
Optional extensions on the jquery.inputmask base
*/
(function ($) {
//extra definitions
$.extend($.inputmask.defaults.definitions, {
'A': {
validator: "[A-Za-z]",
cardinality: 1,
casing: "upper" //auto uppercasing
},
'#': {
validator: "[A-Za-z\u0410-\u044F\u0401\u04510-9]",
cardinality: 1,
casing: "upper"
}
});
$.extend($.inputmask.defaults.aliases, {
"ip": { //ip-address mask
mask: ["[[x]y]z.[[x]y]z.[[x]y]z.x[yz]", "[[x]y]z.[[x]y]z.[[x]y]z.[[x]y][z]"],
definitions: {
'x': {
validator: "[012]",
cardinality: 1,
definitionSymbol: "i"
},
'y': {
validator: function (chrs, buffer, pos, strict, opts) {
if (pos - 1 > -1 && buffer[pos - 1] != ".")
chrs = buffer[pos - 1] + chrs;
else chrs = "0" + chrs;
return new RegExp("2[0-5]|[01][0-9]").test(chrs);
},
cardinality: 1,
definitionSymbol: "i"
},
'z': {
validator: function (chrs, buffer, pos, strict, opts) {
if (pos - 1 > -1 && buffer[pos - 1] != ".") {
chrs = buffer[pos - 1] + chrs;
if (pos - 2 > -1 && buffer[pos - 2] != ".") {
chrs = buffer[pos - 2] + chrs;
} else chrs = "0" + chrs;
} else chrs = "00" + chrs;
return new RegExp("25[0-5]|2[0-4][0-9]|[01][0-9][0-9]").test(chrs);
},
cardinality: 1,
definitionSymbol: "i"
}
}
}//,
// "ipv6": { //ip-address mask
// mask: ["[xxxx][:xxxx][:xxxx][:xxxx][:xxxx][:xxxx][:xxxx][:xxxx]"],
// //placeholder: '____:____:____:____:____:____:____:____:____',
// definitions: {
// 'x': {
// validator: "[0-9a-f]",
// cardinality: 1,
// casing: "upper" //auto uppercasing
// }
// }
// }
});
})(jQuery);
scripts/vendor/jquery.inputmask.js
Generated Vendored
-1627
View File
File diff suppressed because it is too large Load Diff
settings.php
+1 -7
View File
@@ -400,7 +400,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
<div class="input-group">
<div class="input-group-addon">From</div>
<input type="text" class="form-control DHCPgroup" name="from"
data-inputmask="'alias': 'ip'" data-mask
value="<?php echo $DHCPstart; ?>"
<?php if (!$DHCP){ ?>disabled<?php } ?>>
</div>
@@ -411,7 +410,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
<div class="input-group">
<div class="input-group-addon">To</div>
<input type="text" class="form-control DHCPgroup" name="to"
data-inputmask="'alias': 'ip'" data-mask
value="<?php echo $DHCPend; ?>"
<?php if (!$DHCP){ ?>disabled<?php } ?>>
</div>
@@ -425,7 +423,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
<div class="input-group">
<div class="input-group-addon">Router</div>
<input type="text" class="form-control DHCPgroup" name="router"
data-inputmask="'alias': 'ip'" data-mask
value="<?php echo $DHCProuter; ?>"
<?php if (!$DHCP){ ?>disabled<?php } ?>>
</div>
@@ -464,7 +461,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
<input type="text" class="form-control DHCPgroup"
name="leasetime"
id="leasetime" value="<?php echo $DHCPleasetime; ?>"
data-inputmask="'mask': '9', 'repeat': 7, 'greedy' : false"
data-mask <?php if (!$DHCP){ ?>disabled<?php } ?>>
</div>
</div>
@@ -880,7 +876,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
<tr>
<div class="input-group">
<td>
<input type="text" name="conditionalForwardingIP" class="form-control" data-inputmask="'alias': 'ip'" data-mask
<input type="text" name="conditionalForwardingIP" class="form-control"
<?php if(isset($conditionalForwardingIP)){ ?>value="<?php echo $conditionalForwardingIP; ?>"<?php } ?>>
</td>
<td><input type="text" name="conditionalForwardingDomain" class="form-control" data-mask
@@ -1383,8 +1379,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
</div>
</div>
<script src="scripts/vendor/jquery.inputmask.js"></script>
<script src="scripts/vendor/jquery.inputmask.extensions.js"></script>
<script src="scripts/vendor/jquery.confirm.min.js"></script>
<script src="scripts/pi-hole/js/settings.js"></script>