Skip to content
Snippets Groups Projects
Commit abbf907d authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#626 - converted report column hint to new macro

parent dac2b582
No related branches found
No related tags found
No related merge requests found
...@@ -54,7 +54,7 @@ public class HintService implements Resettable ...@@ -54,7 +54,7 @@ public class HintService implements Resettable
@Override @Override
public void createDefaults() 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) for(String localizationKey : hintKeys)
{ {
......
...@@ -355,7 +355,6 @@ about.credits=Credits: ...@@ -355,7 +355,6 @@ about.credits=Credits:
# REPORT # REPORT
report.settings=Einstellungen report.settings=Einstellungen
report.columns=Spalten auswählen 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.include.budget=Budgetkalkulation hinzufügen
report.checkbox.split.tables=Einnahmen und Ausgaben als getrennte Tabellen report.checkbox.split.tables=Einnahmen und Ausgaben als getrennte Tabellen
report.checkbox.inclue.categorybudgets=Verbrauch nach Kategorien hinzufügen report.checkbox.inclue.categorybudgets=Verbrauch nach Kategorien hinzufügen
......
...@@ -356,7 +356,6 @@ about.credits=Credits: ...@@ -356,7 +356,6 @@ about.credits=Credits:
# REPORT # REPORT
report.settings=Settings report.settings=Settings
report.columns=Select columns 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.include.budget=Include budget calculation
report.checkbox.split.tables=Split incomes and payments into separate tables report.checkbox.split.tables=Split incomes and payments into separate tables
report.checkbox.inclue.categorybudgets=Include consumption by categories report.checkbox.inclue.categorybudgets=Include consumption by categories
......
...@@ -3,3 +3,4 @@ button.hints.reset=Alle Tipps zurücksetzen ...@@ -3,3 +3,4 @@ button.hints.reset=Alle Tipps zurücksetzen
notification.hints.reset=Alle Tipps zurückgesetzt notification.hints.reset=Alle Tipps zurückgesetzt
hint.first.use.teaser=Neu im BudgetMaster? Sieh dir die Einführung an! 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.
...@@ -3,3 +3,4 @@ button.hints.reset=Reset all hints ...@@ -3,3 +3,4 @@ button.hints.reset=Reset all hints
notification.hints.reset=All hints reset notification.hints.reset=All hints reset
hint.first.use.teaser=New to BudgetMaster? Check out the first use guide! 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
...@@ -36,24 +36,6 @@ ...@@ -36,24 +36,6 @@
color: #878787; 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 { .columnName-selected {
background-color: var(--color-blue-light); background-color: var(--color-blue-light);
} }
......
...@@ -69,12 +69,9 @@ ...@@ -69,12 +69,9 @@
<div class="row no-margin"> <div class="row no-margin">
<div class="col s12 center-align"> <div class="col s12 center-align">
<div class="headline-small text-default">${locale.getString("report.columns")}</div> <div class="headline-small text-default">${locale.getString("report.columns")}</div>
<table class="no-border-table table-advice"> <br>
<tr> <#assign hint=helpers.getHintByLocalizationKey("hint.report.columns")/>
<td><i class="material-icons">info_outline</i></td> <@header.hint hint=hint/>
<td>${locale.getString("report.columns.advice")}</td>
</tr>
</table>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment