#677 - optimized modal content

BudgetMasterServer/src/main/resources/languages/base_de.properties

@@ -78,12 +78,12 @@ save.as.template.errorsInForm=Vorlage konnte nicht erstellt werden, da Fehler im
 transaction.change.type=Buchungstyp ändern
 transaction.change.type.warning=Hinweis: Nicht gespeicherte Änderungen gehen verloren!
 transaction.change.type.new=Neuer Buchungstyp
-transaction.warning.name.keyword.title=Schlüsselwort erkannt
+transaction.warning.name.keyword.title=Buchung wirklich als Ausgabe speichern?
 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=Als Ausgabe speichern
-transaction.warning.name.keyword.button.cancel=Anpassen
-transaction.warning.name.keyword.button.edit=Schlüsselwörter editieren (neuer Tab)
+transaction.warning.name.keyword.description.part2=ist jedoch nicht als Einnahme markiert.
+transaction.warning.name.keyword.button.ignore=Ja
+transaction.warning.name.keyword.button.cancel=Abbrechen
+transaction.warning.name.keyword.button.edit=Schlüsselwörter editieren
 template.group.default=Ungruppiert
 
 # WEEK DAYS

BudgetMasterServer/src/main/resources/languages/base_en.properties

@@ -79,12 +79,12 @@ save.as.template.errorsInForm=Template could not be created because errors exist
 transaction.change.type=Change type
 transaction.change.type.warning=Note: Unsaved changes will be lost!
 transaction.change.type.new=New type
-transaction.warning.name.keyword.title=Keyword detected
+transaction.warning.name.keyword.title=Really save transaction as expenditure?
 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=Save as expenditure
-transaction.warning.name.keyword.button.cancel=Edit
-transaction.warning.name.keyword.button.edit=Edit keywords (new tab)
+transaction.warning.name.keyword.description.part2=but is not marked as income.
+transaction.warning.name.keyword.button.ignore=Yes
+transaction.warning.name.keyword.button.cancel=Cancel
+transaction.warning.name.keyword.button.edit=Edit keywords
 template.group.default=Not grouped
 
 # WEEK DAYS

BudgetMasterServer/src/main/resources/static/css/transactions.css

@@ -134,3 +134,7 @@
     border-bottom: 2px solid var(--color-text);
     padding: 0.3rem 0.5rem;
 }
+
+#modalTransactionNameKeywordWarning {
+    width: 40%;
+}
\ No newline at end of file

BudgetMasterServer/src/main/resources/static/js/transactions.js

@@ -386,7 +386,7 @@ function validateForm(isSaveAndContinue = false, allowEmptyAmount = false, skipK
 {
     // name (keyword check)
     let isExpenditureSwitch = document.getElementById('input-isPayment');
-    let isExpenditure = isExpenditureSwitch !== null && isExpenditureSwitch.value === "1";
+    let isExpenditure = isExpenditureSwitch !== null && (isExpenditureSwitch.value === "1" || isExpenditureSwitch.value === "true");
     if(!skipKeywordCheck && isExpenditure)
     {
         let nameContainsKeywords = checkNameForKeywords(isSaveAndContinue);

BudgetMasterServer/src/main/resources/templates/transactions/transactionNameKeywordWarningModal.ftl

@@ -13,16 +13,13 @@
                 ${locale.getString("transaction.warning.name.keyword.description.part2")}
             </div>
         </div>
-
-        <div class="row">
-            <div class="col s12">
-                <@header.buttonLink url='/settings' icon='rule_folder' localizationKey='transaction.warning.name.keyword.button.edit' color='background-blue' 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 id='keyword-warning-button-cancel' url='' icon='edit' localizationKey='transaction.warning.name.keyword.button.cancel' color='green' classes='modal-action modal-close text-white' noUrl=true/>
+        <div class="left">
+            <@header.buttonLink url='/settings' icon='rule_folder' localizationKey='transaction.warning.name.keyword.button.edit' color='background-blue' classes='text-white modal-' target='_blank'/>
+        </div>
+        <@header.buttonLink id='keyword-warning-button-cancel' url='' icon='clear' localizationKey='transaction.warning.name.keyword.button.cancel' color='red' classes='modal-action modal-close text-white' noUrl=true/>
+        <@header.buttonLink id='keyword-warning-button-ignore' url='' icon='save' localizationKey='transaction.warning.name.keyword.button.ignore' color='green' classes='text-white' noUrl=true/>
     </div>
 </div>