diff --git a/bans.php b/bans.php
index c662096..a9e20c5 100644
--- a/bans.php
+++ b/bans.php
@@ -15,7 +15,7 @@ $banlist = $cacheutils->getValue();
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title"><i class="fa fa-ban" aria-hidden="true"></i> <?php tl($lang["banlist"]["title"]); ?></h3>
+ <h3 class="panel-title"><i class="fas fa-gavel" aria-hidden="true"></i> <?php tl($lang["banlist"]["title"]); ?></h3>
</div>
<div class="panel-body">
diff --git a/config/config.template.php b/config/config.template.php
index a0f359c..9c6b9e5 100644
--- a/config/config.template.php
+++ b/config/config.template.php
@@ -44,9 +44,9 @@ $config['teamspeak']['displayip'] = 'ts.server.net'; // IP shown to us
// TEMPLATE: (ICON is an icon name from: http://fontawesome.io/icons/)
// $config["navlinks"][] = ["icon", "displayed text", "link"];
-$config["navlinks"][] = ["fa-facebook-official", "Facebook", "https://facebook.com/Facebook"];
-$config["navlinks"][] = ["fa-twitter-square", "Twitter", "https://twitter.com/Twitter"];
-$config["navlinks"][] = ["fa-comments", "Forum", "forum"];
+$config["navlinks"][] = ["fab fa-facebook-square", "Facebook", "https://facebook.com/Facebook"];
+$config["navlinks"][] = ["fab fa-twitter-square", "Twitter", "https://twitter.com/Twitter"];
+$config["navlinks"][] = ["fas fa-comments", "Forum", "forum"];
diff --git a/config/news/news1.md b/config/news/news1.md
index 96e3928..09495b7 100644
--- a/config/news/news1.md
+++ b/config/news/news1.md
@@ -3,11 +3,11 @@ Wruczek, 2016-10-26, 21:00
You can add, change and remove news as a separate Markdown files located in `config/news` folder with extension `.md`.
-I recommend following John Gruber's excellent markdown guide, found right under this text <i class="fa fa-long-arrow-down" aria-hidden="true"></i>. It's really worth reading. To view the code that makes up the guide, go to `config/news/news2.md`.
+I recommend following John Gruber's excellent markdown guide, found right under this text <i class="fas fa-long-arrow-alt-down" aria-hidden="true"></i>. It's really worth reading. To view the code that makes up the guide, go to `config/news/news2.md`.
I can also recommend GitHub's ["Mastering Markdown"](https://guides.github.com/features/mastering-markdown/) guide.
-**PS**: You can mix Markdown with HTML to add cool stuff like icons <i class="fa fa-smile-o" aria-hidden="true"></i> <i class="fa fa-thumbs-o-up" aria-hidden="true"></i>, or even a full YouTube player with video!
+**PS**: You can mix Markdown with HTML to add cool stuff like icons <i class="far fa-smile" aria-hidden="true"></i> <i class="far fa-thumbs-up" aria-hidden="true"></i>, or even a full YouTube player with video!
diff --git a/css/style.css b/css/style.css
index b1bf810..9204850 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,4 +1,4 @@
-.fa {
+.svg-inline--fa {
margin-right: 5px
}
@@ -20,7 +20,7 @@ a {
text-align: right
}
-.pull-right .fa {
+.pull-right .svg-inline--fa {
margin-right: 0
}
@@ -39,7 +39,7 @@ p, a {
/* STATUS */
/* ****** */
-.serverstatus p, .serverstatus .label .fa {
+.serverstatus p, .serverstatus .label .svg-inline--fa {
margin: 0
}
diff --git a/include/header.php b/include/header.php
index 67ef01e..11c519f 100644
--- a/include/header.php
+++ b/include/header.php
@@ -28,7 +28,7 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
<link href="css/theme.css" rel="stylesheet">
<!-- Font Awesome -->
- <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+ <script defer src="https://use.fontawesome.com/releases/v5.0.9/js/all.js" integrity="sha384-8iPTk2s/jMVj81dnzb/iFR2sdA7u06vHJyyLlAd4snFpCl/SnyUjRrbdJsw1pGIl" crossorigin="anonymous"></script>
<?php if(isset($bansPage)) { ?>
<!-- DataTables for Bootstrap -->
@@ -72,16 +72,16 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
- <li><a href="viewer<?php echo $htalink ?>"><i class="fa fa-eye" aria-hidden="true"></i> <?php tl($lang["navbar"]["viewer"]); ?></a></li>
- <li><a href="bans<?php echo $htalink ?>"><i class="fa fa-ban" aria-hidden="true"></i> <?php tl($lang["navbar"]["bans"]); ?></a></li>
- <li><a href="rules<?php echo $htalink ?>"><i class="fa fa-book" aria-hidden="true"></i> <?php tl($lang["navbar"]["rules"]); ?></a></li>
+ <li><a href="viewer<?php echo $htalink ?>"><i class="fas fa-eye" aria-hidden="true"></i> <?php tl($lang["navbar"]["viewer"]); ?></a></li>
+ <li><a href="bans<?php echo $htalink ?>"><i class="fas fa-gavel" aria-hidden="true"></i> <?php tl($lang["navbar"]["bans"]); ?></a></li>
+ <li><a href="rules<?php echo $htalink ?>"><i class="fas fa-book" aria-hidden="true"></i> <?php tl($lang["navbar"]["rules"]); ?></a></li>
<!-- I don't have time for this.
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-television" aria-hidden="true"></i></i>Ranking <span class="caret"></span></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fas fa-tv" aria-hidden="true"></i></i>Ranking <span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="#"><i class="fa fa-clock-o" aria-hidden="true"></i>Ranking Aktywności</a></li>
- <li><a href="#"><i class="fa fa-sign-in" aria-hidden="true"></i>Ranking Połaczeń</a></li>
- <li><a href="#"><i class="fa fa-sign-out" aria-hidden="true"></i>Ranking Połączenia</a></li>
+ <li><a href="#"><i class="far fa-clock" aria-hidden="true"></i>Ranking Aktywności</a></li>
+ <li><a href="#"><i class="fas fa-sign-in-alt" aria-hidden="true"></i>Ranking Połaczeń</a></li>
+ <li><a href="#"><i class="fas fa-sign-out-alt" aria-hidden="true"></i>Ranking Połączenia</a></li>
</ul>
</li>
-->
@@ -91,10 +91,10 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
$icon = $navlink[0];
$text = $navlink[1];
$link = $navlink[2]; ?>
- <li><a href="<?php echo $link; ?>"><i class="fa <?php echo $icon; ?>" aria-hidden="true"></i> <?php echo $text; ?></a></li>
+ <li><a href="<?php echo $link; ?>"><i class="<?php echo $icon; ?>" aria-hidden="true"></i> <?php echo $text; ?></a></li>
<?php } ?>
- <li data-toggle="tooltip" data-placement="bottom" title="<?php tl($lang["navbar"]["connecttooltip"], [$config['teamspeak']['displayip']]); ?>"><a href="ts3server://<?php echo $config['teamspeak']['displayip']; ?>"><i class="fa fa-sign-in" aria-hidden="true"></i><?php tl($lang["navbar"]["connect"]); ?></a></li>
+ <li data-toggle="tooltip" data-placement="bottom" title="<?php tl($lang["navbar"]["connecttooltip"], [$config['teamspeak']['displayip']]); ?>"><a href="ts3server://<?php echo $config['teamspeak']['displayip']; ?>"><i class="fas fa-sign-in-alt" aria-hidden="true"></i><?php tl($lang["navbar"]["connect"]); ?></a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="famfamfam-flags <?php echo $langcode == "en" ? "gb" : $langcode; ?>" aria-hidden="true"></i> Language <span class="caret"></span></a>
@@ -135,13 +135,13 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
<div class="col-md-3 col-md-push-9">
<div class="panel panel-default">
- <div class="panel-heading"><i class="fa fa-bar-chart" aria-hidden="true"></i> <?php tl($lang["serverstatus"]["title"]); ?></div>
+ <div class="panel-heading"><i class="fas fa-chart-bar" aria-hidden="true"></i> <?php tl($lang["serverstatus"]["title"]); ?></div>
<div class="panel-body">
<div class="serverstatus">
- <p><i class="fa fa-globe fa-fw" aria-hidden="true"></i> <?php tl($lang["serverstatus"]["address"]); ?>: <a href="ts3server://<?php echo $config['teamspeak']['displayip']; ?>"><?php echo $config['teamspeak']['displayip']; ?></a></p>
+ <p><i class="fas fa-globe fa-fw" aria-hidden="true"></i> <?php tl($lang["serverstatus"]["address"]); ?>: <a href="ts3server://<?php echo $config['teamspeak']['displayip']; ?>"><?php echo $config['teamspeak']['displayip']; ?></a></p>
<div id="serverstatus">
<div class="text-center">
- <i class="fa fa-refresh fa-spin fa-3x fa-fw"></i>
+ <i class="fas fa-refresh fa-spin fa-3x fa-fw"></i>
<span class="sr-only"><?php tl($lang["serverstatus"]["loading"]); ?></span>
</div>
</div>
@@ -151,7 +151,12 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
<div class="panel panel-default">
- <div class="panel-heading"><i class="fa fa-shield" aria-hidden="true"></i> <?php tl($lang["adminlist"]["title"]); ?> <span class="pull-right"><i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title="<?php tl($lang["adminlist"]["lastupdate"], [$adminlist[1]]); ?>"></i></span></div>
+ <div class="panel-heading">
+ <i class="fas fa-shield-alt" aria-hidden="true"></i> <?php tl($lang["adminlist"]["title"]); ?>
+ <span class="pull-right" data-toggle="tooltip" data-placement="bottom" title="<?php tl($lang["adminlist"]["lastupdate"], [$adminlist[1]]); ?>">
+ <i class="fas fa-question-circle" aria-hidden="true"></i>
+ </span>
+ </div>
<div class="panel-body adminlist">
<?php echo $adminlist[0]; ?>
</div>
@@ -159,7 +164,7 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
<?php if(!empty($config['contact']['items'])) { ?>
<div class="panel panel-default">
- <div class="panel-heading"><i class="fa fa-envelope" aria-hidden="true"></i> <?php echo $config['contact']['title']; ?></div>
+ <div class="panel-heading"><i class="fas fa-envelope" aria-hidden="true"></i> <?php echo $config['contact']['title']; ?></div>
<div class="panel-body">
<ul class="list-unstyled">
<?php foreach ($config['contact']['items'] as $item) {
@@ -174,9 +179,9 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
<?php } ?>
<div class="panel panel-default">
- <div class="panel-heading"><i class="fa fa-eye" aria-hidden="true"></i> <?php tl($lang["svpb"]["title"]); ?></div>
+ <div class="panel-heading"><i class="fas fa-eye" aria-hidden="true"></i> <?php tl($lang["svpb"]["title"]); ?></div>
<div class="panel-body">
- <a href="viewer<?php echo $htalink ?>" class="btn btn-primary btn-lg btn-block"><i class="fa fa-eye" aria-hidden="true"></i> <?php tl($lang["svpb"]["takealook"]); ?></a>
+ <a href="viewer<?php echo $htalink ?>" class="btn btn-primary btn-lg btn-block"><i class="fas fa-eye" aria-hidden="true"></i> <?php tl($lang["svpb"]["takealook"]); ?></a>
</div>
</div>
</div>
diff --git a/index.php b/index.php
index 3ed10d2..4460272 100644
--- a/index.php
+++ b/index.php
@@ -6,7 +6,7 @@ require_once __DIR__ . "/lib/parsedown/parsedown.php";
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title news-header"><i class="fa fa-newspaper-o" aria-hidden="true"></i> <?php tl($lang["index"]["title"]); ?></h3>
+ <h3 class="panel-title news-header"><i class="fas fa-newspaper" aria-hidden="true"></i> <?php tl($lang["index"]["title"]); ?></h3>
</div>
</div>
@@ -50,7 +50,7 @@ function showNews($path) {
function generateNewsBox($title, $author, $text) { ?>
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title"><div class="row"><div class="col-md-8"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php echo $title; ?></div><div class="col-md-4 news-author"><i class="fa fa-user" aria-hidden="true"></i> <?php echo $author; ?></div></div></h3>
+ <h3 class="panel-title"><div class="row"><div class="col-md-8"><i class="fas fa-info-circle" aria-hidden="true"></i> <?php echo $title; ?></div><div class="col-md-4 news-author"><i class="fas fa-user" aria-hidden="true"></i> <?php echo $author; ?></div></div></h3>
</div>
<div class="panel-body news-body">
<?php echo $text; ?>
diff --git a/js/script.js b/js/script.js
index 71b5bb9..ef8f686 100644
--- a/js/script.js
+++ b/js/script.js
@@ -10,8 +10,8 @@ $(document).ready(function () {
$('.news-body').readmore({
speed: 500,
collapsedHeight: 300,
- moreLink: '<button type="button" class="btn btn-dark"><i class="fa fa-plus-circle" aria-hidden="true"></i> ' + textShowMore + '</button>',
- lessLink: '<button type="button" class="btn btn-dark"><i class="fa fa-minus-circle" aria-hidden="true"></i> ' + textShowLess + '</button>'
+ moreLink: '<button type="button" class="btn btn-dark"><i class="fas fa-plus-circle" aria-hidden="true"></i> ' + textShowMore + '</button>',
+ lessLink: '<button type="button" class="btn btn-dark"><i class="fas fa-minus-circle" aria-hidden="true"></i> ' + textShowLess + '</button>'
});
});
diff --git a/js/status.js b/js/status.js
index a7feb78..021062d 100644
--- a/js/status.js
+++ b/js/status.js
@@ -26,7 +26,7 @@ function checkStatus() {
var averagePacketloss = Math.round(json.averagePacketloss * 100) / 100;
var averagePing = Math.round(json.averagePing * 100) / 100;
- var platformIcon = '<i class="fa %s fa-fw" title="' + platform + '" aria-hidden="true"></i>';
+ var platformIcon = '<i class="fab %s fa-fw" title="' + platform + '" aria-hidden="true"></i>';
switch (platform.toLowerCase()) {
case "windows":
@@ -44,19 +44,19 @@ function checkStatus() {
}
result =
- '<p><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> ' + statusOnline + ': <span class="label label-success">' + clientsonline + ' / ' + maxclients + ' (' + clientsprecent + '%)</span></p>' +
- '<p><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> ' + statusUptime + ': <span class="label label-success">' + uptime + '</span></p>' +
- '<p><i class="fa fa-info-circle fa-fw" aria-hidden="true"></i> ' + statusVersion + ': <span class="label label-success">' + version + ' on ' + platformIcon + '</span></p>' +
- '<p><i class="fa fa-signal fa-fw" aria-hidden="true"></i> ' + statusAvgping + ': <span class="label label-success">' + averagePing + ' ms</span></p>' +
- '<p><i class="fa fa-bolt fa-fw" aria-hidden="true"></i> ' + statusAvgpl + ': <span class="label label-success">' + averagePacketloss + '%</span></p>';
+ '<p><i class="fas fa-power-off fa-fw" aria-hidden="true"></i> ' + statusOnline + ': <span class="label label-success">' + clientsonline + ' / ' + maxclients + ' (' + clientsprecent + '%)</span></p>' +
+ '<p><i class="far fa-clock fa-fw" aria-hidden="true"></i> ' + statusUptime + ': <span class="label label-success">' + uptime + '</span></p>' +
+ '<p><i class="fas fa-info-circle fa-fw" aria-hidden="true"></i> ' + statusVersion + ': <span class="label label-success">' + version + ' on ' + platformIcon + '</span></p>' +
+ '<p><i class="fas fa-signal fa-fw" aria-hidden="true"></i> ' + statusAvgping + ': <span class="label label-success">' + averagePing + ' ms</span></p>' +
+ '<p><i class="fas fa-bolt fa-fw" aria-hidden="true"></i> ' + statusAvgpl + ': <span class="label label-success">' + averagePacketloss + '%</span></p>';
} else {
- result = '<p><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> Online: <span class="label label-danger">' + statusOffline + '</span></p>';
+ result = '<p><i class="fas fa-power-off fa-fw" aria-hidden="true"></i> Online: <span class="label label-danger">' + statusOffline + '</span></p>';
}
$("#serverstatus").html(result);
},
error: function (result) {
- $("#serverstatus").html('<p><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> ' + statusOnline + ': <span class="label label-danger">ERROR</span></p>');
+ $("#serverstatus").html('<p><i class="fas fa-power-off fa-fw" aria-hidden="true"></i> ' + statusOnline + ': <span class="label label-danger">ERROR</span></p>');
}
})
}
diff --git a/rules.php b/rules.php
index e026b4f..4ccc417 100644
--- a/rules.php
+++ b/rules.php
@@ -17,7 +17,7 @@ if (!file_exists($path)) {
?>
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title"><i class="fa fa-book" aria-hidden="true"></i> <?php tl($lang["rules"]["title"]); ?></h3>
+ <h3 class="panel-title"><i class="fas fa-book" aria-hidden="true"></i> <?php tl($lang["rules"]["title"]); ?></h3>
</div>
<div class="panel-body">
<?php echo $parsedown->text($file); ?>
diff --git a/viewer.php b/viewer.php
index 72d892c..dc543bd 100644
--- a/viewer.php
+++ b/viewer.php
@@ -29,7 +29,7 @@ function getViewer() {
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title"><i class="fa fa-eye" aria-hidden="true"></i> <?php tl($lang["viewer"]["title"]); ?></h3>
+ <h3 class="panel-title"><i class="fas fa-eye" aria-hidden="true"></i> <?php tl($lang["viewer"]["title"]); ?></h3>
</div>
<div class="panel-body">
<?php echo $tsviewer[0]; ?>