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

Fixed #454 - hotkeys; added manual

parent a30cb532
Branches
Tags
No related merge requests found
Pipeline #1916 failed
package de.deadlocker8.budgetmaster.controller;
import de.deadlocker8.budgetmaster.settings.SettingsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
public class HotKeysController extends BaseController
{
private final SettingsService settingsService;
@Autowired
public HotKeysController(SettingsService settingsService)
{
this.settingsService = settingsService;
}
@RequestMapping("/hotkeys")
public String index(Model model)
{
model.addAttribute("settings", settingsService.getSettings());
return "hotkeys";
}
}
\ No newline at end of file
......@@ -91,6 +91,7 @@ info.button.account.delete=Konto und Buchungen l
info.title.transaction.delete=Buchung lschen
info.text.transaction.delete=Mchtest du die Buchung "{0}" wirklich unwiderruflich lschen?
info.text.transaction.repeating.delete=Mchtest du die Buchung "{0}" wirklich unwiderruflich lschen? <br>Hinweis: Es handelt sich um eine wiederholende Buchung. Beim Lschen dieser Buchung werden alle zugehrigen Wiederholungen ebenfalls gelscht!
info.title.database.delete=Datenbank lschen
info.header.text.database.delete=Soll die Datenbank wirklich unwiderruflich gelscht werden?<br>Hinweis: Beim Lschen der Datenbank werden alle Buchungen, Kategorien und Konten unwiderruflich gelscht.
info.text.database.delete=Zur Besttigung gib folgenden Code ein:\t{0}
......@@ -135,6 +136,7 @@ menu.reports=Berichte
menu.settings=Einstellungen
menu.settings.database=Datenbank
menu.about=ber
menu.hotkeys=Tastenkombination
menu.logout=Logout
menu.accounts=Konten
menu.update=Update verfgbar
......@@ -304,3 +306,15 @@ home.menu.categories.action.new=Neue Kategorie anlegen
home.menu.settings=Verwalte allgemeine Einstellungen wie dein Login-Passwort, deine bevorzugte Sprache und wie Updates verwaltet werden sollen. Dieser Bereich bietet zudem die Mglichkeit, deine Daten zu exportieren oder zu lschen, sowie eine bestehende Datenbank zu importieren.
home.menu.settings.action.manage=Einstellungen
# hotkeys
hotkeys.transactions.new.normal=Neue Buchung anlegen
hotkeys.transactions.new.normal.key=n
hotkeys.transactions.new.repeating=Neue widerholende Buchung anlegen
hotkeys.transactions.new.repeating.key=r
hotkeys.transactions.new.transfer=Neue Umbuchung anlegen
hotkeys.transactions.new.transfer.key=t
hotkeys.transactions.filter=Filtern
hotkeys.transactions.filter.key=f
hotkeys.search=Suchen
hotkeys.search.key=s
......@@ -135,6 +135,7 @@ menu.charts.chartHistogram=Histogram
menu.reports=Reports
menu.settings=Settings
menu.settings.database=Database
menu.hotkeys=Hotkeys
menu.about=About
menu.logout=Logout
menu.accounts=Accounts
......@@ -306,5 +307,14 @@ home.menu.categories.action.new=Create a category
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.
home.menu.settings.action.manage=Settings
# hotkeys
hotkeys.transactions.new.normal=Create a transaction
hotkeys.transactions.new.normal.key=n
hotkeys.transactions.new.repeating=Create a recuring transaction
hotkeys.transactions.new.repeating.key=r
hotkeys.transactions.new.transfer=Create a transfer
hotkeys.transactions.new.transfer.key=t
hotkeys.transactions.filter=Filter
hotkeys.transactions.filter.key=f
hotkeys.search=Search
hotkeys.search.key=s
.keyboard-key {
padding: 0.2rem 0.7rem;
color: #FFFFFF;
background-color: #212121;
border-radius: .2rem;
font-family: Consolas, "Courier New", monospace;
display: inline-block;
margin-right: 2rem;
}
\ No newline at end of file
.keyboard-key {
padding: 0.2rem 0.7rem;
color: #FFFFFF;
background-color: #212121;
border-radius: .2rem;
font-family: Consolas, "Courier New", monospace;
display: inline-block;
margin-right: 2rem;
}
\ No newline at end of file
......@@ -24,6 +24,7 @@
<@itemWithIcon "settings", "/settings", locale.getString("menu.settings"), "settings", "budgetmaster-red", activeID/>
<@itemDivider/>
<@itemWithIcon "hotkeys", "/hotkeys", locale.getString("menu.hotkeys"), "keyboard", "budgetmaster-grey", activeID/>
<@itemWithIcon "about", "/about", locale.getString("menu.about"), "info", "budgetmaster-grey", activeID/>
<@itemDivider/>
......
<html>
<head>
<#import "helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "hotkeys"/>
</head>
<body class="budgetmaster-blue-light">
<#import "helpers/navbar.ftl" as navbar>
<@navbar.navbar "hotkeys" settings/>
<main>
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
<div class="headline">${locale.getString("menu.hotkeys")}</div>
</div>
</div>
<br>
<div class="row">
<@cellKey locale.getString("hotkeys.transactions.new.normal.key")/>
<div class="col s8 m5 l5">${locale.getString("hotkeys.transactions.new.normal")}</div>
</div>
<div class="row">
<@cellKey locale.getString("hotkeys.transactions.new.repeating.key")/>
<div class="col s8 m5 l5">${locale.getString("hotkeys.transactions.new.repeating")}</div>
</div>
<div class="row">
<@cellKey locale.getString("hotkeys.transactions.new.transfer.key")/>
<div class="col s8 m5 l5">${locale.getString("hotkeys.transactions.new.transfer")}</div>
</div>
<div class="row">
<@cellKey locale.getString("hotkeys.transactions.filter.key")/>
<div class="col s8 m5 l5">${locale.getString("hotkeys.transactions.filter")}</div>
</div>
<div class="row">
<@cellKey locale.getString("hotkeys.search.key")/>
<div class="col s8 m5 l5">${locale.getString("hotkeys.search")}</div>
</div>
</div>
</main>
<!-- Scripts-->
<#import "helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
</body>
</html>
<#macro cellKey key>
<div class="col s4 m3 offset-m2 l2 offset-l3 right-align bold">
<div class="keyboard-key">${key}</div>
</div>
</#macro>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment