IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Optimised some layout things.

Browse Source
This commit is contained in:
James Cole 2015-06-25 17:06:20 +02:00
parent 5160f2c298
commit 04164500c8
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resources/twig/list/accounts.twig
View File

@ -4,12 +4,12 @@
<th data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th>
{% if what == 'asset' %}
<th>{{ trans('list.role') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.role') }}</th>
{% endif %}
<th>{{ trans('list.currentBalance') }}</th>
<th>{{ trans('list.active') }}</th>
<th>{{ trans('list.lastActivity') }}</th>
<th>{{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }}</th>
</tr>
</thead>
<tbody>
@ -23,7 +23,7 @@
</td>
<td><a href="{{route('accounts.show',account.id)}}">{{ account.name }}</a></td>
{% if what == "asset" %}
<td>
<td class="hidden-sm hidden-xs">
{% for entry in account.accountmeta %}
{% if entry.name == 'accountRole' %}
{{ entry.data|getAccountRole }}
@ -32,7 +32,7 @@
</td>
{% endif %}
<td data-value="{{ account|balance }}">{{ account|balance|formatAmount }}</td>
<td data-value="{{account.active}}">
<td class="hidden-sm hidden-xs" data-value="{{account.active}}">
{% if account.active %}
<i class="fa fa-fw fa-check"></i>
{% else %}
@ -40,15 +40,15 @@
{% endif %}
</td>
{% if account.lastActivityDate %}
<td data-value="{{ account.lastActivityDate.format('U') }} ">
<td class="hidden-sm hidden-xs" data-value="{{ account.lastActivityDate.format('U') }} ">
{{ account.lastActivityDate.formatLocalized(monthAndDayFormat) }}
</td>
{% else %}
<td data-value="0">
<td class="hidden-sm hidden-xs" data-value="0">
<em>Never</em>
</td>
{% endif %}
<td data-value="{{account.endBalance - account.startBalance}}">
<td class="hidden-sm hidden-xs" data-value="{{account.endBalance - account.startBalance}}">
{{ (account.endBalance - account.startBalance)|formatAmount }}
</td>

28
resources/twig/list/bills.twig
View File

@ -3,13 +3,13 @@
<tr>
<th data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th>
<th>{{ trans('list.matchesOn') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.matchesOn') }}</th>
<th colspan="2">{{ trans('list.matchingAmount') }}</th>
<th>{{ trans('list.lastMatch') }}</th>
<th>{{ trans('list.expectedMatch') }}</th>
<th>{{ trans('list.active') }}</th>
<th>{{ trans('list.automatch') }}</th>
<th>{{ trans('list.repeat_freq') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.lastMatch') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.expectedMatch') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.automatch') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>
</tr></thead>
<tbody>
{% for entry in bills %}
@ -23,7 +23,7 @@
<td>
<a href="{{route('bills.show',entry.id)}}" title="{{ entry.name }}">{{ entry.name }}</a>
</td>
<td data-value="{{ entry.match }}">
<td class="hidden-sm hidden-xs" data-value="{{ entry.match }}">
{% for match in entry.match|split(',') %}
<span class="label label-info">{{ match }}</span>
{% endfor %}
@ -35,40 +35,40 @@
{{ entry.amount_max|formatAmount }}
</td>
{% if entry.lastFoundMatch %}
<td data-value="{{ entry.lastFoundMatch.format('U') }}">
<td class="hidden-sm hidden-xs" data-value="{{ entry.lastFoundMatch.format('U') }}">
{{entry.lastFoundMatch.formatLocalized(monthAndDayFormat)}}
</td>
{% else %}
<td data-value="0">
<td class="hidden-sm hidden-xs" data-value="0">
<em>{{ 'unknown'|_ }}</em>
</td>
{% endif %}
{% if entry.nextExpectedMatch%}
<td data-value="{{entry.nextExpectedMatch.format('U')}}">
<td class="hidden-sm hidden-xs" data-value="{{entry.nextExpectedMatch.format('U')}}">
{{entry.nextExpectedMatch.formatLocalized(monthAndDayFormat)}}
</td>
{% else %}
<td data-value="0">
<td class="hidden-sm hidden-xs" data-value="0">
<em>{{ 'unknown'|_ }}</em>
</td>
{% endif %}
<td data-value="{{ entry.active }}">
<td class="hidden-sm hidden-xs" data-value="{{ entry.active }}">
{% if entry.active %}
<i class="fa fa-fw fa-check"></i>
{% else %}
<i class="fa fa-fw fa-ban"></i>
{% endif %}
</td>
<td data-value="{{ entry.automatch }}">
<td class="hidden-sm hidden-xs" data-value="{{ entry.automatch }}">
{% if entry.automatch %}
<i class="fa fa-fw fa-check"></i>
{% else %}
<i class="fa fa-fw fa-ban"></i>
{% endif %}
</td>
<td data-value="{{ entry.repeat_freq }}{{ entry.skip }}">
<td class="hidden-sm hidden-xs" data-value="{{ entry.repeat_freq }}{{ entry.skip }}">
{{ entry.repeat_freq|_ }}
{% if entry.skip > 0 %}
skips over {{entry.skip}}

8
resources/twig/list/categories.twig
View File

@ -3,14 +3,14 @@
<tr>
<th data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th>
<th>{{ trans('list.lastActivity') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th>
</tr>
</thead>
<tbody>
<tr>
<td>&nbsp;</td>
<td><a href="{{ route('categories.noCategory') }}"><em>{{ 'without_category'|_ }}</em></a></td>
<td>&nbsp;</td>
<td class="hidden-sm hidden-xs">&nbsp;</td>
</tr>
{% for category in categories %}
<tr>
@ -24,11 +24,11 @@
<a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
</td>
{% if category.lastActivity %}
<td data-value="{{ category.lastActivity.format('U') }}">
<td class="hidden-sm hidden-xs" data-value="{{ category.lastActivity.format('U') }}">
{{category.lastActivity.formatLocalized(monthAndDayFormat) }}
</td>
{% else %}
<td data-value="0">
<td class="hidden-sm hidden-xs" data-value="0">
<em>{{ 'never'|_ }}</em>
</td>
{% endif %}

4
resources/twig/list/journals.twig
View File

@ -5,7 +5,7 @@
<th class="hidden-xs" colspan="2">&nbsp;</th>
<th>{{ trans('list.description') }}</th>
<th>{{ trans('list.amount') }}</th>
<th>{{ trans('list.date') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
<th class="hidden-xs">{{ trans('list.from') }}</th>
<th class="hidden-xs">{{ trans('list.to') }}</th>
<!-- Hide budgets? -->
@ -60,7 +60,7 @@
{{ journal.correct_amount|formatAmount }}
{% endif %}
</td>
<td>
<td class="hidden-sm hidden-xs">
{{journal.date.formatLocalized(monthAndDayFormat)}}
</td>
<td class="hidden-xs">

12
resources/twig/list/piggy-banks.twig
View File

@ -2,11 +2,11 @@
<tbody>
{% for piggyBank in piggyBanks %}
<tr data-id="{{ piggyBank.id }}">
<td style="width:60px;">
<td style="width:60px;" class="hidden-sm hidden-xs">
<i class="fa fa-fw fa-bars handle"></i>
<i class="loadSpin"></i>
</td>
<td style="width:100px;">
<td style="width:100px;" class="hidden-sm hidden-xs">
<div class="btn-group btn-group-xs">
<a href="{{ route('piggy-banks.edit', piggyBank.id) }}" class="btn btn-default btn-xs"><i class="fa fa-pencil fa-fw"></i></a>
<a href="{{ route('piggy-banks.delete', piggyBank.id) }}" class="btn btn-danger btn-xs"><i class="fa fa-trash fa-fw"></i></a>
@ -18,14 +18,14 @@
<td>
<span title="Saved so far">{{ piggyBank.savedSoFar|formatAmountPlain }}</span>
</td>
<td style="text-align:right;width:40px;">
<td class="hidden-sm hidden-xs" style="text-align:right;width:40px;">
{% if piggyBank.savedSoFar > 0 %}
<a href="{{ route('piggy-banks.removeMoney', piggyBank.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggyBank.id }}">
<i data-id="{{ piggyBank.id }}" class="fa fa-minus"></i></a>
{% endif %}
</td>
<td>
<td class="hidden-sm hidden-xs">
<div class="progress progress" style="margin-bottom:0;">
<div
{% if piggyBank.percentage == 100 %}
@ -41,13 +41,13 @@
</td>
<td style="width:40px;">
<td class="hidden-sm hidden-xs" style="width:40px;">
{% if piggyBank.leftToSave > 0 %}
<a href="{{ route('piggy-banks.addMoney', piggyBank.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggyBank.id }}">
<i data-id="{{ piggyBank.id }}" class="fa fa-plus"></i></a>
{% endif %}
</td>
<td style="width:200px;">
<td class="hidden-sm hidden-xs" style="width:200px;">
<span title="Target amount">{{ piggyBank.targetamount|formatAmount }}</span>
{% if piggyBank.leftToSave > 0 %}
<span title="Left to save">({{ piggyBank.leftToSave|formatAmount }})</span>

16
resources/twig/piggy-banks/index.twig
View File

@ -31,22 +31,22 @@
<thead>
<tr>
<th>{{ 'account'|_ }}</th>
<th>{{ 'balance'|_ }}</th>
<th class="hidden-sm hidden-xs">{{ 'balance'|_ }}</th>
<th>{{ 'left_for_piggy_banks'|_ }}</th>
<th>{{ 'sum_of_piggy_banks'|_ }}</th>
<th>{{ 'saved_so_far'|_ }}</th>
<th>{{ 'left_to_save'|_ }}</th>
<th class="hidden-sm hidden-xs">{{ 'sum_of_piggy_banks'|_ }}</th>
<th class="hidden-sm hidden-xs">{{ 'saved_so_far'|_ }}</th>
<th class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
</tr>
</thead>
<tbody>
{% for id,info in accounts %}
<tr>
<td><a href="{{ route('accounts.show',id) }}">{{ info.name }}</a></td>
<td>{{ info.balance|formatAmount }}</td>
<td class="hidden-sm hidden-xs">{{ info.balance|formatAmount }}</td>
<td>{{ info.leftForPiggyBanks|formatAmount }}</td>
<td>{{ info.sumOfTargets|formatAmount }}</td>
<td>{{ info.sumOfSaved|formatAmount }}</td>
<td>{{ info.leftToSave|formatAmount }}</td>
<td class="hidden-sm hidden-xs">{{ info.sumOfTargets|formatAmount }}</td>
<td class="hidden-sm hidden-xs">{{ info.sumOfSaved|formatAmount }}</td>
<td class="hidden-sm hidden-xs">{{ info.leftToSave|formatAmount }}</td>
</tr>
{% endfor %}
</tbody>