Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Clean up search page.
James Colec2373787bb9b
diff --git a/public/v1/js/ff/search/index.js b/public/v1/js/ff/search/index.jsindex ab35091de0..a4263e0396 100644--- a/public/v1/js/ff/search/index.js+++ b/public/v1/js/ff/search/index.js@@ -31,8 +31,8 @@ function startSearch(query) {}function searchFailure() {- $('.result_row').hide();- $('.error_row').removeClass('hidden');+ $('.result_row').addClass('d-none');+ $('.error_row').removeClass('d-none');}function presentSearchResults(data) {@@ -40,9 +40,9 @@ function presentSearchResults(data) {searchFailure();return;}- $('.search_ongoing').hide();+ $('.search_ongoing').addClass('d-none');$('.search_box').find('.overlay').remove();- $('.search_results').html(data.html).removeClass('hidden');+ $('.search_results').html(data.html).removeClass('d-none');updateListButtons();diff --git a/resources/views/search/index.blade.php b/resources/views/search/index.blade.phpindex 34936bc09c..56bb4ef626 100644--- a/resources/views/search/index.blade.php+++ b/resources/views/search/index.blade.php@@ -12,25 +12,27 @@</div><div class="card-body"><p>- {{ __('firefly.search_box_intro') }}+ {!! __('firefly.search_box_intro') !!}</p>{{-- search form --}}<form class="form-horizontal" action="{{ route('search.index') }}" method="get">- <div class="form-group">- <label for="query" class="col-sm-1 control-label">{{ __('firefly.search_query') }}</label>+ <div class="row mb-3">+ <label for="inputEmail3" class="col-sm-2 col-form-label">{{ __('firefly.search_query') }}</label><div class="col-sm-10"><input autocomplete="off" type="text" name="search" id="query" value="{{ $fullQuery }}" class="form-control" spellcheck="false"placeholder="{{ $fullQuery }}"></div></div>- <div class="form-group">- <div class="col-sm-offset-1 col-sm-10">+ <div class="row mb-3">+ <div class="offset-md-2 col-sm-10">+ <div class="btn-group"><button type="submit" class="btn btn-info"><span class="bi bi-search"></span> {{ __('firefly.search') }}</button>@if($ruleId > 0 && $ruleChanged)<a href="{{ route('rules.edit', [$ruleId]) }}?from_query={{ $fullQuery }}"class="btn btn-outline-secondary">{{ trans('firefly.update_rule_from_query', ['rule' => $rule->title]) }}</a>@endif<a href="{{ route('rules.create') }}?from_query={{ $fullQuery }}" class="btn btn-outline-secondary">{{ __('firefly.create_rule_from_query') }}</a>+ </div></div></div>@if(0 !== $ruleId)@@ -43,10 +45,7 @@<ul>@if(count($words) > 0)<li>- {!! trans('firefly.search_for_query',- [- 'query' => join(' ',array_map(function(string $value): string {return sprintf('<span class="search-word">%s</span>', $value);}, $words))])- !!}+ {!! trans('firefly.search_for_query',['query' => join(' ',array_map(function(string $value): string {return sprintf('<span class="search-word">%s</span>', $value);}, $words))]) !!}</li>@endif@if(count($excludedWords) > 0)@@ -82,7 +81,7 @@@if(strlen($fullQuery) > 0 || count($words) > 0 || count($excludedWords) > 0 || count($operators) > 0)<div class="row result_row"><div class="col-lg-12 col-md-12 col-sm-12">- <div class="box search_box">+ <div class="card mb-2 search_box"><div class="card-header"><h3 class="card-title">{{ __('firefly.transactions') }}</h3></div>@@ -90,38 +89,18 @@<p class="search_ongoing text-center">{{ __('firefly.search_searching') }}</p>- <div class="search_results hidden"></div>+ <div class="search_results d-none"></div>{{-- loading indicator --}}<div class="overlay"><div class="spinner-border spinner-border-sm" role="status">- <span class="visually-hidden">Loading...</span>-</div>- </div>-- <div class="row mass_edit_all hidden-xs hidden">- <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">- <div class="mass_button_options btn-group btn-group hidden">- <a href="#" class="btn btn-outline-secondary mass_edit"><span class="bi bi-pencil"></span> <span>{{ __('firefly.edit_selected') }}</span></a>- <a href="#" class="btn btn-outline-secondary bulk_edit"><span>{{ __('firefly.bulk_edit') }}</span></a>- <a href="#" class="btn btn-danger mass_delete"><span class="bi bi-trash"></span>- <span>{{ __('firefly.delete_selected') }}</span></a>- </div>- </div>- <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12 hidden-xs">-- <div class="mass_buttons btn-group btn-group text-end">- <a href="#" class="btn btn-outline-secondary mass_select"><span- class="bi bi-check-square-o"></span> {{ __('firefly.select_transactions') }}</a>- <a href="#" class="btn btn-outline-secondary mass_stop_select hidden"><span class="bi bi-app"- ></span> {{ __('firefly.stop_selection') }}</a>- </div>+ <span class="visually-hidden">Loading...</span></div></div></div></div></div></div>- <div class="row error_row hidden">+ <div class="row error_row d-none"><div class="col-lg-12 col-md-12 col-sm-12"><div class="card card-danger card-outline"><div class="card-header">