From c2c00aaeb0bc5db0a7f155e24b69883fd3258588 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 18 Jul 2021 12:51:10 +0200
Subject: [PATCH] #585 - renamed charts
---
src/main/resources/languages/base_de.properties | 12 ++++++------
src/main/resources/languages/base_en.properties | 12 ++++++------
src/main/resources/static/css/charts.css | 2 ++
src/main/resources/templates/charts/charts.ftl | 6 ++++--
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index 7b9fbd8d2..4a0529eed 100644
--- a/src/main/resources/languages/base_de.properties
+++ b/src/main/resources/languages/base_de.properties
@@ -503,19 +503,19 @@ chart.group.type.year=Jahr
charts.default.accountSumPerDay=Kontostand pro Tag
charts.default.accountSumPerDay.localization='{"axisY": "Summe in "'}
charts.default.categories=Eingaben/Ausgaben nach Kategorien
-charts.default.incomesAndExpendituresPerMonthBar=Eingaben/Ausgaben pro Monat (Balkendiagramm)
+charts.default.incomesAndExpendituresPerMonthBar=Eingaben/Ausgaben pro Monat
charts.default.incomesAndExpendituresPerMonthBar.localization='{"axisY": "Summe in ", "traceName1": "Einnahmen", "traceName2": "Ausgaben"'}
-charts.default.incomesAndExpendituresPerMonthLine=Eingaben/Ausgaben pro Monat (Liniendiagramm)
+charts.default.incomesAndExpendituresPerMonthLine=Eingaben/Ausgaben pro Monat
charts.default.incomesAndExpendituresPerMonthLine.localization='{"axisY": "Summe in ", "traceName1": "Einnahmen", "traceName2": "Ausgaben"'}
-charts.default.incomesAndExpendituresByCategoryBar=Eingaben/Ausgaben nach Kategorien (Balkendiagramm)
+charts.default.incomesAndExpendituresByCategoryBar=Eingaben/Ausgaben nach Kategorien
charts.default.incomesAndExpendituresByCategoryBar.localization='{"label1": "Ausgaben", "label2": "Einnahmen"'}
-charts.default.incomesAndExpendituresByCategoryPie=Eingaben/Ausgaben nach Kategorien (Tortendiagramm)
+charts.default.incomesAndExpendituresByCategoryPie=Eingaben/Ausgaben nach Kategorien
charts.default.incomesAndExpendituresByCategoryPie.localization='{"label1": "Ausgaben", "label2": "Einnahmen"'}
-charts.default.incomesAndExpendituresPerMonthByCategories=Eingaben/Ausgaben pro Monat (nach Kategorien)
+charts.default.incomesAndExpendituresPerMonthByCategories=Eingaben/Ausgaben pro Monat nach Kategorien
charts.default.incomesAndExpendituresPerMonthByCategories.localization='{"label1": "Ausgaben", "label2": "Einnahmen"'}
charts.default.restPerMonth=Rest pro Monat
charts.default.restPerMonth.localization='{"label1": "Rest in "'}
-charts.default.incomesAndExpendituresPerYearBar=Eingaben/Ausgaben pro Jahr (Balkendiagramm)
+charts.default.incomesAndExpendituresPerYearBar=Eingaben/Ausgaben pro Jahr
charts.default.incomesAndExpendituresPerYearBar.localization='{"axisY": "Summe in ", "traceName1": "Einnahmen", "traceName2": "Ausgaben"'}
chart.new.label.name=Name
diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties
index b604c8389..cd72f649b 100644
--- a/src/main/resources/languages/base_en.properties
+++ b/src/main/resources/languages/base_en.properties
@@ -503,19 +503,19 @@ chart.group.type.year=Year
charts.default.accountSumPerDay=Account sum per day
charts.default.accountSumPerDay.localization='{"axisY": "Sum in "'}
charts.default.categories=Incomes/Expenditures per category
-charts.default.incomesAndExpendituresPerMonthBar=Incomes/Expenditures per month (Bar chart)
+charts.default.incomesAndExpendituresPerMonthBar=Incomes/Expenditures per month
charts.default.incomesAndExpendituresPerMonthBar.localization='{"axisY": "Sum in ", "traceName1": "Incomes", "traceName2": "Expenditures"'}
-charts.default.incomesAndExpendituresPerMonthLine=Incomes/Expenditures per month (Line chart)
+charts.default.incomesAndExpendituresPerMonthLine=Incomes/Expenditures per month
charts.default.incomesAndExpendituresPerMonthLine.localization='{"axisY": "Sum in ", "traceName1": "Incomes", "traceName2": "Expenditures"'}
-charts.default.incomesAndExpendituresByCategoryBar=Incomes/Expenditures by categories (Bar chart)
+charts.default.incomesAndExpendituresByCategoryBar=Incomes/Expenditures by categories
charts.default.incomesAndExpendituresByCategoryBar.localization='{"label1": "Expenditures", "label2": "Incomes"'}
-charts.default.incomesAndExpendituresByCategoryPie=Incomes/Expenditures by categories (Pie chart)
+charts.default.incomesAndExpendituresByCategoryPie=Incomes/Expenditures by categories
charts.default.incomesAndExpendituresByCategoryPie.localization='{"label1": "Expenditures", "label2": "Incomes"'}
-charts.default.incomesAndExpendituresPerMonthByCategories=Incomes/Expenditures per month (By categories)
+charts.default.incomesAndExpendituresPerMonthByCategories=Incomes/Expenditures per month by categories
charts.default.incomesAndExpendituresPerMonthByCategories.localization='{"label1": "Expenditures", "label2": "Incomes"'}
charts.default.restPerMonth=Rest per month
charts.default.restPerMonth.localization='{"label1": "Rest in "'}
-charts.default.incomesAndExpendituresPerYearBar=Incomes/Expenditures per year (Bar chart)
+charts.default.incomesAndExpendituresPerYearBar=Incomes/Expenditures per year
charts.default.incomesAndExpendituresPerYearBar.localization='{"axisY": "Sum in ", "traceName1": "Incomes", "traceName2": "Expenditures"'}
chart.new.label.name=Name
diff --git a/src/main/resources/static/css/charts.css b/src/main/resources/static/css/charts.css
index ff90effdd..84439feb8 100644
--- a/src/main/resources/static/css/charts.css
+++ b/src/main/resources/static/css/charts.css
@@ -52,6 +52,8 @@
.chart-preview .card-action {
word-break: break-word;
color: #212121;
+ min-height: 5rem;
+ padding: 1rem;
}
#chart-date-card {
diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl
index 429c9b71f..d725fbb61 100644
--- a/src/main/resources/templates/charts/charts.ftl
+++ b/src/main/resources/templates/charts/charts.ftl
@@ -298,8 +298,10 @@
<div class="card-image">
<img src="<@s.url '/images/charts/' + chart.getPreviewImageFileName()!"placeholder.png"/>">
</div>
- <div class="card-action bold">
- ${chartFunctions.getChartName(chart)}
+ <div class="card-action bold valign-wrapper">
+ <span style="margin: auto">
+ ${chartFunctions.getChartName(chart)}
+ </span>
</div>
</div>
</div>
--
GitLab