From 7ddaba5bb06c31fa46ae7c373a4fc4c54e40b2d2 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 14 Jun 2021 23:41:05 +0200
Subject: [PATCH] #622 - use new macro in category circles
---
src/main/resources/templates/accounts/accounts.ftl | 2 +-
.../resources/templates/categories/categoriesFunctions.ftl | 4 ++--
src/main/resources/templates/helpers/customSelectMacros.ftl | 2 +-
src/main/resources/templates/helpers/header.ftl | 2 +-
src/main/resources/templates/templates/templateFunctions.ftl | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index 6f0cab0fb..b41b5d32b 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -38,7 +38,7 @@
<i class="fas fa-edit"></i>
</#if>
</td>
- <td><@header.entityIcon entity=account classes="account-icon"/></td>
+ <td><@header.entityIcon entity=account classes="account-icon text-default"/></td>
<td>${account.getName()}</td>
<td>
<a href="<@s.url '/accounts/${account.getID()?c}/edit'/>" class="btn-flat no-padding text-default"><i class="material-icons left">edit</i></a>
diff --git a/src/main/resources/templates/categories/categoriesFunctions.ftl b/src/main/resources/templates/categories/categoriesFunctions.ftl
index 4387bcbec..c777f81bc 100644
--- a/src/main/resources/templates/categories/categoriesFunctions.ftl
+++ b/src/main/resources/templates/categories/categoriesFunctions.ftl
@@ -24,8 +24,8 @@
<div class="category-circle ${classes} <#if settings.getShowCategoriesAsCircles()?? && settings.getShowCategoriesAsCircles() == false>category-square</#if>" style="background-color: ${category.color}" <#if datasetValue>data-value="${category.getID()}"</#if>>
<span style="color: ${category.getAppropriateTextColor()}">
- <#if category.getIcon()?has_content>
- <i class="${category.getIcon()}"></i>
+ <#if category.getIconReference()??>
+ <@header.entityIcon entity=category/>
<#else>
${categoryName?capitalize[0]}
</#if>
diff --git a/src/main/resources/templates/helpers/customSelectMacros.ftl b/src/main/resources/templates/helpers/customSelectMacros.ftl
index df54e2e80..f3231f8fd 100644
--- a/src/main/resources/templates/helpers/customSelectMacros.ftl
+++ b/src/main/resources/templates/helpers/customSelectMacros.ftl
@@ -165,7 +165,7 @@
<#macro accountIcon account accountName classes="" datasetValue="">
<div class="category-circle ${classes} category-square <#if account.getIconReference()?? == false>account-square-border</#if>" <#if datasetValue?has_content>data-value="${account.getID()}"</#if>>
<#if account.getIconReference()??>
- <@header.entityIcon entity=account classes="account-select-icon"/>
+ <@header.entityIcon entity=account classes="account-select-icon text-blue"/>
<#else>
<span class="text-blue">
${accountName?capitalize[0]}
diff --git a/src/main/resources/templates/helpers/header.ftl b/src/main/resources/templates/helpers/header.ftl
index 4482bc7c4..3031e462c 100644
--- a/src/main/resources/templates/helpers/header.ftl
+++ b/src/main/resources/templates/helpers/header.ftl
@@ -126,7 +126,7 @@
<#if wrapInCircle>
<div class="category-circle">
</#if>
- <i class="${entity.getIconReference().getBuiltinIdentifier()} text-default ${classes}"></i>
+ <i class="${entity.getIconReference().getBuiltinIdentifier()} ${classes}"></i>
<#if wrapInCircle>
</div>
</#if>
diff --git a/src/main/resources/templates/templates/templateFunctions.ftl b/src/main/resources/templates/templates/templateFunctions.ftl
index 2b5972fac..308d62eac 100644
--- a/src/main/resources/templates/templates/templateFunctions.ftl
+++ b/src/main/resources/templates/templates/templateFunctions.ftl
@@ -53,7 +53,7 @@
<#macro templateHeader template>
<#if template.getIconReference()??>
- <@header.entityIcon entity=template wrapInCircle=false classes="template-icon"/>
+ <@header.entityIcon entity=template wrapInCircle=false classes="template-icon text-default"/>
<#elseif template.getTransferAccount()??>
<i class="material-icons">swap_horiz</i>
<#else>
--
GitLab