diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java index 7fcd4d31427cff363fa90f60ce0b94eefa46ddda..93855167e335a15706e2b216a9cede6afbb663dc 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java @@ -23,7 +23,7 @@ public class ChartController extends BaseController this.settingsService = settingsService; } - @RequestMapping("/charts/edit") + @RequestMapping("/charts/chartList") public String chartList(Model model) { model.addAttribute("charts", chartService.getRepository().findAllByOrderByNameAsc()); diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties index e06059a98c0caa60e206f03afe6587303b3ccb8e..fa769b6607687a83f5cadf2089fccf5bd575b915 100644 --- a/src/main/resources/languages/_de.properties +++ b/src/main/resources/languages/_de.properties @@ -292,7 +292,9 @@ home.menu.transactions=Buchungen sind das zentrale Element von BudgetMaster. Gib home.menu.transactions.action.manage=Buchungsverwaltung home.menu.transactions.action.new=Neue Buchung anlegen -home.menu.charts=Diese Funktion wird in einer kommenden Version verf�gbar sein. +home.menu.charts=Visualisiere deine Daten in verschiedenen Diagrammen. Nutze die mitgelieferten Diagrammtypen oder definiere deine eigenen Diagramme. +home.menu.charts.action.manage=Diagrammverwaltung +home.menu.charts.action.show=Diagramm ansehen home.menu.reports=Erstelle konfigurierbare Monatsberichte als PDF zum Ausdrucken und Archivieren. Du kannst den Inhalt der Berichte filtern und zum Beispiel nach Einnahmen und Ausgaben getrennt auflisten lassen. home.menu.reports.action.new=Neuen Bericht erstellen diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties index 3ec43f10d079db5e43aaafcc5cd7c8d6ff7d0734..f8289593cf1e42bb91a36ec8aa5087239db5bfcb 100644 --- a/src/main/resources/languages/_en.properties +++ b/src/main/resources/languages/_en.properties @@ -292,7 +292,9 @@ home.menu.transactions=Transactions are the key element of BudgetMaster. Give th home.menu.transactions.action.manage=Manage transactions home.menu.transactions.action.new=Create a transaction -home.menu.charts=This feature will be available in an upcoming release. +home.menu.charts=Visualize your data by using charts. You can choose an included default chart or define your own. +home.menu.charts.action.manage=Manage charts +home.menu.charts.action.show=Show chart home.menu.reports=Create configurable month reports in PDF format for printing and archiving. You can filter the content of the reports and, for example, list them separately to incomes and expenditures. home.menu.reports.action.new=Create a report diff --git a/src/main/resources/templates/helpers/navbar.ftl b/src/main/resources/templates/helpers/navbar.ftl index f9bdea7efb25cfd9650ecf1b58f79f00bd43761f..66e5813147cda79130d5763df4a9cbadbaeb4cc0 100644 --- a/src/main/resources/templates/helpers/navbar.ftl +++ b/src/main/resources/templates/helpers/navbar.ftl @@ -10,15 +10,7 @@ <@itemDivider/> <@itemWithIcon "home", "/", locale.getString("menu.home"), "home", "budgetmaster-blue", activeID/> <@itemWithIcon "transactions", "/transactions", locale.getString("menu.transactions"), "list", "budgetmaster-baby-blue", activeID/> - <@subListStart "chart" locale.getString("menu.charts"), "show_chart" "budgetmaster-purple", activeID/> - <#-- disabled until future versions --> - <#--<@itemPlain "chartCategories", "", locale.getString("menu.charts.chartCategories"), activeID/>--> - <#--<@itemPlain "chartMonth", "", locale.getString("menu.charts.chartMonth"), activeID/>--> - <#--<@itemPlain "chartTags", "", locale.getString("menu.charts.chartTags"), activeID/>--> - <#--<@itemPlain "chartCategoryBudget", "", locale.getString("menu.charts.chartCategoryBudget"), activeID/>--> - <#--<@itemPlain "chartHistogram", "", locale.getString("menu.charts.chartHistogram"), activeID/>--> - <@subListEnd/> - + <@itemWithIcon "charts" "/charts" locale.getString("menu.charts"), "show_chart" "budgetmaster-purple", activeID/> <@itemWithIcon "reports", "/reports", locale.getString("menu.reports"), "description", "budgetmaster-green", activeID/> <@itemWithIcon "categories", "/categories", locale.getString("menu.categories"), "label", "budgetmaster-orange", activeID/> <@itemWithIcon "settings", "/settings", locale.getString("menu.settings"), "settings", "budgetmaster-red", activeID/> @@ -141,27 +133,6 @@ <li><a class="waves-effect budgetmaster-red budgetmaster-text-update"><i class="material-icons" id="icon-update">${icon}</i>${text}</a></li> </#macro> -<#macro subListStart ID text icon activeColor activeID> -<li> - <ul class="collapsible collapsible-accordion no-padding sidenav-sub home-menu-disabled"> - <li> - <#if activeID?starts_with(ID)> - <a href="<@s.url '/charts'/>" class="collapsible-header no-padding active"><div class="stripe ${activeColor}"></div><i class="material-icons">${icon}</i>${text}</a> - <#else> - <a href="<@s.url '/charts'/>" class="collapsible-header nav-padding"><i class="material-icons">${icon}</i>${text}</a> - </#if> - <div class="collapsible-body"> - <ul class="sidenav-sub"> -</#macro> - -<#macro subListEnd> - </ul> - </div> - </li> - </ul> -</li> -</#macro> - <#macro backupReminder settings> <#if settings.needToShowBackupReminder()> <div id="modalBackupReminder" class="modal background-color"> diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl index 42ab4b7afec06917691fedbb8409dfa6cb3394ff..3bccf68b849a0dea9129e46846b680910f84bed9 100644 --- a/src/main/resources/templates/index.ftl +++ b/src/main/resources/templates/index.ftl @@ -48,12 +48,17 @@ </div> <div class="row home-menu-flex"> </div> - <div class="col s12 m6 l4 home-menu-cell home-menu-disabled"> - <a class="home-menu-link btn-flat budget"> + <div class="col s12 m6 l4 home-menu-cell"> + <a href="<@s.url '/charts'/>" class="home-menu-link btn-flat budget"> <i class="material-icons icon-budget left budgetmaster-purple-text">show_chart</i> ${locale.getString("menu.charts")} </a> - <p class="home-menu-text">${locale.getString("home.menu.charts")}</p> + <p class="text-grey home-menu-text">${locale.getString("home.menu.charts")}</p> + <div class="left-align"> + <a href="<@s.url '/charts/chartList'/>" class="waves-effect btn-flat home-menu-link-item"><i class="material-icons left">play_arrow</i>${locale.getString("home.menu.charts.action.manage")}</a> + <a href="<@s.url '/charts'/>" class="waves-effect btn-flat home-menu-link-item"><i class="material-icons left">play_arrow</i>${locale.getString("home.menu.charts.action.show")}</a> + </div> + </div> <div class="hide-on-med-only"> </div>