Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-23 18:29:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master-to-development-v5.0

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-05-10 22:00:07 +02:00
parent 9b70e6dc53 b86e4a3178
commit 73ee91a024
23 changed files with 711 additions and 2024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/pi-hole/php/header.php
View File

@@ -215,8 +215,8 @@
<script src="scripts/vendor/bootstrap-notify.min.js"></script>
<?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?>
<script src="style/vendor/bootstrap/js/bootstrap-multiselect.js"></script>
<link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap-multiselect.css">
<script src="style/vendor/bootstrap/js/bootstrap-select.min.js"></script>
<link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap-select.min.css">
<script src="style/vendor/bootstrap/js/bootstrap-toggle.min.js"></script>
<link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap-toggle.min.css">
<script src="scripts/vendor/moment.min.js"></script>
@@ -318,7 +318,7 @@ if($auth) {
*/ ?>
<!-- PayPal -->
<div class="text-center">
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY" rel="noopener" target="_blank" style="background:none">
<a href="https://pi-hole.net/donate/" rel="noopener" target="_blank" style="background:none">
<img src="img/donate.gif" alt="Donate">
</a>
</div>
@@ -623,10 +623,10 @@ if($auth) {
<i class="fa fa-cogs"></i> <span>Settings</span>
</a>
</li>
<!-- Custom DNS -->
<li<?php if($scriptname === "custom_dns.php"){ ?> class="active"<?php } ?>>
<a href="custom_dns.php">
<i class="fa fa-address-book"></i> <span>Custom DNS</span>
<!-- Local DNS Records -->
<li<?php if($scriptname === "dns_records.php"){ ?> class="active"<?php } ?>>
<a href="dns_records.php">
<i class="fa fa-address-book"></i> <span>Local DNS Records</span>
</a>
</li>
<!-- Logout -->
@@ -652,7 +652,7 @@ if($auth) {
<?php } ?>
<!-- Donate -->
<li>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY" rel="noopener" target="_blank">
<a href="https://pi-hole.net/donate/" rel="noopener" target="_blank">
<i class="fa-paypal-icon fab fa-paypal"></i> <span>Donate</span>
</a>
</li>