IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-13 17:02:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace "moment" with more accurate start/end dates.

Browse Source
This commit is contained in:
James Cole committed 2018-08-08 17:53:40 +02:00
1 parent bc807965ab
commit 32e58d0a60
13 files changed
+83 -94
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

resources/views/accounts/reconcile/index.twig
+1 -1
View File
@@ -1,7 +1,7 @@
{% extends "./layout/default" %}
{% block breadcrumbs %}
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, moment, start, end) }}
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, start, end) }}
{% endblock %}
{% block content %}
resources/views/budgets/no-budget.twig
+1 -1
View File
@@ -1,7 +1,7 @@
{% extends "./layout/default" %}
{% block breadcrumbs %}
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, '', start, end) }}
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, start, end) }}
{% endblock %}
{% block content %}
resources/views/categories/no-category.twig
+3 -3
View File
@@ -1,7 +1,7 @@
{% extends "./layout/default" %}
{% block breadcrumbs %}
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, moment, start, end) }}
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, start, end) }}
{% endblock %}
{% block content %}
@@ -10,7 +10,7 @@
{% if periods.count > 0 %}
<div class="row">
<div class="col-lg-offset-10 col-lg-2 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">
<p class="small text-center"><a href="{{ route('categories.no-category-all') }}">{{ 'showEverything'|_ }}</a></p>
<p class="small text-center"><a href="{{ route('categories.no-category.all') }}">{{ 'showEverything'|_ }}</a></p>
</div>
</div>
{% endif %}
@@ -26,7 +26,7 @@
{% if periods.count > 0 %}
<p>
<i class="fa fa-calendar"></i>
<a href="{{ route('categories.no-category-all') }}">{{ 'show_all_no_filter'|_ }}</a>
<a href="{{ route('categories.no-category.all') }}">{{ 'show_all_no_filter'|_ }}</a>
</p>
{% else %}
<p>
resources/views/categories/show.twig
+3 -3
View File
@@ -1,12 +1,12 @@
{% extends "./layout/default" %}
{% block breadcrumbs %}
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, category, '', start, end) }}
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, category, start, end) }}
{% endblock %}
{% block content %}
<div class="row">
{% if moment != 'all' %}
{% if Route.getCurrentRoute.getName == 'categories.show' %}
{# both charts #}
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<div class="box">
@@ -33,7 +33,7 @@
</div>
</div>
{% endif %}
{% if moment == 'all' %}
{% if Route.getCurrentRoute.getName == 'categories.show.all' %}
{# all chart #}
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
resources/views/list/journals.twig
+2 -1
View File
@@ -52,8 +52,9 @@
<a href="#" class="btn btn-default mass_select"><i class="fa fa-fw fa-check-square-o"></i> {{ 'select_transactions'|_ }}</a>
<a href="#" class="btn btn-default mass_stop_select" style="display:none;"><i class="fa faw-fw fa-square-o"
></i> {{ 'stop_selection'|_ }}</a>
{% if showReconcile == true %}
{% if moment == 'all' %}
{% if Route.getCurrentRoute.getName =='accounts.show.all' %}
<a href="{{ route('accounts.reconcile', [account.id, start.format('Ymd')]) }}" class="btn btn-info mass_reconcile"><i
class="fa fa-fw fa-check"></i> {{ 'reconcile_this_account'|_ }}</a>
{% else %}