From 3890204d0090c1b1e40be7fef0f39ef115fd5aac Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sun, 17 Jun 2018 16:07:29 +0200 Subject: [PATCH] #307 - corrected style of disabled links; localized texts --- src/main/resources/languages/_de.properties | 8 ++++++++ src/main/resources/languages/_en.properties | 10 +++++++++- src/main/resources/static/css/style.css | 8 ++++---- src/main/resources/templates/index.ftl | 12 ++++++------ 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties index 8b473187b..d1ab71166 100644 --- a/src/main/resources/languages/_de.properties +++ b/src/main/resources/languages/_de.properties @@ -392,3 +392,11 @@ about.author=Autor: about.roadmap=Roadmap: about.sourcecode=Quellcode: about.credits=Credits: + +# home menu +home.menu.accounts=Konten erlauben es mehrere Buchungen zu gruppieren. Du kannst so viele Konten erstellen, wie du m�chtest. Zum Erstellen, Aktualisieren oder L�schen von Accounts klicke hier. +home.menu.payments=Buchungen sind das zentrale Element von BudgetMaster. Gib ihnen einen Namen und eine Beschreibung, weise ihnen eine Kategorie und ein Konto zu, konfiguriere sie als wiederholend und markiere sie mit Tags. Um Buchungen zu erstellen, zu bearbeiten oder zu l�schen einfach hier klicken. +home.menu.charts=Diese Funktion wird in einer kommenden Version verf�gbar sein. +home.menu.reports=Diese Funktion wird in einer kommenden Version verf�gbar sein. +home.menu.categories=Kategorien k�nnen Buchungen zugeordnet werden, um diese als zusammengeh�rig zu kennzeichnen. Eine Kategorie besteht aus einem Namen und einer Farbe. Letztere kann aus einer vordefinierten Farbpalette oder mit Hilfe eines benutzerdefinierten Farbw�hlers ausgew�hlt werden. Erstelle, aktualisiere und l�sche Kategorien, indem du hier klickst. +home.menu.settings=Verwalte allgemeine Einstellungen wie dein Login-Passwort, deine bevorzugte Sprache und wie Updates verwaltet werden sollen. Dieser Bereich bietet zudem die M�glichkeit, deine Daten zu exportieren oder zu l�schen, sowie eine bestehende Datenbank zu importieren. diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties index ad840213b..16f798a29 100644 --- a/src/main/resources/languages/_en.properties +++ b/src/main/resources/languages/_en.properties @@ -391,4 +391,12 @@ about.date=Date: about.author=Author: about.roadmap=Roadmap: about.sourcecode=Sourcecode: -about.credits=Credits: \ No newline at end of file +about.credits=Credits: + +# home menu +home.menu.accounts=Accounts allow you to group multiple payments. You can create as many accounts as you want. Create, update and delete them by clicking here. +home.menu.payments=Payments are the key element of BudgetMaster. Give them a name and description, assign a category and account to them, configure them as recurring, and mark them with tags. You can create, edit and delete them by clicking here. +home.menu.charts=This feature will be available in an upcoming release. +home.menu.reports=This feature will be available in an upcoming release. +home.menu.categories=Categories can be assigned to payments in order to mark them as belonging together. They consists of a name an a color. Latter can be chosen from a predefined color palette or by using a custom color picker. Create, update and delete categories by clicking here. +home.menu.settings=Manage general settings such as login password, your preferred language and how to handle updates. This section also offers the possibility to export or delete your data or importing an existing database. diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 807f3c2d6..53f7d11c3 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -372,14 +372,14 @@ input[type="radio"]:checked + label::after, [type="radio"].with-gap:checked + la background-color: #EEEEEE; } -.home-menu-disabled * { - color: #AAAAAA !important; -} - .home-menu-link { display: inline-block; } +.home-menu-disabled * { + color: #AAAAAA !important; +} + .hidden { display: none; } diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl index 42b511fc9..f8bd3905a 100644 --- a/src/main/resources/templates/index.ftl +++ b/src/main/resources/templates/index.ftl @@ -26,21 +26,21 @@ <a href="/accounts" class="home-menu-link budgetmaster-text-black"> <h1 class="center budgetmaster-grey-text"><i class="material-icons icon-budget">account_balance</i></h1> <h3 class="center budget">${locale.getString("menu.accounts")}</h3> - <p class="grey-text text-darken-1">Accounts allow you to group multiple payments. You can create as many accounts as you want. Create, update and delete them by clicking here.</p> + <p class="grey-text text-darken-1">${locale.getString("home.menu.accounts")}</p> </a> </div> <div class="col s12 m4 center-align home-menu-cell"> <a href="/payments" class="home-menu-link budgetmaster-text-black"> <h1 class="center budgetmaster-baby-blue-text"><i class="material-icons icon-budget">list</i></h1> <h3 class="center budget">${locale.getString("menu.payments")}</h3> - <p class="grey-text text-darken-1">Payments are the key element of BudgetMaster. Give them a name and description, assign a category and account to them, configure them as recurring, and mark them with tags. You can create, edit and delete them by clicking here.</p> + <p class="grey-text text-darken-1">${locale.getString("home.menu.payments")}</p> </a> </div> <div class="col s12 m4 center-align home-menu-cell"> <a class="home-menu-link budgetmaster-text-black home-menu-disabled"> <h1 class="center budgetmaster-purple-text"><i class="material-icons icon-budget">show_chart</i></h1> <h3 class="center budget">${locale.getString("menu.charts")}</h3> - <p class="grey-text text-darken-1">This feature will be available in an upcoming release.</p> + <p class="home-menu-disabled ">${locale.getString("home.menu.charts")}</p> </a> </div> </div> @@ -49,21 +49,21 @@ <a class="home-menu-link budgetmaster-text-black home-menu-disabled"> <h1 class="center budgetmaster-green-text"><i class="material-icons icon-budget">description</i></h1> <h3 class="center budget">${locale.getString("menu.reports")}</h3> - <p class="grey-text text-darken-1">This feature will be available in an upcoming release.</p> + <p class="home-menu-disabled ">${locale.getString("home.menu.reports")}</p> </a> </div> <div class="col s12 m4 center-align home-menu-cell"> <a href="/categories" class="home-menu-link budgetmaster-text-black"> <h1 class="center budgetmaster-orange-text"><i class="material-icons icon-budget">label</i></h1> <h3 class="center budget">${locale.getString("menu.categories")}</h3> - <p class="grey-text text-darken-1">Categories can be assigned to payments in order to mark them as belonging together. They consists of a name an a color. Latter can be chosen from a predefined color palette or by using a custom color picker. Create, update and delete categories by clicking here.</p> + <p class="grey-text text-darken-1">${locale.getString("home.menu.categories")}</p> </a> </div> <div class="col s12 m4 center-align home-menu-cell"> <a href="/settings" class="home-menu-link budgetmaster-text-black"> <h1 class="center budgetmaster-red-text"><i class="material-icons icon-budget">settings</i></h1> <h3 class="center budget">${locale.getString("menu.settings")}</h3> - <p class="grey-text text-darken-1">Manage general settings such as login password, your preferred language and how to handle updates. This section also offers the possibility to export or delete your data or importing an existing database.</p> + <p class="grey-text text-darken-1">${locale.getString("home.menu.settings")}</p> </a> </div> </div> -- GitLab