From 667c7d92b4cce64d88b9d586a56c732d87300f3e Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 23 Jun 2024 23:15:21 +0200
Subject: [PATCH] #764 - account overview: show icon if an end date is set for
an account
---
.../src/main/resources/static/css/style.css | 3 +++
.../resources/templates/accounts/accounts.ftl | 16 +++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/BudgetMasterServer/src/main/resources/static/css/style.css b/BudgetMasterServer/src/main/resources/static/css/style.css
index 45694e7e7..2de6a9caa 100644
--- a/BudgetMasterServer/src/main/resources/static/css/style.css
+++ b/BudgetMasterServer/src/main/resources/static/css/style.css
@@ -493,6 +493,9 @@ input[type="radio"]:checked + span::after, [type="radio"].with-gap:checked + spa
.placeholder-icon {
display: inline-block;
width: 1.3rem;
+}
+
+.placeholder-icon-right {
margin-right: 15px;
}
diff --git a/BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl b/BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl
index f35a4fa62..55079c6b8 100644
--- a/BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl
@@ -30,14 +30,20 @@
<tr class="account-overview-row">
<td>
<#if account.getAccountState().name() == "READ_ONLY">
- <div class="placeholder-icon"></div>
- <i class="fas fa-lock"></i>
+ <div class="placeholder-icon placeholder-icon-right"></div>
+ <i class="fas fa-lock placeholder-icon-right"></i>
<#elseif account.getAccountState().name() == "HIDDEN">
- <div class="placeholder-icon"></div>
- <i class="far fa-eye-slash"></i>
+ <div class="placeholder-icon placeholder-icon-right"></div>
+ <i class="far fa-eye-slash placeholder-icon-right"></i>
<#else>
<a href="<@s.url '/accounts/${account.getID()?c}/setAsDefault'/>" class="btn-flat no-padding text-default tooltipped" data-position="left" data-tooltip="${locale.getString("account.tooltip.default")}"><i class="material-icons left"><#if account.isDefault()>star<#else>star_border</#if></i></a>
- <i class="fas fa-edit"></i>
+ <i class="fas fa-edit placeholder-icon-right"></i>
+ </#if>
+
+ <#if account.getEndDate()??>
+ <i class="fas fa-bell"></i>
+ <#else>
+ <div class="placeholder-icon"></div>
</#if>
</td>
<td><@customSelectMacros.accountIcon account account.getName() "text-blue"/></td>
--
GitLab