From 637e40b2cbe4bd31b6472b32e3937b22329b2135 Mon Sep 17 00:00:00 2001
From: emeric <emeric.poupon@laposte.net>
Date: Fri, 8 Aug 2025 18:24:21 +0200
Subject: [PATCH] Made a dedicated window modal, fixes #428

---
 approot/admin-about.xml       | 39 +++++++++++++++++++++++++++++
 approot/main.xml              |  2 +-
 approot/messages.xml          |  6 +++++
 approot/messages_es.xml       |  6 +++++
 approot/messages_fr.xml       |  6 +++++
 approot/messages_it.xml       |  6 +++++
 approot/messages_pl.xml       |  6 +++++
 approot/messages_zh.xml       |  6 +++++
 src/lms/CMakeLists.txt        |  1 +
 src/lms/ui/LmsApplication.cpp |  8 ++++--
 src/lms/ui/admin/About.cpp    | 47 +++++++++++++++++++++++++++++++++++
 src/lms/ui/admin/About.hpp    | 25 +++++++++++++++++++
 12 files changed, 155 insertions(+), 3 deletions(-)
 create mode 100644 approot/admin-about.xml
 create mode 100644 src/lms/ui/admin/About.cpp
 create mode 100644 src/lms/ui/admin/About.hpp

diff --git a/approot/admin-about.xml b/approot/admin-about.xml
new file mode 100644
index 00000000..44b2f5c8
--- /dev/null
+++ b/approot/admin-about.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<messages xmlns:if="Wt.WTemplate.conditions">
+
+<message id="Lms.Admin.About.template">
+	<div class="modal fade" tabindex="-1">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title">${tr:Lms.Admin.About.about}</h5>
+				</div>
+				<div class="modal-body">
+					<div class="container-fluid d-grid gap-2">
+						<div class="row align-items-center">
+							<div class="col-4">
+								${tr:Lms.Admin.About.version}
+							</div>
+							<div class="col">
+								${version}
+							</div>
+						</div>
+						<div class="row align-items-center">
+							<div class="col-4">
+								${tr:Lms.Admin.About.homepage}
+							</div>
+							<div class="col">
+								<a href="${homepage-link}" target="_blank" class="dropdown-item link-success">${homepage-link}</a>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					${ok-btn class="btn btn-primary"}
+				</div>
+			</div>
+		</div>
+	</div>
+</message>
+
+</messages>
diff --git a/approot/main.xml b/approot/main.xml
index f7f25dad..bc1eb859 100644
--- a/approot/main.xml
+++ b/approot/main.xml
@@ -40,11 +40,11 @@
 							<i class="fa fa-cogs" aria-hidden="true"></i>
 						</a>
 						<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
-							<li class="dropdown-header">LMS ${version}</li>
 							<li>${media-libraries class="dropdown-item"}</li>
 							<li>${scan-settings class="dropdown-item"}</li>
 							<li>${scanner class="dropdown-item"}</li>
 							<li>${users class="dropdown-item"}</li>
+							<li>${about class="dropdown-item"}</li>
 							${<if-debug-tools>}
 							<li class="dropdown-divider"></li>
 							<li>${debug-tools class="dropdown-item"}</li>
diff --git a/approot/messages.xml b/approot/messages.xml
index 58700fbd..8ef86dac 100644
--- a/approot/messages.xml
+++ b/approot/messages.xml
@@ -52,12 +52,18 @@
 <message id="Lms.Error.user-not-found">User not found</message>
 
 <!--Administration-->
+<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> About</message>
 <message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Debug tools</message>
 <message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Libraries</message>
 <message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Scan settings</message>
 <message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Scanner</message>
 <message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Users</message>
 
+<!--About-->
+<message id="Lms.Admin.About.about">About</message>
+<message id="Lms.Admin.About.homepage">Homepage</message>
+<message id="Lms.Admin.About.version">Version</message>
+
 <!--MediaLibraries-->
 <message id="Lms.Admin.MediaLibraries.media-libraries">Music libraries</message>
 <message id="Lms.Admin.MediaLibrary.create-library">Create library</message>
diff --git a/approot/messages_es.xml b/approot/messages_es.xml
index a0b1bdc5..f10b5bbe 100644
--- a/approot/messages_es.xml
+++ b/approot/messages_es.xml
@@ -52,12 +52,18 @@
 <message id="Lms.Error.user-not-found">No existe el usuario</message>
 
 <!--Administration-->
+<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> Acerca de</message>
 <message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Herramientas de depuración</message>
 <message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Bibliotecas</message>
 <message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Opciones de escaneo</message>
 <message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Escanear</message>
 <message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Usuarios</message>
 
+<!--About-->
+<message id="Lms.Admin.About.about">Acerca de</message>
+<message id="Lms.Admin.About.homepage">Página principal</message>
+<message id="Lms.Admin.About.version">Versión</message>
+
 <!--MediaLibraries-->
 <message id="Lms.Admin.MediaLibraries.media-libraries">Bibliotecas musicales</message>
 <message id="Lms.Admin.MediaLibrary.create-library">Crear una biblioteca</message>
diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml
index 5ed3d408..40a1ca5d 100644
--- a/approot/messages_fr.xml
+++ b/approot/messages_fr.xml
@@ -52,12 +52,18 @@
 <message id="Lms.Error.user-not-found">L'utilisateur n'existe pas</message>
 
 <!--Administration-->
+<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> À propos</message>
 <message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Outils de débogage</message>
 <message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Bibliothèques</message>
 <message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Paramètres du scan</message>
 <message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Scanner</message>
 <message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utilisateurs</message>
 
+<!--About-->
+<message id="Lms.Admin.About.about">À propos</message>
+<message id="Lms.Admin.About.homepage">Page d’accueil</message>
+<message id="Lms.Admin.About.version">Version</message>
+
 <!--MediaLibraries-->
 <message id="Lms.Admin.MediaLibraries.media-libraries">Bibliothèques musicales</message>
 <message id="Lms.Admin.MediaLibrary.create-library">Créer une bibliothèque</message>
diff --git a/approot/messages_it.xml b/approot/messages_it.xml
index 6fadb396..0238697e 100644
--- a/approot/messages_it.xml
+++ b/approot/messages_it.xml
@@ -52,12 +52,18 @@
 <message id="Lms.Error.user-not-found">Utente non trovato</message>
 
 <!--Administration-->
+<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> Informazioni</message>
 <message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Strumenti di debug</message>
 <message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Librerie</message>
 <message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Impostazioni di scansione</message>
 <message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Scanner</message>
 <message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utenti</message>
 
+<!--About-->
+<message id="Lms.Admin.About.about">Informazioni</message>
+<message id="Lms.Admin.About.homepage">Pagina iniziale</message>
+<message id="Lms.Admin.About.version">Versione</message>
+
 <!--MediaLibraries-->
 <message id="Lms.Admin.MediaLibraries.media-libraries">Librerie musicali</message>
 <message id="Lms.Admin.MediaLibrary.create-library">Crea libreria</message>
diff --git a/approot/messages_pl.xml b/approot/messages_pl.xml
index 1f1b811c..41792a50 100644
--- a/approot/messages_pl.xml
+++ b/approot/messages_pl.xml
@@ -53,12 +53,18 @@
 <message id="Lms.Error.user-not-found">Użytkownik nie odnaleziony</message>
 
 <!--Administration-->
+<message id="Lms.Admin.menu-about"><i class="fa fa-fw fa-question-circle" aria-hidden="true"></i> O programie</message>
 <message id="Lms.Admin.menu-debug-tools"><i class="fa fa-fw fa-bug" aria-hidden="true"></i> Narzędzia debugowania</message>
 <message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Biblioteki</message>
 <message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Ustawienia skanowania</message>
 <message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Skaner</message>
 <message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Użytkownicy</message>
 
+<!--About-->
+<message id="Lms.Admin.About.about">O programie</message>
+<message id="Lms.Admin.About.homepage">Strona główna</message>
+<message id="Lms.Admin.About.version">Wersja</message>
+
 <!--MediaLibraries-->
 <message id="Lms.Admin.MediaLibraries.media-libraries">Biblioteki muzyczne</message>
 <message id="Lms.Admin.MediaLibrary.create-library">Utwórz bibliotekę</message>
diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml
index 6ca9201f..5125fd20 100644
--- a/approot/messages_zh.xml
+++ b/approot/messages_zh.xml
@@ -58,6 +58,12 @@
 
 
 
+
+<!--About-->
+
+
+
+
 <!--MediaLibraries-->
 
 
diff --git a/src/lms/CMakeLists.txt b/src/lms/CMakeLists.txt
index 2adef2e1..d8011f72 100644
--- a/src/lms/CMakeLists.txt
+++ b/src/lms/CMakeLists.txt
@@ -16,6 +16,7 @@ add_executable(lms
 	ui/Utils.cpp
 	ui/admin/debug/Database.cpp
 	ui/admin/debug/Tracing.cpp
+	ui/admin/About.cpp
 	ui/admin/DebugToolsView.cpp
 	ui/admin/InitWizardView.cpp
 	ui/admin/MediaLibrariesView.cpp
diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp
index 69ff57aa..ee067557 100644
--- a/src/lms/ui/LmsApplication.cpp
+++ b/src/lms/ui/LmsApplication.cpp
@@ -29,7 +29,6 @@
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
 #include "core/Service.hpp"
-#include "core/Version.hpp"
 #include "database/IDb.hpp"
 #include "database/IQueryPlanRecorder.hpp"
 #include "database/Session.hpp"
@@ -53,6 +52,7 @@
 #include "NotificationContainer.hpp"
 #include "PlayQueue.hpp"
 #include "SettingsView.hpp"
+#include "admin/About.hpp"
 #include "admin/DebugToolsView.hpp"
 #include "admin/InitWizardView.hpp"
 #include "admin/MediaLibrariesView.hpp"
@@ -77,6 +77,7 @@ namespace lms::ui
             const std::string appRoot{ Wt::WApplication::appRoot() };
 
             auto res{ std::make_shared<Wt::WMessageResourceBundle>() };
+            res->use(appRoot + "admin-about");
             res->use(appRoot + "admin-db");
             res->use(appRoot + "admin-debugtools");
             res->use(appRoot + "admin-initwizard");
@@ -461,7 +462,10 @@ namespace lms::ui
         if (LmsApp->getUserType() == db::UserType::ADMIN)
         {
             navbar->setCondition("if-is-admin", true);
-            navbar->bindString("version", std::string{ core::getVersion() }, Wt::TextFormat::Plain);
+            auto* about{ navbar->bindNew<Wt::WPushButton>("about", Wt::WString::tr("Lms.Admin.menu-about"), Wt::TextFormat::XHTML) };
+            about->clicked().connect([] {
+                showAboutModal();
+            });
             navbar->bindNew<Wt::WAnchor>("media-libraries", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/libraries" }, Wt::WString::tr("Lms.Admin.menu-media-libraries"));
             navbar->bindNew<Wt::WAnchor>("scan-settings", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/scan-settings" }, Wt::WString::tr("Lms.Admin.menu-scan-settings"));
             navbar->bindNew<Wt::WAnchor>("scanner", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/scanner" }, Wt::WString::tr("Lms.Admin.menu-scanner"));
diff --git a/src/lms/ui/admin/About.cpp b/src/lms/ui/admin/About.cpp
new file mode 100644
index 00000000..a5cc4ef8
--- /dev/null
+++ b/src/lms/ui/admin/About.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2025 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ModalManager.hpp"
+
+#include <Wt/WPushButton.h>
+#include <Wt/WTemplate.h>
+
+#include "core/Version.hpp"
+
+#include "LmsApplication.hpp"
+
+namespace lms::ui
+{
+    void showAboutModal()
+    {
+        auto aboutModal{ std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Admin.About.template")) };
+        Wt::WWidget* aboutModalPtr{ aboutModal.get() };
+        aboutModal->addFunction("tr", &Wt::WTemplate::Functions::tr);
+
+        aboutModal->bindString("version", std::string{ core::getVersion() }, Wt::TextFormat::Plain);
+        aboutModal->bindString("homepage-link", "https://github.com/epoupon/lms");
+
+        Wt::WPushButton* okBtn{ aboutModal->bindNew<Wt::WPushButton>("ok-btn", Wt::WString::tr("Lms.ok")) };
+        okBtn->clicked().connect([=] {
+            LmsApp->getModalManager().dispose(aboutModalPtr);
+        });
+
+        LmsApp->getModalManager().show(std::move(aboutModal));
+    }
+} // namespace lms::ui
diff --git a/src/lms/ui/admin/About.hpp b/src/lms/ui/admin/About.hpp
new file mode 100644
index 00000000..8cf76b8c
--- /dev/null
+++ b/src/lms/ui/admin/About.hpp
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2025 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+namespace lms::ui
+{
+    void showAboutModal();
+} // namespace lms::ui