From a4e6fad1f971c01dffeffe6798de34cb2ebb8ded Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Fri, 22 Jul 2022 23:41:50 +0200 Subject: [PATCH] #677 - re-design modal --- .../resources/languages/base_de.properties | 6 +++--- .../resources/languages/base_en.properties | 6 +++--- .../resources/templates/helpers/header.ftl | 4 ++-- .../transactionNameKeywordWarningModal.ftl | 21 +++++++------------ 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties index 495bb62b1..6e4286cfc 100644 --- a/BudgetMasterServer/src/main/resources/languages/base_de.properties +++ b/BudgetMasterServer/src/main/resources/languages/base_de.properties @@ -81,9 +81,9 @@ transaction.change.type.new=Neuer Buchungstyp transaction.warning.name.keyword.title=Schlüsselwort erkannt transaction.warning.name.keyword.description.part1=Der Titel der Buchung enthält das Schlüsselwort transaction.warning.name.keyword.description.part2=ist jedoch nicht als Einnahme markiert.<br><br>Hast du vielleicht vergessen die Buchung als Einnahme zu markieren? -transaction.warning.name.keyword.button.ignore=Ignorieren und speichern (Buchung ist tatsächlich eine Ausgabe) -transaction.warning.name.keyword.button.cancel=Anpassen (Buchung soll eigentlich eine Einnahme sein) -transaction.warning.name.keyword.button.edit=Schlüsselwörter editieren (ungespeicherte Änderungen gehen verloren) +transaction.warning.name.keyword.button.ignore=Als Ausgabe speichern +transaction.warning.name.keyword.button.cancel=Anpassen +transaction.warning.name.keyword.button.edit=Schlüsselwörter editieren (neuer Tab) template.group.default=Ungruppiert # WEEK DAYS diff --git a/BudgetMasterServer/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties index a1dcfa3ed..5fe07b39d 100644 --- a/BudgetMasterServer/src/main/resources/languages/base_en.properties +++ b/BudgetMasterServer/src/main/resources/languages/base_en.properties @@ -82,9 +82,9 @@ transaction.change.type.new=New type transaction.warning.name.keyword.title=Keyword detected transaction.warning.name.keyword.description.part1=The transaction tile contains the keyword transaction.warning.name.keyword.description.part2=but is not marked as income.<br><br>Did you possibly forget to mark the transaction as income? -transaction.warning.name.keyword.button.ignore=Ignore and save (transaction is actually an expenditure) -transaction.warning.name.keyword.button.cancel=Edit (Transaction should actually be an income) -transaction.warning.name.keyword.button.edit=Edit keywords (unsaved changes will be lost) +transaction.warning.name.keyword.button.ignore=Save as expenditure +transaction.warning.name.keyword.button.cancel=Edit +transaction.warning.name.keyword.button.edit=Edit keywords (new tab) template.group.default=Not grouped # WEEK DAYS diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl index 13f00e844..d25b1bb0a 100644 --- a/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl +++ b/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl @@ -120,8 +120,8 @@ </div> </#macro> -<#macro buttonLink url icon localizationKey id="" color="background-blue" classes="" isDataUrl=false noUrl=false disabled=false> - <a <#if !isDataUrl && !noUrl>href="<@s.url url/>"</#if> +<#macro buttonLink url icon localizationKey id="" color="background-blue" classes="" isDataUrl=false noUrl=false disabled=false target=""> + <a <#if target??>target="${target}"</#if> <#if !isDataUrl && !noUrl>href="<@s.url url/>"</#if> id="${id}" class="waves-effect waves-light btn ${color} ${classes}" <#if isDataUrl>data-url="${url}"</#if> diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactionNameKeywordWarningModal.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactionNameKeywordWarningModal.ftl index 3ec5be4ee..06d14e0c0 100644 --- a/BudgetMasterServer/src/main/resources/templates/transactions/transactionNameKeywordWarningModal.ftl +++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactionNameKeywordWarningModal.ftl @@ -14,22 +14,15 @@ </div> </div> - <br> - - <div class="row center-align"> - <div class="col s12"> - <@header.buttonLink id='keyword-warning-button-ignore' url='' icon='save' localizationKey='transaction.warning.name.keyword.button.ignore' color='red' classes='text-white' noUrl=true/> - </div> - </div> - <div class="row center-align"> - <div class="col s12"> - <@header.buttonLink url='' icon='edit' localizationKey='transaction.warning.name.keyword.button.cancel' color='green' id='buttonChangeTransactionType' classes='modal-action modal-close text-white' noUrl=true/> - </div> - </div> - <div class="row center-align"> + <div class="row"> <div class="col s12"> - <@header.buttonLink url='/settings' icon='rule_folder' localizationKey='transaction.warning.name.keyword.button.edit' color='blue' id='buttonChangeTransactionType' classes='text-white'/> + <@header.buttonLink url='/settings' icon='rule_folder' localizationKey='transaction.warning.name.keyword.button.edit' color='background-blue' id='buttonChangeTransactionType' classes='text-white' target='_blank'/> </div> </div> </div> + + <div class="modal-footer background-color"> + <@header.buttonLink id='keyword-warning-button-ignore' url='' icon='save' localizationKey='transaction.warning.name.keyword.button.ignore' color='red' classes='text-white' noUrl=true/> + <@header.buttonLink url='' icon='edit' localizationKey='transaction.warning.name.keyword.button.cancel' color='green' id='buttonChangeTransactionType' classes='modal-action modal-close text-white' noUrl=true/> + </div> </div> -- GitLab