From 72061dac58ee44ebd5c26efacb00790ef11aa136 Mon Sep 17 00:00:00 2001
From: Jonas Kohl
Date: Fri, 11 Oct 2024 15:08:31 +0200
Subject: Switch from Glyphicons to Fork Awesome

---
 src/application/views/alert_error.php         |  2 +-
 src/application/views/form_addpost.php        |  2 +-
 src/application/views/form_newtopic.php       |  2 +-
 src/application/views/form_register.php       |  2 +-
 src/application/views/nav_guest.php           |  2 +-
 src/application/views/nav_logged_in.php       |  6 +++---
 src/application/views/view_logintoreply.php   |  2 +-
 src/application/views/view_post.php           | 18 ++++++++--------
 src/application/views/view_search_results.php |  6 +++---
 src/application/views/view_topic_locked.php   |  2 +-
 src/application/views/view_topic_start.php    | 30 +++++++++++++--------------
 src/application/views/view_topiclog.php       |  6 +++---
 src/application/views/view_topics.php         |  4 ++--
 src/application/views/view_user.php           |  6 +++---
 14 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'src/application/views')

diff --git a/src/application/views/alert_error.php b/src/application/views/alert_error.php
index acdb295..e3b48ba 100644
--- a/src/application/views/alert_error.php
+++ b/src/application/views/alert_error.php
@@ -5,6 +5,6 @@ else
     $message = htmlentities($message);
 ?>
 <div class="alert alert-danger" role="alert">
-<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+<span class="fa fa-exclamation-circle" aria-hidden="true"></span>
 <?= $message; ?>
 </div>
diff --git a/src/application/views/form_addpost.php b/src/application/views/form_addpost.php
index 2de44c5..4cddc05 100644
--- a/src/application/views/form_addpost.php
+++ b/src/application/views/form_addpost.php
@@ -27,5 +27,5 @@ if (($_formError = RequestUtils::getAndClearFormError("addpost")) !== null) {
     ]) ?></label>
     <input type="file" name="files[]" id="i_files" multiple accept="*/*">
 </div>
-<button type="submit" class="btn btn-success"><?= __("Post reply") ?> <span class="glyphicon glyphicon-send" aria-hidden="true"></span></button>
+<button type="submit" class="btn btn-success"><?= __("Post reply") ?> <span class="fa fa-send" aria-hidden="true"></span></button>
 </form>
diff --git a/src/application/views/form_newtopic.php b/src/application/views/form_newtopic.php
index 0850c84..d1d7e44 100644
--- a/src/application/views/form_newtopic.php
+++ b/src/application/views/form_newtopic.php
@@ -34,5 +34,5 @@ if (($_formError = RequestUtils::getAndClearFormError("newtopic")) !== null) {
     ]) ?></label>
     <input type="file" name="files[]" id="i_files" multiple accept="*/*">
 </div>
-<button type="submit" class="btn btn-success"><?= __("Create topic") ?> <span class="glyphicon glyphicon-send" aria-hidden="true"></span></button>
+<button type="submit" class="btn btn-success"><?= __("Create topic") ?> <span class="fa fa-send" aria-hidden="true"></span></button>
 </form>
diff --git a/src/application/views/form_register.php b/src/application/views/form_register.php
index 23f470d..54da2c4 100644
--- a/src/application/views/form_register.php
+++ b/src/application/views/form_register.php
@@ -59,7 +59,7 @@ if (($_formError = RequestUtils::getAndClearFormError("register")) !== null) {
     <div class="input-group">
         <input type="text" name="captcha" id="i_captcha" class="form-control" required>
         <div class="input-group-btn">
-            <button class="btn btn-default" type="button" id="btn-refresh-captcha"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span><span class="sr-only"><?= __("New CAPTCHA") ?></span></button>
+            <button class="btn btn-default" type="button" id="btn-refresh-captcha"><span class="fa fa-refresh" aria-hidden="true"></span><span class="sr-only"><?= __("New CAPTCHA") ?></span></button>
         </div>
     </div>
 </div>
diff --git a/src/application/views/nav_guest.php b/src/application/views/nav_guest.php
index 88a7015..95c236e 100644
--- a/src/application/views/nav_guest.php
+++ b/src/application/views/nav_guest.php
@@ -15,7 +15,7 @@ if ($GLOBALS["action"] === "login")
 
 ?>
 <ul class="nav navbar-nav navbar-right">
-<li<?= $GLOBALS["action"] === "search" ? ' class="active"' : '' ?>><a href="?_action=search"><span class="glyphicon glyphicon-search" aria-hidden="true"></span><span class="sr-only"><?= __("Search") ?></span></a></li>
+<li<?= $GLOBALS["action"] === "search" ? ' class="active"' : '' ?>><a href="?_action=search"><span class="fa fa-search" aria-hidden="true"></span><span class="sr-only"><?= __("Search") ?></span></a></li>
 <li<?= $GLOBALS["action"] === "auth" ? ' class="active"' : '' ?>><a href="?_action=auth&amp;next=<?= htmlentities(urlencode($nextParam)) ?>"><?= __("Log in") ?></a></li>
 <?php if (REGISTRATION_ENABLED): ?>
 <li<?= $GLOBALS["action"] === "register" ? ' class="active"' : '' ?>><a href="?_action=register&amp;next=<?= htmlentities(urlencode($nextParam)) ?>"><?= __("Register") ?></a></li>
diff --git a/src/application/views/nav_logged_in.php b/src/application/views/nav_logged_in.php
index c049ec5..8dbb325 100644
--- a/src/application/views/nav_logged_in.php
+++ b/src/application/views/nav_logged_in.php
@@ -6,7 +6,7 @@ use mystic\forum\orm\User;
     "user" => ($user->id === User::SUPERUSER_ID) ? ('<strong class="text-danger">' . htmlentities($user->displayName) . '</strong>') : ('<strong>' . htmlentities($user->displayName) . '</strong>')
 ]) ?>
 </p></li>
-<li<?= $GLOBALS["action"] === "search" ? ' class="active"' : '' ?>><a href="?_action=search"><span class="glyphicon glyphicon-search" aria-hidden="true"></span><span class="sr-only"><?= __("Search") ?></span></a></li>
-<li<?= ($isViewingOwnProfile ?? false) ? ' class="active"' : '' ?>><a href="?_action=viewuser&amp;user=<?= htmlentities(urlencode($user->id)) ?>"><span class="glyphicon glyphicon-user" aria-hidden="true"></span><span class="sr-only">View profile</span></a></li>
-<li><a href="?_action=logout&amp;next=<?= htmlentities(urlencode($_SERVER["REQUEST_URI"])) ?>"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span><span class="sr-only">Log out</span></a></li>
+<li<?= $GLOBALS["action"] === "search" ? ' class="active"' : '' ?>><a href="?_action=search"><span class="fa fa-search" aria-hidden="true"></span><span class="sr-only"><?= __("Search") ?></span></a></li>
+<li<?= ($isViewingOwnProfile ?? false) ? ' class="active"' : '' ?>><a href="?_action=viewuser&amp;user=<?= htmlentities(urlencode($user->id)) ?>"><span class="fa fa-user" aria-hidden="true"></span><span class="sr-only">View profile</span></a></li>
+<li><a href="?_action=logout&amp;next=<?= htmlentities(urlencode($_SERVER["REQUEST_URI"])) ?>"><span class="fa fa-sign-out" aria-hidden="true"></span><span class="sr-only">Log out</span></a></li>
 </ul>
diff --git a/src/application/views/view_logintoreply.php b/src/application/views/view_logintoreply.php
index 11e0e1e..1b5983a 100644
--- a/src/application/views/view_logintoreply.php
+++ b/src/application/views/view_logintoreply.php
@@ -1,7 +1,7 @@
 <div class="well margin-top-4x text-center">
     <div class="h3 margin-top-0"><?= __("Log in to reply to this topic") ?></div>
     <a href="?_action=auth&amp;next=<?= htmlentities(urlencode($_SERVER["REQUEST_URI"])) ?>" class="btn btn-success">
-        <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+        <span class="fa fa-user" aria-hidden="true"></span>
         <?= __("Log in") ?>
     </a>
 </div>
\ No newline at end of file
diff --git a/src/application/views/view_post.php b/src/application/views/view_post.php
index 0f86896..b41f418 100644
--- a/src/application/views/view_post.php
+++ b/src/application/views/view_post.php
@@ -38,7 +38,7 @@ $is_op = $postAuthor?->id === $topicAuthor?->id && $postAuthor?->id !== null;
 </div>
 <div class="media-body">
     <div class="well icon-well text-warning">
-        <span class="glyphicon glyphicon-exclamation-sign text-warning" aria-hidden="true"></span>
+        <span class="fa fa-exclamation-triangle text-warning" aria-hidden="true"></span>
         <em><?= __("This post has been deleted") ?></em>
     </div>
 </div>
@@ -66,17 +66,17 @@ $is_op = $postAuthor?->id === $topicAuthor?->id && $postAuthor?->id !== null;
                 <div class="panel-title h3">
                     <?php if (!$hide_actions): ?>
                     <div class="pull-right">
-                        <a href="#post-<?= htmlentities(urlencode($post->id)) ?>" class="btn btn-default"><span class="glyphicon glyphicon-link" aria-hidden="true"></span><span class="sr-only"><?= __("Permalink") ?></span></a>
+                        <a href="#post-<?= htmlentities(urlencode($post->id)) ?>" class="btn btn-default"><span class="fa fa-link" aria-hidden="true"></span><span class="sr-only"><?= __("Permalink") ?></span></a>
                         <?php if ($canReply): ?>
-                            <button data-post-id="<?= htmlentities($post->id) ?>" class="btn btn-default js-only _reply-post"><span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span><span class="sr-only"><?= __("Reply to post") ?></span></button>
+                            <button data-post-id="<?= htmlentities($post->id) ?>" class="btn btn-default js-only _reply-post"><span class="fa fa-comment" aria-hidden="true"></span><span class="sr-only"><?= __("Reply to post") ?></span></button>
                         <?php endif; ?>
                         <?php if ($canEdit): ?>
-                            <button data-post-id="<?= htmlentities($post->id) ?>" class="btn btn-default js-only _edit-post"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span><span class="sr-only"><?= __("Edit post") ?></span></button>
+                            <button data-post-id="<?= htmlentities($post->id) ?>" class="btn btn-default js-only _edit-post"><span class="fa fa-pencil" aria-hidden="true"></span><span class="sr-only"><?= __("Edit post") ?></span></button>
                         <?php endif; ?>
                         <?php if ($canDelete): ?>
                             <form action="?_action=deletepost" method="post" class="seamless-inline">
                                 <input type="hidden" name="post" value="<?= htmlentities($post->id) ?>">
-                                <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span><span class="sr-only"><?= __("Delete post") ?></span></button>
+                                <button type="submit" class="btn btn-danger"><span class="fa fa-trash" aria-hidden="true"></span><span class="sr-only"><?= __("Delete post") ?></span></button>
                             </form>
                         <?php endif; ?>
                     </div>
@@ -87,7 +87,7 @@ $is_op = $postAuthor?->id === $topicAuthor?->id && $postAuthor?->id !== null;
                         <?php else: ?>
                             <a href="?_action=viewuser&amp;user=<?= htmlentities(urlencode($postAuthor->id)) ?>"><?= htmlentities($postAuthor->displayName) ?></a>
                             <?php if ($is_op): ?>
-                                <span title="<?= __("Created this topic") ?>" class="text-info glyphicon glyphicon-comment"></span>
+                                <span title="<?= __("Created this topic") ?>" class="text-info fa fa-user-circle"></span>
                             <?php endif; ?>
                         <?php endif; ?>
                         <?php if ($your_are_the_author): ?>
@@ -115,9 +115,9 @@ $is_op = $postAuthor?->id === $topicAuthor?->id && $postAuthor?->id !== null;
                             <a class="image-attachment attachment<?php if (str_starts_with($attachment->mimeType, "video/")): ?> video-attachment<?php endif; ?>" href="?_action=attachment&amp;attachment=<?= htmlentities(urlencode($attachment->id)) ?>" title="<?= htmlentities($attachment->name) ?>" data-attachment-id="<?= htmlentities($attachment->id) ?>">
                                 <img class="image-attachment-image" src="?_action=thumb&amp;attachment=<?= htmlentities(urlencode($attachment->id)) ?>" alt="" width="100">
                                 <?php if (!$canViewAttachments): ?>
-                                    <span class="attachment-lock glyphicon glyphicon-ban-circle" aria-hidden="true"></span>
+                                    <span class="attachment-lock fa fa-ban" aria-hidden="true"></span>
                                 <?php elseif (str_starts_with($attachment->mimeType, "video/")): ?>
-                                    <span class="video-player-icon glyphicon glyphicon-play-circle" aria-hidden="true"></span>
+                                    <span class="video-player-icon fa fa-play-circle" aria-hidden="true"></span>
                                 <?php endif; ?>
                             </a>
                         <?php endif; ?>
@@ -134,7 +134,7 @@ $is_op = $postAuthor?->id === $topicAuthor?->id && $postAuthor?->id !== null;
                             <?php else: ?>
                                 <a class="btn btn-default attachment" href="?_action=attachment&amp;attachment=<?= htmlentities(urlencode($attachment->id)) ?>">
                                     <?php if (!$canViewAttachments): ?>
-                                        <span class="glyphicon glyphicon-ban-circle" aria-hidden="true"></span>
+                                        <span class="fa fa-ban" aria-hidden="true"></span>
                                     <?php endif; ?>
                                     <?= htmlentities($attachment->name) ?>
                                 </a>
diff --git a/src/application/views/view_search_results.php b/src/application/views/view_search_results.php
index 55af213..93e36f7 100644
--- a/src/application/views/view_search_results.php
+++ b/src/application/views/view_search_results.php
@@ -14,14 +14,14 @@ use mystic\forum\utils\StringUtils;
         ?>
             <a href="?_action=viewtopic&amp;topic=<?= htmlentities(urlencode($post->topicId)) ?>#post-<?= htmlentities(urlencode($post->id)) ?>" class="list-group-item">
                 <?php if ($hasAttachments): ?>
-                    <span class="badge"><span class="glyphicon glyphicon-paperclip"></span></span>
+                    <span class="badge"><span class="fa fa-paperclip"></span></span>
                 <?php endif; ?>
                 <?= htmlentities(html_entity_decode(StringUtils::truncate(strip_tags(renderPost($post->content)), 100))) ?><br>
                 <span class="text-muted"><?= __("posted by %author% on %post_date% in %topic%", [
                     "author" => '<em>' . htmlentities($users[$post->authorId]?->displayName ?? __("unknown")) . '</em>',
                     "post_date" => '<span class="_time">' . htmlentities($post->postDate->format("c")) . '</span>',
                     "topic" => '<em>'
-                        . ($topics[$post->topicId]?->isLocked ? '<span class="glyphicon glyphicon-lock text-muted" aria-hidden="true"></span> ' : '')
+                        . ($topics[$post->topicId]?->isLocked ? '<span class="fa fa-lock text-muted" aria-hidden="true"></span> ' : '')
                         . htmlentities($topics[$post->topicId]?->title ?? "unknown") . '</em>',
                 ]) ?></span>
             </a>
@@ -29,7 +29,7 @@ use mystic\forum\utils\StringUtils;
     </div>
 <?php else: ?>
     <div class="well icon-well text-info margin-top margin-bottom">
-        <span class="glyphicon glyphicon-info-sign text-info" aria-hidden="true"></span>
+        <span class="fa fa-info-circle text-info" aria-hidden="true"></span>
         <em><?= __("No results for this search") ?></em>
     </div>
 <?php endif; ?>
diff --git a/src/application/views/view_topic_locked.php b/src/application/views/view_topic_locked.php
index ac59fcb..b3eb99e 100644
--- a/src/application/views/view_topic_locked.php
+++ b/src/application/views/view_topic_locked.php
@@ -1,4 +1,4 @@
 <div class="well icon-well text-warning margin-top-4x">
-    <span class="glyphicon glyphicon-lock text-warning" aria-hidden="true"></span>
+    <span class="fa fa-lock text-warning" aria-hidden="true"></span>
     <em><?= __("This topic has been locked") ?></em>
 </div>
diff --git a/src/application/views/view_topic_start.php b/src/application/views/view_topic_start.php
index fe85afa..cc04ca9 100644
--- a/src/application/views/view_topic_start.php
+++ b/src/application/views/view_topic_start.php
@@ -24,8 +24,8 @@ $canDelete = ($GLOBALS["currentUser"]?->id === $topicAuthor->id && $topicAuthor-
                     <textarea class="form-control" name="message" id="i_edit_message" rows="12" style="resize: vertical; max-height: 500px"></textarea>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> <?= __("Cancel") ?></button>
-                    <button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span> <?= __("Save changes") ?></button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-remove" aria-hidden="true"></span> <?= __("Cancel") ?></button>
+                    <button type="submit" class="btn btn-success"><span class="fa fa-save" aria-hidden="true"></span> <?= __("Save changes") ?></button>
                 </div>
             </div>
         </form>
@@ -36,14 +36,14 @@ $canDelete = ($GLOBALS["currentUser"]?->id === $topicAuthor->id && $topicAuthor-
         <div class="modal-dialog modal-danger" role="document">
             <div class="modal-content panel-danger">
                 <div class="modal-header panel-heading">
-                    <h4 class="modal-title"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> <?= __("Permission denied") ?></h4>
+                    <h4 class="modal-title"><span class="fa fa-exclamation-circle" aria-hidden="true"></span> <?= __("Permission denied") ?></h4>
                 </div>
                 <div class="modal-body">
                     <?= __("You must be logged in to view attachments") ?>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> <?= __("Close") ?></button>
-                    <a href="?_action=auth&amp;next=<?= htmlentities(urlencode($_SERVER["REQUEST_URI"])) ?>" class="btn btn-success"><span class="glyphicon glyphicon-user" aria-hidden="true"></span> <?= __("Log in") ?></a>
+                    <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-close" aria-hidden="true"></span> <?= __("Close") ?></button>
+                    <a href="?_action=auth&amp;next=<?= htmlentities(urlencode($_SERVER["REQUEST_URI"])) ?>" class="btn btn-success"><span class="fa fa-user" aria-hidden="true"></span> <?= __("Log in") ?></a>
                 </div>
             </div>
         </div>
@@ -68,7 +68,7 @@ $canDelete = ($GLOBALS["currentUser"]?->id === $topicAuthor->id && $topicAuthor-
                     <img class="image-attachment-view attachment-view" id="image-attachment-view" alt="">
                 </div>
                 <div class="modal-footer">
-                    <a href="" download id="image-attachment-dl-btn" class="btn btn-default"><span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span> <?= __("Download") ?></a>
+                    <a href="" download id="image-attachment-dl-btn" class="btn btn-default"><span class="fa fa-download" aria-hidden="true"></span> <?= __("Download") ?></a>
                 </div>
             </div>
         </div>
@@ -84,7 +84,7 @@ $canDelete = ($GLOBALS["currentUser"]?->id === $topicAuthor->id && $topicAuthor-
                     <video class="video-attachment-view attachment-view" id="video-attachment-view" controls></video>
                 </div>
                 <div class="modal-footer">
-                    <a href="" download id="video-attachment-dl-btn" class="btn btn-default"><span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span> <?= __("Download") ?></a>
+                    <a href="" download id="video-attachment-dl-btn" class="btn btn-default"><span class="fa fa-download" aria-hidden="true"></span> <?= __("Download") ?></a>
                 </div>
             </div>
         </div>
@@ -126,35 +126,35 @@ if (($_formError = RequestUtils::getAndClearFormError("locktopic")) !== null) {
     <div id="displayHeading">
         <div role="heading" class="h1 seamless-inline">
             <?php if ($topic->isLocked): ?>
-                <span class="glyphicon glyphicon-lock text-muted" aria-hidden="true"></span>
+                <span class="fa fa-lock text-muted" aria-hidden="true"></span>
             <?php endif; ?>
             <?= htmlentities($topic->title) ?>
             <div class="pull-right text-normal">
                 <?php if ($canEdit && !$topic->isLocked): ?>
-                    <button id="btn-edit-title" class="btn btn-default js-only"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> <?= __("Edit title") ?></button>
+                    <button id="btn-edit-title" class="btn btn-default js-only"><span class="fa fa-pencil" aria-hidden="true"></span> <?= __("Edit title") ?></button>
                 <?php endif; ?>
                 <?php if ($canReply): ?>
-                    <button id="btn-reply" class="btn btn-default js-only"><span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span> <?= __("Reply") ?></button>
+                    <button id="btn-reply" class="btn btn-default js-only"><span class="fa fa-comment" aria-hidden="true"></span> <?= __("Reply") ?></button>
                 <?php endif; ?>
                 <?php if ($canEdit): ?>
                     <?php if ($topic->isLocked): ?>
                         <form action="?_action=locktopic" method="post" class="seamless-inline">
                             <input type="hidden" name="topic" value="<?= htmlentities($topic->id) ?>">
                             <input type="hidden" name="locked" value="false">
-                            <button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span> <?= __("Unlock topic") ?></button>
+                            <button type="submit" class="btn btn-success"><span class="fa fa-unlock" aria-hidden="true"></span> <?= __("Unlock topic") ?></button>
                         </form>
                     <?php else: ?>
                         <form action="?_action=locktopic" method="post" class="seamless-inline">
                             <input type="hidden" name="topic" value="<?= htmlentities($topic->id) ?>">
                             <input type="hidden" name="locked" value="true">
-                            <button type="submit" class="btn btn-warning"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span> <?= __("Lock topic") ?></button>
+                            <button type="submit" class="btn btn-warning"><span class="fa fa-lock" aria-hidden="true"></span> <?= __("Lock topic") ?></button>
                         </form>
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php if ($canDelete): ?>
                     <form action="?_action=deletetopic" method="post" class="seamless-inline">
                         <input type="hidden" name="topic" value="<?= htmlentities($topic->id) ?>">
-                        <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> <?= __("Delete topic") ?></button>
+                        <button type="submit" class="btn btn-danger"><span class="fa fa-trash" aria-hidden="true"></span> <?= __("Delete topic") ?></button>
                     </form>
                 <?php endif; ?>
             </div>
@@ -172,8 +172,8 @@ if (($_formError = RequestUtils::getAndClearFormError("locktopic")) !== null) {
                     <input type="text" class="form-control" name="title" id="i_edit_title" data-original-value="<?= htmlentities($topic->title) ?>" value="<?= htmlentities($topic->title) ?>" style="box-sizing: border-box; width: 100%; font-size: 36px; height: 56px">
                 </div>
                 <div class="col-md-4 text-right">
-                    <button type="button" id="topicTitleEditCancel" class="btn btn-default"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> <?= __("Cancel") ?></button>
-                    <button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span> <?= __("Save changes") ?></button>
+                    <button type="button" id="topicTitleEditCancel" class="btn btn-default"><span class="fa fa-close" aria-hidden="true"></span> <?= __("Cancel") ?></button>
+                    <button type="submit" class="btn btn-success"><span class="fa fa-save" aria-hidden="true"></span> <?= __("Save changes") ?></button>
                 </div>
             </div>
         </form>
diff --git a/src/application/views/view_topiclog.php b/src/application/views/view_topiclog.php
index be3f78d..291dada 100644
--- a/src/application/views/view_topiclog.php
+++ b/src/application/views/view_topiclog.php
@@ -33,7 +33,7 @@ if ($postAuthor === null) {
 <div class="media-body">
     <?php if ($logMessage->type === TopicLogMessage::LOCKED): ?>
         <div class="well icon-well text-info">
-            <span class="glyphicon glyphicon-lock text-info" aria-hidden="true"></span>
+            <span class="fa fa-lock text-info" aria-hidden="true"></span>
             <em><?= __("%user% locked this topic", [
                 "user" => $user,
             ]) ?></em>
@@ -42,7 +42,7 @@ if ($postAuthor === null) {
         </div>
     <?php elseif ($logMessage->type === TopicLogMessage::UNLOCKED): ?>
         <div class="well icon-well text-success">
-            <span class="glyphicon glyphicon-globe text-success" aria-hidden="true"></span>
+            <span class="fa fa-unlock text-success" aria-hidden="true"></span>
             <em><?= __("%user% unlocked this topic", [
                 "user" => $user,
             ]) ?></em>
@@ -51,7 +51,7 @@ if ($postAuthor === null) {
         </div>
     <?php elseif ($logMessage->type === TopicLogMessage::TITLE_CHANGED): ?>
         <div class="well icon-well text-info">
-            <span class="glyphicon glyphicon-pencil text-info" aria-hidden="true"></span>
+            <span class="fa fa-pencil text-info" aria-hidden="true"></span>
             <em><?= __("%user% changed the title of this topic from %old_title% to %new_title%", [
                 "user" => $user,
                 "old_title" => '<strong>' . htmlentities($logMessage->params["old_value"] ?? __("unknown")) . '</strong>',
diff --git a/src/application/views/view_topics.php b/src/application/views/view_topics.php
index a762f8c..8a94775 100644
--- a/src/application/views/view_topics.php
+++ b/src/application/views/view_topics.php
@@ -6,7 +6,7 @@ use mystic\forum\orm\UserPermissions;
 if ($GLOBALS["currentUser"]?->hasPermission(UserPermissions::CREATE_OWN_TOPIC)):
 ?>
 <p class="text-right">
-<a href="?_action=newtopic" class="btn btn-success"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> <?= __("New topic") ?></a>
+<a href="?_action=newtopic" class="btn btn-success"><span class="fa fa-plus" aria-hidden="true"></span> <?= __("New topic") ?></a>
 </p>
 <?php endif; ?>
 <div class="list-group">
@@ -14,7 +14,7 @@ if ($GLOBALS["currentUser"]?->hasPermission(UserPermissions::CREATE_OWN_TOPIC)):
 <a class="list-group-item" href="?_action=viewtopic&amp;topic=<?= htmlentities(urlencode($topic->id)) ?>">
     <h4 class="list-group-item-heading">
         <?php if ($topic->isLocked): ?>
-            <span class="glyphicon glyphicon-lock text-muted" aria-hidden="true"></span>
+            <span class="fa fa-lock text-muted" aria-hidden="true"></span>
         <?php endif; ?>
         <?= htmlentities($topic->title) ?>
     </h4>
diff --git a/src/application/views/view_user.php b/src/application/views/view_user.php
index a38096f..c95b557 100644
--- a/src/application/views/view_user.php
+++ b/src/application/views/view_user.php
@@ -54,13 +54,13 @@ $emailPending = $isOwnProfile && $user->pendingEmail !== null;
                 ?>
                     <a href="?_action=viewtopic&amp;topic=<?= htmlentities(urlencode($post->topicId)) ?>#post-<?= htmlentities(urlencode($post->id)) ?>" class="list-group-item">
                         <?php if ($hasAttachments): ?>
-                            <span class="badge"><span class="glyphicon glyphicon-paperclip"></span></span>
+                            <span class="badge"><span class="fa fa-paperclip"></span></span>
                         <?php endif; ?>
                         <?= htmlentities(html_entity_decode(StringUtils::truncate(strip_tags(renderPost($post->content)), 100))) ?><br>
                         <span class="text-muted"><?= __("posted on %post_date% in %topic%", [
                             "post_date" => '<span class="_time">' . htmlentities($post->postDate->format("c")) . '</span>',
                             "topic" => '<em>' .
-                                ($topics[$post->topicId]?->isLocked ? '<span class="glyphicon glyphicon-lock text-muted" aria-hidden="true"></span> ' : '') .
+                                ($topics[$post->topicId]?->isLocked ? '<span class="fa fa-lock text-muted" aria-hidden="true"></span> ' : '') .
                                 htmlentities($topics[$post->topicId]?->title ?? "unknown") . '</em>',
                         ]) ?></span>
                     </a>
@@ -73,7 +73,7 @@ $emailPending = $isOwnProfile && $user->pendingEmail !== null;
     </div>
 <?php else: ?>
     <div class="well icon-well text-info margin-top margin-bottom">
-        <span class="glyphicon glyphicon-info-sign text-info" aria-hidden="true"></span>
+        <span class="fa fa-info-circle text-info" aria-hidden="true"></span>
         <em><?= __("This user has not posted anything yet") ?></em>
     </div>
 <?php endif; ?>
-- 
cgit v1.2.3