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

#677 - re-design modal

parent 01654a32
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
......@@ -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>
......
......@@ -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="row">
<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>
<@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 class="row center-align">
<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'/>
</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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment