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

Switch to using Font Awesome

Browse Source 
This should be more consistent.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
This commit is contained in:
XhmikosR
2020-01-03 12:44:12 +02:00
parent 5eadd346b9
commit dee16f6c7a
8 changed files with 35 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ $(document).ready(function() {
"' data-ip='" + "' data-ip='" +
row[1] + row[1] +
"'>" + "'>" +
'<span class="glyphicon glyphicon-trash"></span>' + '<span class="far fa-trash-alt"></span>' +
"</button>" "</button>"
); );
} }

19
scripts/pi-hole/js/groups-adlists.js
View File

@@ -19,7 +19,7 @@ function showAlert(type, icon, title, message) {
case "info": case "info":
opts = { opts = {
type: "info", type: "info",
icon: "glyphicon glyphicon-time", icon: "far fa-clock",
title: title, title: title,
message: message message: message
}; };
@@ -42,7 +42,7 @@ function showAlert(type, icon, title, message) {
case "warning": case "warning":
opts = { opts = {
type: "warning", type: "warning",
icon: "glyphicon glyphicon-warning-sign", icon: "fas fa-exclamation-triangle",
title: title, title: title,
message: message message: message
}; };
@@ -56,7 +56,7 @@ function showAlert(type, icon, title, message) {
case "error": case "error":
opts = { opts = {
type: "danger", type: "danger",
icon: "glyphicon glyphicon-remove", icon: "fas fa-times",
title: "&nbsp;<strong>Error, something went wrong!</strong><br>", title: "&nbsp;<strong>Error, something went wrong!</strong><br>",
message: message message: message
}; };
@@ -179,7 +179,7 @@ function initTable() {
'<button class="btn btn-danger btn-xs deleteAdlist" type="button" data-id="' + '<button class="btn btn-danger btn-xs deleteAdlist" type="button" data-id="' +
data.id + data.id +
'">' + '">' +
'<span class="glyphicon glyphicon-trash"></span>' + '<span class="far fa-trash-alt"></span>' +
"</button>"; "</button>";
$("td:eq(4)", row).html(button); $("td:eq(4)", row).html(button);
}, },
@@ -249,7 +249,7 @@ function addAdlist() {
}, },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert("success", "glyphicon glyphicon-plus", "Successfully added adlist", address); showAlert("success", "fas fa-plus", "Successfully added adlist", address);
$("#new_address").val(""); $("#new_address").val("");
$("#new_comment").val(""); $("#new_comment").val("");
table.ajax.reload(); table.ajax.reload();
@@ -305,12 +305,7 @@ function editAdlist() {
}, },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert( showAlert("success", "fas fa-pencil-alt", "Successfully " + done + " adlist ", address);
"success",
"glyphicon glyphicon-pencil",
"Successfully " + done + " adlist ",
address
);
} else { } else {
showAlert( showAlert(
"error", "error",
@@ -345,7 +340,7 @@ function deleteAdlist() {
data: { action: "delete_adlist", id: id, token: token }, data: { action: "delete_adlist", id: id, token: token },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert("success", "glyphicon glyphicon-trash", "Successfully deleted adlist ", address); showAlert("success", "far fa-trash-alt", "Successfully deleted adlist ", address);
table table
.row(tr) .row(tr)
.remove() .remove()

19
scripts/pi-hole/js/groups-clients.js
View File

@@ -17,7 +17,7 @@ function showAlert(type, icon, title, message) {
case "info": case "info":
opts = { opts = {
type: "info", type: "info",
icon: "glyphicon glyphicon-time", icon: "far fa-clock",
title: title, title: title,
message: message message: message
}; };
@@ -40,7 +40,7 @@ function showAlert(type, icon, title, message) {
case "warning": case "warning":
opts = { opts = {
type: "warning", type: "warning",
icon: "glyphicon glyphicon-warning-sign", icon: "fas fa-exclamation-triangle",
title: title, title: title,
message: message message: message
}; };
@@ -54,7 +54,7 @@ function showAlert(type, icon, title, message) {
case "error": case "error":
opts = { opts = {
type: "danger", type: "danger",
icon: "glyphicon glyphicon-remove", icon: "fas fa-times",
title: "&nbsp;<strong>Error, something went wrong!</strong><br>", title: "&nbsp;<strong>Error, something went wrong!</strong><br>",
message: message message: message
}; };
@@ -185,7 +185,7 @@ function initTable() {
'<button class="btn btn-danger btn-xs deleteClient" type="button" data-id="' + '<button class="btn btn-danger btn-xs deleteClient" type="button" data-id="' +
data.id + data.id +
'">' + '">' +
'<span class="glyphicon glyphicon-trash"></span>' + '<span class="far fa-trash-alt"></span>' +
"</button>"; "</button>";
$("td:eq(2)", row).html(button); $("td:eq(2)", row).html(button);
}, },
@@ -252,7 +252,7 @@ function addClient() {
data: { action: "add_client", ip: ip, token: token }, data: { action: "add_client", ip: ip, token: token },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert("success", "glyphicon glyphicon-plus", "Successfully added client", ip); showAlert("success", "fas fa-plus", "Successfully added client", ip);
reload_client_suggestions(); reload_client_suggestions();
table.ajax.reload(); table.ajax.reload();
} else { } else {
@@ -294,12 +294,7 @@ function editClient() {
data: { action: "edit_client", id: id, groups: groups, token: token }, data: { action: "edit_client", id: id, groups: groups, token: token },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert( showAlert("success", "fas fa-plus", "Successfully " + done + " client", ip_name);
"success",
"glyphicon glyphicon-plus",
"Successfully " + done + " client",
ip_name
);
} else { } else {
showAlert("error", "Error while " + not_done + " client with ID " + id, response.message); showAlert("error", "Error while " + not_done + " client with ID " + id, response.message);
} }
@@ -335,7 +330,7 @@ function deleteClient() {
data: { action: "delete_client", id: id, token: token }, data: { action: "delete_client", id: id, token: token },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert("success", "glyphicon glyphicon-trash", "Successfully deleted client ", ip_name); showAlert("success", "far fa-trash-alt", "Successfully deleted client ", ip_name);
table table
.row(tr) .row(tr)
.remove() .remove()

19
scripts/pi-hole/js/groups-domains.js
View File

@@ -19,7 +19,7 @@ function showAlert(type, icon, title, message) {
case "info": case "info":
opts = { opts = {
type: "info", type: "info",
icon: "glyphicon glyphicon-time", icon: "far fa-clock",
title: title, title: title,
message: message message: message
}; };
@@ -42,7 +42,7 @@ function showAlert(type, icon, title, message) {
case "warning": case "warning":
opts = { opts = {
type: "warning", type: "warning",
icon: "glyphicon glyphicon-warning-sign", icon: "fas fa-exclamation-triangle",
title: title, title: title,
message: message message: message
}; };
@@ -56,7 +56,7 @@ function showAlert(type, icon, title, message) {
case "error": case "error":
opts = { opts = {
type: "danger", type: "danger",
icon: "glyphicon glyphicon-remove", icon: "fas fa-times",
title: "&nbsp;<strong>Error, something went wrong!</strong><br>", title: "&nbsp;<strong>Error, something went wrong!</strong><br>",
message: message message: message
}; };
@@ -196,7 +196,7 @@ function initTable() {
'<button class="btn btn-danger btn-xs deleteDomain" type="button" data-id="' + '<button class="btn btn-danger btn-xs deleteDomain" type="button" data-id="' +
data.id + data.id +
'">' + '">' +
'<span class="glyphicon glyphicon-trash"></span>' + '<span class="far fa-trash-alt"></span>' +
"</button>"; "</button>";
$("td:eq(5)", row).html(button); $("td:eq(5)", row).html(button);
}, },
@@ -268,7 +268,7 @@ function addDomain() {
}, },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert("success", "glyphicon glyphicon-plus", "Successfully added domain", domain); showAlert("success", "fas fa-plus", "Successfully added domain", domain);
$("#new_domain").val(""); $("#new_domain").val("");
$("#new_comment").val(""); $("#new_comment").val("");
table.ajax.reload(); table.ajax.reload();
@@ -329,12 +329,7 @@ function editDomain() {
}, },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert( showAlert("success", "fas fa-pencil-alt", "Successfully " + done + " domain", domain);
"success",
"glyphicon glyphicon-pencil",
"Successfully " + done + " domain",
domain
);
} else } else
showAlert( showAlert(
"error", "error",
@@ -368,7 +363,7 @@ function deleteDomain() {
data: { action: "delete_domain", id: id, token: token }, data: { action: "delete_domain", id: id, token: token },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert("success", "glyphicon glyphicon-trash", "Successfully deleted domain", domain); showAlert("success", "far fa-trash-alt", "Successfully deleted domain", domain);
table table
.row(tr) .row(tr)
.remove() .remove()

14
scripts/pi-hole/js/groups.js
View File

@@ -18,7 +18,7 @@ function showAlert(type, icon, title, message) {
case "info": case "info":
opts = { opts = {
type: "info", type: "info",
icon: "glyphicon glyphicon-time", icon: "far fa-clock",
title: title, title: title,
message: message message: message
}; };
@@ -41,7 +41,7 @@ function showAlert(type, icon, title, message) {
case "warning": case "warning":
opts = { opts = {
type: "warning", type: "warning",
icon: "glyphicon glyphicon-warning-sign", icon: "fas fa-exclamation-triangle",
title: title, title: title,
message: message message: message
}; };
@@ -55,7 +55,7 @@ function showAlert(type, icon, title, message) {
case "error": case "error":
opts = { opts = {
type: "danger", type: "danger",
icon: "glyphicon glyphicon-remove", icon: "fas fa-times",
title: "&nbsp;<strong>Error, something went wrong!</strong><br>", title: "&nbsp;<strong>Error, something went wrong!</strong><br>",
message: message message: message
}; };
@@ -139,7 +139,7 @@ $(document).ready(function() {
'<button class="btn btn-danger btn-xs deleteGroup" type="button" data-id="' + '<button class="btn btn-danger btn-xs deleteGroup" type="button" data-id="' +
data.id + data.id +
'">' + '">' +
'<span class="glyphicon glyphicon-trash"></span>' + '<span class="far fa-trash-alt"></span>' +
"</button>"; "</button>";
$("td:eq(3)", row).html(button); $("td:eq(3)", row).html(button);
} }
@@ -205,7 +205,7 @@ function addGroup() {
data: { action: "add_group", name: name, desc: desc, token: token }, data: { action: "add_group", name: name, desc: desc, token: token },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert("success", "glyphicon glyphicon-plus", "Successfully added group", name); showAlert("success", "fas fa-plus", "Successfully added group", name);
$("#new_name").val(""); $("#new_name").val("");
$("#new_desc").val(""); $("#new_desc").val("");
table.ajax.reload(); table.ajax.reload();
@@ -259,7 +259,7 @@ function editGroup() {
}, },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert("success", "glyphicon glyphicon-pencil", "Successfully " + done + " group", name); showAlert("success", "fas fa-pencil-alt", "Successfully " + done + " group", name);
} else { } else {
showAlert( showAlert(
"error", "error",
@@ -294,7 +294,7 @@ function deleteGroup() {
data: { action: "delete_group", id: id, token: token }, data: { action: "delete_group", id: id, token: token },
success: function(response) { success: function(response) {
if (response.success) { if (response.success) {
showAlert("success", "glyphicon glyphicon-trash", "Successfully deleted group ", name); showAlert("success", "far fa-trash-alt", "Successfully deleted group ", name);
table table
.row(tr) .row(tr)
.remove() .remove()

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

@@ -42,7 +42,7 @@ function addListEntry(entry, index, list, button, type) {
disabled_message + disabled_message +
"</span>" + "</span>" +
'<button class="btn btn-danger btn-xs pull-right" type="button">' + '<button class="btn btn-danger btn-xs pull-right" type="button">' +
'<span class="glyphicon glyphicon-trash"></span></button></li>' '<span class="far fa-trash-alt"></span></button></li>'
); );
// Handle button // Handle button
$(button + " #" + index).on("click", "button", function() { $(button + " #" + index).on("click", "button", function() {

2
scripts/pi-hole/php/loginpage.php
View File

@@ -41,7 +41,7 @@
<div class="form-group pull-left"> <div class="form-group pull-left">
<div class="checkbox pull-right"><label><input type="checkbox" id="logincookie" name="persistentlogin">Remember me for 7 days</label></div> <div class="checkbox pull-right"><label><input type="checkbox" id="logincookie" name="persistentlogin">Remember me for 7 days</label></div>
</div> </div>
<button type="submit" class="btn btn-primary pull-right"><i class="glyphicon glyphicon-log-in"></i>&nbsp;&nbsp;&nbsp;Log in</button> <button type="submit" class="btn btn-primary pull-right"><i class="fas fa-sign-in-alt"></i>&nbsp;&nbsp;&nbsp;Log in</button>
</div> </div>
</div> </div>
<br> <br>

8
settings.php
View File

@@ -285,7 +285,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
</td> </td>
<td class="text-center"> <td class="text-center">
<button class="btn btn-danger btn-xs" id="adlist-btn-<?php echo $key; ?>"> <button class="btn btn-danger btn-xs" id="adlist-btn-<?php echo $key; ?>">
<span class="glyphicon glyphicon-trash"></span> <span class="far fa-trash-alt"></span>
</button> </button>
<input type="checkbox" name="adlist-del-<?php echo $key; ?>" hidden> <input type="checkbox" name="adlist-del-<?php echo $key; ?>" hidden>
</td> </td>
@@ -603,7 +603,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
<td id="HOST"><?php echo $lease["host"]; ?></td> <td id="HOST"><?php echo $lease["host"]; ?></td>
<td> <td>
<button class="btn btn-warning btn-xs" type="button" id="button" data-static="alert"> <button class="btn btn-warning btn-xs" type="button" id="button" data-static="alert">
<span class="glyphicon glyphicon-copy"></span> <span class="fas fas fa-file-import"></span>
</button> </button>
</td> </td>
</tr> </tr>
@@ -633,7 +633,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
<td><?php if (strlen($lease["hwaddr"]) > 0) { ?> <td><?php if (strlen($lease["hwaddr"]) > 0) { ?>
<button class="btn btn-danger btn-xs" type="submit" name="removestatic" <button class="btn btn-danger btn-xs" type="submit" name="removestatic"
value="<?php echo $lease["hwaddr"]; ?>"> value="<?php echo $lease["hwaddr"]; ?>">
<span class="glyphicon glyphicon-trash"></span> <span class="far fa-trash-alt"></span>
</button> </button>
<?php } ?> <?php } ?>
</td> </td>
@@ -647,7 +647,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
<td><input type="text" name="AddHostname" value=""></td> <td><input type="text" name="AddHostname" value=""></td>
<td> <td>
<button class="btn btn-success btn-xs" type="submit" name="addstatic"> <button class="btn btn-success btn-xs" type="submit" name="addstatic">
<span class="glyphicon glyphicon-plus"></span> <span class="fas fa-plus"></span>
</button> </button>
</td> </td>
</tr> </tr>