diff --git a/src/main/java/de/deadlocker8/budgetmaster/hints/HintService.java b/src/main/java/de/deadlocker8/budgetmaster/hints/HintService.java index 66ea76340e3f85aaef65b6923fe16f1afb744d98..f5d86813788fd6c3dd9d669a0ea0c54f141732fe 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/hints/HintService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/hints/HintService.java @@ -54,7 +54,7 @@ public class HintService implements Resettable @Override public void createDefaults() { - final List<String> hintKeys = List.of("hint.first.use.teaser"); + final List<String> hintKeys = List.of("hint.first.use.teaser", "hint.report.columns"); for(String localizationKey : hintKeys) { diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties index f4f19a780aaf6b4526745727b080ae388c6df6f6..8acec97970f39e845db4b0353afaa2cb9cf9c6e6 100644 --- a/src/main/resources/languages/base_de.properties +++ b/src/main/resources/languages/base_de.properties @@ -355,7 +355,6 @@ about.credits=Credits: # REPORT report.settings=Einstellungen report.columns=Spalten auswählen -report.columns.advice=Hinweis: Du kannst die Reihenfolge der Spalten per Drag&Drop anpassen. report.checkbox.include.budget=Budgetkalkulation hinzufügen report.checkbox.split.tables=Einnahmen und Ausgaben als getrennte Tabellen report.checkbox.inclue.categorybudgets=Verbrauch nach Kategorien hinzufügen diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties index d40786eecda7078bd25843edf57056ead8476808..99c75ad2ddd9bfbd15b613c55037d111b715cad0 100644 --- a/src/main/resources/languages/base_en.properties +++ b/src/main/resources/languages/base_en.properties @@ -356,7 +356,6 @@ about.credits=Credits: # REPORT report.settings=Settings report.columns=Select columns -report.columns.advice=Note: You can change the order of the columns by drag&drop. report.checkbox.include.budget=Include budget calculation report.checkbox.split.tables=Split incomes and payments into separate tables report.checkbox.inclue.categorybudgets=Include consumption by categories diff --git a/src/main/resources/languages/hints_de.properties b/src/main/resources/languages/hints_de.properties index 809066bbdb5276b5cc11cf0cbdbe0265ee4eb160..5f3419b97abfba0713b6fb793febc36b5dcedf87 100644 --- a/src/main/resources/languages/hints_de.properties +++ b/src/main/resources/languages/hints_de.properties @@ -3,3 +3,4 @@ button.hints.reset=Alle Tipps zurücksetzen notification.hints.reset=Alle Tipps zurückgesetzt hint.first.use.teaser=Neu im BudgetMaster? Sieh dir die Einführung an! +hint.report.columns=Hinweis: Du kannst die Reihenfolge der Spalten per Drag&Drop anpassen. diff --git a/src/main/resources/languages/hints_en.properties b/src/main/resources/languages/hints_en.properties index 807b90116586fa800b48cf616ac475536f093916..94ad28725e2590a11ff315c3709586a0917ff160 100644 --- a/src/main/resources/languages/hints_en.properties +++ b/src/main/resources/languages/hints_en.properties @@ -2,4 +2,5 @@ headline.hints=Hints button.hints.reset=Reset all hints notification.hints.reset=All hints reset -hint.first.use.teaser=New to BudgetMaster? Check out the first use guide! \ No newline at end of file +hint.first.use.teaser=New to BudgetMaster? Check out the first use guide! +hint.report.columns=Note: You can change the order of the columns by drag&drop. \ No newline at end of file diff --git a/src/main/resources/static/css/reports.css b/src/main/resources/static/css/reports.css index f3dc35b785ce43af4ae9bc6a775b663c746c62b2..23a2fc8bfdfc7f7d1a904d7b0688f899a0121f0b 100644 --- a/src/main/resources/static/css/reports.css +++ b/src/main/resources/static/css/reports.css @@ -36,24 +36,6 @@ color: #878787; } -.table-advice { - width: auto; - margin: 1vmin; - border: 2px solid var(--color-text); - border-radius: 5px; - padding: 0 1vmin; - display: inline-block; -} - -.table-advice td { - padding: 10px; - font-size: 1.5vmin; -} - -.table-advice i { - font-size: 2.5vmin; -} - .columnName-selected { background-color: var(--color-blue-light); } diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl index 19a42f6a3f42741b0f4c732e8f7668d7cee13c6a..b5fd9e2483f41a3289071023b068af93c11175b1 100644 --- a/src/main/resources/templates/reports/reports.ftl +++ b/src/main/resources/templates/reports/reports.ftl @@ -69,12 +69,9 @@ <div class="row no-margin"> <div class="col s12 center-align"> <div class="headline-small text-default">${locale.getString("report.columns")}</div> - <table class="no-border-table table-advice"> - <tr> - <td><i class="material-icons">info_outline</i></td> - <td>${locale.getString("report.columns.advice")}</td> - </tr> - </table> + <br> + <#assign hint=helpers.getHintByLocalizationKey("hint.report.columns")/> + <@header.hint hint=hint/> </div> </div> <div class="row">