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 +++---
src/ui/site.css | 1 +
15 files changed, 46 insertions(+), 45 deletions(-)
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);
?>
-
+
= $message; ?>
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) {
]) ?>
-
+
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) {
]) ?>
-
+
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) {
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")
?>
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 @@
\ 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;
-
+
= __("This post has been deleted") ?>
@@ -66,17 +66,17 @@ $is_op = $postAuthor?->id === $topicAuthor?->id && $postAuthor?->id !== null;
@@ -87,7 +87,7 @@ $is_op = $postAuthor?->id === $topicAuthor?->id && $postAuthor?->id !== null;
= htmlentities($postAuthor->displayName) ?>
-
" class="text-info glyphicon glyphicon-comment">
+
" class="text-info fa fa-user-circle">
@@ -115,9 +115,9 @@ $is_op = $postAuthor?->id === $topicAuthor?->id && $postAuthor?->id !== null;
video-attachment" href="?_action=attachment&attachment== htmlentities(urlencode($attachment->id)) ?>" title="= htmlentities($attachment->name) ?>" data-attachment-id="= htmlentities($attachment->id) ?>">
-
+
mimeType, "video/")): ?>
-
+
@@ -134,7 +134,7 @@ $is_op = $postAuthor?->id === $topicAuthor?->id && $postAuthor?->id !== null;
-
+
= htmlentities($attachment->name) ?>
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;
?>
-
+
= htmlentities(html_entity_decode(StringUtils::truncate(strip_tags(renderPost($post->content)), 100))) ?>
= __("posted by %author% on %post_date% in %topic%", [
"author" => '' . htmlentities($users[$post->authorId]?->displayName ?? __("unknown")) . '',
"post_date" => '' . htmlentities($post->postDate->format("c")) . '',
"topic" => ''
- . ($topics[$post->topicId]?->isLocked ? ' ' : '')
+ . ($topics[$post->topicId]?->isLocked ? ' ' : '')
. htmlentities($topics[$post->topicId]?->title ?? "unknown") . '',
]) ?>
@@ -29,7 +29,7 @@ use mystic\forum\utils\StringUtils;
-
+
= __("No results for this search") ?>
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 @@
-
+
= __("This topic has been locked") ?>
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-
@@ -36,14 +36,14 @@ $canDelete = ($GLOBALS["currentUser"]?->id === $topicAuthor->id && $topicAuthor-
= __("You must be logged in to view attachments") ?>
@@ -68,7 +68,7 @@ $canDelete = ($GLOBALS["currentUser"]?->id === $topicAuthor->id && $topicAuthor-
@@ -84,7 +84,7 @@ $canDelete = ($GLOBALS["currentUser"]?->id === $topicAuthor->id && $topicAuthor-
@@ -126,35 +126,35 @@ if (($_formError = RequestUtils::getAndClearFormError("locktopic")) !== null) {
isLocked): ?>
-
+
= htmlentities($topic->title) ?>
isLocked): ?>
-
+
-
+
isLocked): ?>
@@ -172,8 +172,8 @@ if (($_formError = RequestUtils::getAndClearFormError("locktopic")) !== null) {
-
-
+
+
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) {
type === TopicLogMessage::LOCKED): ?>
-
+
= __("%user% locked this topic", [
"user" => $user,
]) ?>
@@ -42,7 +42,7 @@ if ($postAuthor === null) {
type === TopicLogMessage::UNLOCKED): ?>
-
+
= __("%user% unlocked this topic", [
"user" => $user,
]) ?>
@@ -51,7 +51,7 @@ if ($postAuthor === null) {
type === TopicLogMessage::TITLE_CHANGED): ?>
-
+
= __("%user% changed the title of this topic from %old_title% to %new_title%", [
"user" => $user,
"old_title" => '' . htmlentities($logMessage->params["old_value"] ?? __("unknown")) . '',
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)):
?>
- = __("New topic") ?>
+ = __("New topic") ?>
@@ -14,7 +14,7 @@ if ($GLOBALS["currentUser"]?->hasPermission(UserPermissions::CREATE_OWN_TOPIC)):
isLocked): ?>
-
+
= htmlentities($topic->title) ?>
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;
?>
-
+
= htmlentities(html_entity_decode(StringUtils::truncate(strip_tags(renderPost($post->content)), 100))) ?>
= __("posted on %post_date% in %topic%", [
"post_date" => '' . htmlentities($post->postDate->format("c")) . '',
"topic" => '' .
- ($topics[$post->topicId]?->isLocked ? ' ' : '') .
+ ($topics[$post->topicId]?->isLocked ? ' ' : '') .
htmlentities($topics[$post->topicId]?->title ?? "unknown") . '',
]) ?>
@@ -73,7 +73,7 @@ $emailPending = $isOwnProfile && $user->pendingEmail !== null;
-
+
= __("This user has not posted anything yet") ?>
diff --git a/src/ui/site.css b/src/ui/site.css
index 1b92ec2..5f682e0 100644
--- a/src/ui/site.css
+++ b/src/ui/site.css
@@ -89,6 +89,7 @@ a.image-attachment:hover .image-attachment-image {
padding-left: 56px;
}
.icon-well>.icon,
+.icon-well>.fa,
.icon-well>.glyphicon {
font-size: 72px;
opacity: 0.333;
--
cgit v1.2.3