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

#274 - show account in results

parent 3902e531
No related branches found
No related tags found
No related merge requests found
......@@ -15,11 +15,11 @@
}
.pagination li a {
color: #FFFFFF;
color: #212121;
}
.pagination li.active {
background-color: #212121;
background-color: #2E79B9;
}
.page-link:hover {
......
......@@ -39,12 +39,13 @@
${dateService.getDateStringWithoutYear(transaction.date)}
</div>
<@transactionsMacros.transactionType transaction/>
<@transactionsMacros.transactionAccount transaction/>
<@transactionsMacros.transactionLinks transaction/>
</div>
<div class="row valign-wrapper no-margin-bottom">
<@transactionsMacros.transactionCategory transaction "center-align"/>
<@transactionsMacros.transactionNameAndDescription transaction/>
<@transactionsMacros.transactionAmount transaction transaction.getAccount()/>
<@transactionsMacros.transactionNameAndDescription transaction "s5"/>
<@transactionsMacros.transactionAmount transaction transaction.getAccount() "s4"/>
</div>
</div>
<div class="hide-on-med-and-down">
......@@ -54,8 +55,9 @@
</div>
<@transactionsMacros.transactionCategory transaction "left-align"/>
<@transactionsMacros.transactionType transaction/>
<@transactionsMacros.transactionNameAndDescription transaction/>
<@transactionsMacros.transactionAmount transaction transaction.getAccount()/>
<@transactionsMacros.transactionAccount transaction/>
<@transactionsMacros.transactionNameAndDescription transaction "l3 xl4"/>
<@transactionsMacros.transactionAmount transaction transaction.getAccount() "l2 xl2"/>
<@transactionsMacros.transactionLinks transaction/>
</div>
</div>
......
......@@ -62,8 +62,8 @@
</div>
<div class="row valign-wrapper transaction-row-bottom">
<@transactionsMacros.transactionCategory transaction "center-align"/>
<@transactionsMacros.transactionNameAndDescription transaction/>
<@transactionsMacros.transactionAmount transaction account/>
<@transactionsMacros.transactionNameAndDescription transaction "s5"/>
<@transactionsMacros.transactionAmount transaction account "s4"/>
</div>
</div>
<div class="hide-on-med-and-down transaction-row-top transaction-row-bottom <#if shouldHighlight>budgetmaster-blue-light</#if>">
......@@ -73,8 +73,8 @@
</div>
<@transactionsMacros.transactionCategory transaction "left-align"/>
<@transactionsMacros.transactionType transaction/>
<@transactionsMacros.transactionNameAndDescription transaction/>
<@transactionsMacros.transactionAmount transaction account/>
<@transactionsMacros.transactionNameAndDescription transaction "l4 xl5"/>
<@transactionsMacros.transactionAmount transaction account "l3 xl3"/>
<@transactionsMacros.transactionButtons transaction/>
</div>
</div>
......
......@@ -31,8 +31,8 @@
</div>
</#macro>
<#macro transactionNameAndDescription transaction>
<div class="col s5 l4 xl5">
<#macro transactionNameAndDescription transaction size>
<div class="col ${size}">
<div class="truncate transaction-text">${transaction.name}</div>
<div class="hide-on-med-and-down">
<#if transaction.description??>
......@@ -42,12 +42,12 @@
</div>
</#macro>
<#macro transactionAmount transaction account>
<#macro transactionAmount transaction account size>
<#assign amount = helpers.getAmount(transaction, account)/>
<#if amount <= 0>
<div class="col s4 l3 xl3 bold ${redTextColor} no-wrap right-align transaction-text">${helpers.getCurrencyString(amount)}</div>
<div class="col ${size} bold ${redTextColor} no-wrap right-align transaction-text">${helpers.getCurrencyString(amount)}</div>
<#else>
<div class="col s4 l3 xl3 bold ${greenTextColor} no-wrap right-align transaction-text">${helpers.getCurrencyString(amount)}</div>
<div class="col ${size} bold ${greenTextColor} no-wrap right-align transaction-text">${helpers.getCurrencyString(amount)}</div>
</#if>
</#macro>
......@@ -60,8 +60,14 @@
</div>
</#macro>
<#macro transactionAccount transaction>
<div class="col s4 l2 xl2 truncate">
${transaction.getAccount().getName()}
</div>
</#macro>
<#macro transactionLinks transaction>
<div class="col s8 l2 xl1 right-align transaction-buttons no-wrap">
<div class="col s4 l2 xl1 right-align transaction-buttons no-wrap">
<a href="<@s.url '/transactions/${transaction.ID?c}/highlight'/>" class="btn-flat no-padding text-color"><i class="material-icons left">open_in_new</i></a>
<a href="<@s.url '/transactions/${transaction.ID?c}/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">edit</i></a>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment