kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 05:06:37 +00:00
Code Issues Projects Releases Wiki Activity

Round the search time and make sure the count is shown #2453

Browse Source
This commit is contained in:
James Cole
2019-08-21 04:37:17 +02:00
parent c76337926b
commit 22f110df8d
6 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/v1/list/groups.twig
View File

@@ -151,7 +151,7 @@ TODO: hide and show columns
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }} <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<ul class="dropdown-menu dropdown-menu-right">
<li><a href="#" class="mass-edit"><i class="fa fa-fw fa-pencil"></i> <span>{{ 'mass_edit'|_ }}</span></a></li>
<li><a href="#" class="bulk-edit"><i class="fa fa-fw fa-pencil-square-o"></i> <span>{{ 'bulk_edit'|_ }}</span></a></li>
<li><a href="#" class="mass-delete"><i class="fa fa-fw fa-trash"></i> <span>{{ 'mass_delete'|_ }}</span></a></li>

3
resources/views/v1/search/index.twig
View File

@@ -123,7 +123,8 @@
var searchQuery = "{{ fullQuery|escape('js') }}";
var searchUri = "{{ route('search.search') }}";
</script>
<script type="text/javascript" src="v1/js/ff/search/index.js?v={{ FF_VERSION }}"></script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/search/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}

2
resources/views/v1/search/search.twig
View File

@@ -1,6 +1,6 @@
<p>
<p class="search_count">
{{ trans('firefly.search_found_transactions', {count: transactions.count, time: searchTime}) }}
{{ trans('firefly.search_found_transactions', {count: groups.count, time: searchTime}) }}
</p>
{% include 'list.groups' %}