Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed May 18, 2020
1 parent aacaab0 commit 620bb62
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion api_FTL.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
// UTF-8 encode domain
$tmp[2] = utf8_encode($tmp[2]);
// UTF-8 encode client host name
$tmp[3] = utf8_encode($tmp[3]);;
$tmp[3] = utf8_encode($tmp[3]);
array_push($allQueries,$tmp);
}

Expand Down
2 changes: 1 addition & 1 deletion dns_records.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
</tr>
</thead>
</table>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Clear Filters</button>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red d-none">Clear Filters</button>
</div>
<!-- /.box-body -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion groups-adlists.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</tr>
</thead>
</table>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Reset sorting</button>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red d-none">Reset sorting</button>
</div>
<!-- /.box-body -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion groups-clients.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</tr>
</thead>
</table>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Reset sorting</button>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red d-none">Reset sorting</button>
</div>
<!-- /.box-body -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion groups-domains.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
</tr>
</thead>
</table>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Reset sorting</button>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red d-none">Reset sorting</button>
</div>
<!-- /.box-body -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion groups.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</tr>
</thead>
</table>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Reset sorting</button>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red d-none">Reset sorting</button>
</div>
<!-- /.box-body -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion queries.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
</tfoot>
</table>
<label><input type="checkbox" id="autofilter">&nbsp;Apply filtering on click on Type, Domain, and Clients</label><br/>
<button id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Clear Filters</button>
<button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red d-none">Clear Filters</button>
</div>
<!-- /.box-body -->
</div>
Expand Down
6 changes: 4 additions & 2 deletions scripts/pi-hole/js/footer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,11 @@ function check_messages() {
title = "There is one warning. Click for further details.";
}

$("#pihole-diagnosis").prop("title", title);
var diagnosisEl = $("#pihole-diagnosis");

diagnosisEl.prop("title", title);
$("#pihole-diagnosis-count").text(data.message_count);
$("#pihole-diagnosis").removeClass("d-none");
diagnosisEl.removeClass("d-none");
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/pi-hole/js/groups-adlists.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ function initTable() {
table.on("order.dt", function () {
var order = table.order();
if (order[0][0] !== 0 || order[0][1] !== "asc") {
$("#resetButton").show();
$("#resetButton").removeClass("d-none");
} else {
$("#resetButton").hide();
}
Expand Down
6 changes: 3 additions & 3 deletions scripts/pi-hole/js/groups-clients.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,14 @@ function initTable() {
table.on("order.dt", function () {
var order = table.order();
if (order[0][0] !== 0 || order[0][1] !== "asc") {
$("#resetButton").show();
$("#resetButton").removeClass("d-none");
} else {
$("#resetButton").hide();
$("#resetButton").addClass("d-none");
}
});
$("#resetButton").on("click", function () {
table.order([[0, "asc"]]).draw();
$("#resetButton").hide();
$("#resetButton").addClass("d-none");
});
}

Expand Down
6 changes: 3 additions & 3 deletions scripts/pi-hole/js/groups-domains.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,14 +292,14 @@ function initTable() {
table.on("order.dt", function () {
var order = table.order();
if (order[0][0] !== 0 || order[0][1] !== "asc") {
$("#resetButton").show();
$("#resetButton").removeClass("d-none");
} else {
$("#resetButton").hide();
$("#resetButton").addClass("d-none");
}
});
$("#resetButton").on("click", function () {
table.order([[0, "asc"]]).draw();
$("#resetButton").hide();
$("#resetButton").addClass("d-none");
});
}

Expand Down
6 changes: 3 additions & 3 deletions scripts/pi-hole/js/groups.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ $(document).ready(function () {
table.on("order.dt", function () {
var order = table.order();
if (order[0][0] !== 0 || order[0][1] !== "asc") {
$("#resetButton").show();
$("#resetButton").removeClass("d-none");
} else {
$("#resetButton").hide();
$("#resetButton").addClass("d-none");
}
});
$("#resetButton").on("click", function () {
table.order([[0, "asc"]]).draw();
$("#resetButton").hide();
$("#resetButton").addClass("d-none");
});
});

Expand Down
8 changes: 4 additions & 4 deletions scripts/pi-hole/js/queries.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ $(document).ready(function () {
api.$("td:eq(1)").click(function () {
if (autofilter()) {
api.search(this.textContent).draw();
$("#resetButton").show();
$("#resetButton").removeClass("d-none");
}
});
api.$("td:eq(1)").hover(
Expand All @@ -454,7 +454,7 @@ $(document).ready(function () {
if (autofilter()) {
var domain = this.textContent.split("\n")[0];
api.search(domain).draw();
$("#resetButton").show();
$("#resetButton").removeClass("d-none");
}
});
api.$("td:eq(2)").hover(
Expand All @@ -477,7 +477,7 @@ $(document).ready(function () {
api.$("td:eq(3)").click(function () {
if (autofilter()) {
api.search(this.textContent).draw();
$("#resetButton").show();
$("#resetButton").removeClass("d-none");
}
});
api.$("td:eq(3)").hover(
Expand Down Expand Up @@ -509,7 +509,7 @@ $(document).ready(function () {

$("#resetButton").click(function () {
tableApi.search("").draw();
$("#resetButton").hide();
$("#resetButton").addClass("d-none");
});

// Disable autocorrect in the search box
Expand Down

0 comments on commit 620bb62

Please sign in to comment.