From f7a3f3ad2c98b5186715c5f62e61978c04cddcd1 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 26 Aug 2020 22:09:43 +0200
Subject: [PATCH] #540 - added hotkey to hotkey overview
---
src/main/resources/languages/_de.properties | 3 +++
src/main/resources/languages/_en.properties | 3 +++
src/main/resources/static/css/dark/hotkeys.css | 4 ++++
src/main/resources/static/css/hotkeys.css | 4 ++++
src/main/resources/templates/hotkeys.ftl | 12 ++++++++++++
5 files changed, 26 insertions(+)
diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index 59bc783a4..a3813231d 100644
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -355,6 +355,9 @@ hotkeys.transactions.new.transfer=Neue Umbuchung anlegen
hotkeys.transactions.new.transfer.key=t
hotkeys.transactions.new.template=Neue Buchung aus Vorlage anlegen
hotkeys.transactions.new.template.key=v
+hotkeys.transactions.save.modifier=Strg
+hotkeys.transactions.save.key=Enter
+hotkeys.transactions.save=Buchung speichern (Beim Anlegen/Editieren einer Buchung)
hotkeys.transactions.filter=Filtern
hotkeys.transactions.filter.key=f
hotkeys.search=Suchen
diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties
index 707179352..1e875bf88 100644
--- a/src/main/resources/languages/_en.properties
+++ b/src/main/resources/languages/_en.properties
@@ -355,6 +355,9 @@ hotkeys.transactions.new.transfer=Create a transfer
hotkeys.transactions.new.transfer.key=t
hotkeys.transactions.new.template=Create a transaction from template
hotkeys.transactions.new.template.key=v
+hotkeys.transactions.save.modifier=Ctrl
+hotkeys.transactions.save.key=Enter
+hotkeys.transactions.save=Save transaction (When creating/editing a transaction)
hotkeys.transactions.filter=Filter
hotkeys.transactions.filter.key=f
hotkeys.search=Search
diff --git a/src/main/resources/static/css/dark/hotkeys.css b/src/main/resources/static/css/dark/hotkeys.css
index 82ea27853..2226e3b12 100644
--- a/src/main/resources/static/css/dark/hotkeys.css
+++ b/src/main/resources/static/css/dark/hotkeys.css
@@ -6,4 +6,8 @@
font-family: Consolas, "Courier New", monospace;
display: inline-block;
margin-right: 2rem;
+}
+
+.modifier-key {
+ margin-right: 0;
}
\ No newline at end of file
diff --git a/src/main/resources/static/css/hotkeys.css b/src/main/resources/static/css/hotkeys.css
index 82ea27853..2226e3b12 100644
--- a/src/main/resources/static/css/hotkeys.css
+++ b/src/main/resources/static/css/hotkeys.css
@@ -6,4 +6,8 @@
font-family: Consolas, "Courier New", monospace;
display: inline-block;
margin-right: 2rem;
+}
+
+.modifier-key {
+ margin-right: 0;
}
\ No newline at end of file
diff --git a/src/main/resources/templates/hotkeys.ftl b/src/main/resources/templates/hotkeys.ftl
index b4d2fbc2e..5126e551f 100644
--- a/src/main/resources/templates/hotkeys.ftl
+++ b/src/main/resources/templates/hotkeys.ftl
@@ -34,6 +34,10 @@
<@cellKey locale.getString("hotkeys.transactions.new.template.key")/>
<div class="col s8 m5 l5">${locale.getString("hotkeys.transactions.new.template")}</div>
</div>
+ <div class="row">
+ <@cellKeyWithModifier locale.getString("hotkeys.transactions.save.modifier") locale.getString("hotkeys.transactions.save.key")/>
+ <div class="col s8 m5 l5">${locale.getString("hotkeys.transactions.save")}</div>
+ </div>
<div class="row">
<@cellKey locale.getString("hotkeys.transactions.filter.key")/>
<div class="col s8 m5 l5">${locale.getString("hotkeys.transactions.filter")}</div>
@@ -55,4 +59,12 @@
<div class="col s4 m3 offset-m2 l2 offset-l3 right-align bold">
<div class="keyboard-key">${key}</div>
</div>
+</#macro>
+
+<#macro cellKeyWithModifier modifier key>
+ <div class="col s4 m3 offset-m2 l2 offset-l3 right-align bold">
+ <div class="keyboard-key modifier-key">${modifier}</div>
+ <span class="bold">+</span>
+ <div class="keyboard-key">${key}</div>
+ </div>
</#macro>
\ No newline at end of file
--
GitLab