diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties index 59bc783a414882ad8ec5e0d6a39345e39bf46f40..a3813231d5bd06304e49c099b731c23c26bc43cd 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 707179352119d1082eb51495203a15e3434183e8..1e875bf88e21c97514c2b926512ad856cb0355a3 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 82ea278531de25ca236d1a5fdd9bc551a20357aa..2226e3b12cc908595de2b5ac55d1a3a3a1b2d2d1 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 82ea278531de25ca236d1a5fdd9bc551a20357aa..2226e3b12cc908595de2b5ac55d1a3a3a1b2d2d1 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 b4d2fbc2ec021d79924cd13eba92d841872c8ccf..5126e551f7059db810887e9a9eb56254b634e9a2 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