Update UI

This commit is contained in:
Sobuno 2025-01-03 00:29:38 +01:00
parent 50aff9cfb6
commit 36ec1daf3a
2 changed files with 23 additions and 23 deletions

View File

@ -329,8 +329,9 @@ return [
'search_query' => 'Query', 'search_query' => 'Query',
'search_found_transactions' => 'Firefly III found :count transaction in :time seconds.|Firefly III found :count transactions in :time seconds.', 'search_found_transactions' => 'Firefly III found :count transaction in :time seconds.|Firefly III found :count transactions in :time seconds.',
'search_found_more_transactions' => 'Firefly III found more than :count transactions in :time seconds.', 'search_found_more_transactions' => 'Firefly III found more than :count transactions in :time seconds.',
'search_for_query' => 'Firefly III is searching for transactions with all of these words in them: <span class="text-info">:query</span>', 'search_for_overview' => 'Firefly III is searching for transactions that fulfill <b>all</b> of the following conditions:',
'search_for_excluded_words' => 'Firefly III is searching for transactions with none of these words in them: <span class="text-info">:excluded_words</span>', 'search_for_query' => 'All of these words must be present: <span class="text-info">:query</span>',
'search_for_excluded_words' => 'None of these words may be present: <span class="text-info">:excluded_words</span>',
'invalid_operators_list' => 'These search parameters are not valid and have been ignored.', 'invalid_operators_list' => 'These search parameters are not valid and have been ignored.',
// old // old
@ -730,7 +731,6 @@ return [
// Ignore this comment // Ignore this comment
// END // END
'modifiers_applies_are' => 'The following modifiers are applied to the search as well:',
'general_search_error' => 'An error occurred while searching. Please check the log files for more information.', 'general_search_error' => 'An error occurred while searching. Please check the log files for more information.',
'search_box' => 'Search', 'search_box' => 'Search',
'search_box_intro' => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.', 'search_box_intro' => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',

View File

@ -38,17 +38,31 @@
<input type="hidden" name="rule" value="{{ ruleId }}"/> <input type="hidden" name="rule" value="{{ ruleId }}"/>
{% endif %} {% endif %}
</form> </form>
<p>
{{ trans('firefly.search_for_overview') |raw }}
</p>
<ul>
{% if '' != query %} {% if '' != query %}
<p> <li>
{{ trans('firefly.search_for_query', {query: query|escape})|raw }} {{- trans('firefly.search_for_query', {query: query|escape})|raw -}}
</p> </li>
{% endif %} {% endif %}
{% if '' != excludedWords %} {% if '' != excludedWords %}
<p> <li>
{{ trans('firefly.search_for_excluded_words', {excluded_words: excludedWords|escape})|raw }} {{- trans('firefly.search_for_excluded_words', {excluded_words: excludedWords|escape})|raw -}}
</p> </li>
{% endif %} {% endif %}
{% for operator in operators %}
{% if operator.prohibited %}
<li>{{- trans('firefly.search_modifier_not_'~operator.type, {value: operator.value}) -}}</li>
{% endif %}
{% if not operator.prohibited %}
<li>{{- trans('firefly.search_modifier_'~operator.type, {value: operator.value}) -}}</li>
{% endif %}
{% endfor %}
</ul>
{% if invalidOperators|length > 0 %} {% if invalidOperators|length > 0 %}
<p>{{ trans('firefly.invalid_operators_list') }}</p> <p>{{ trans('firefly.invalid_operators_list') }}</p>
<ul> <ul>
@ -57,20 +71,6 @@
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
{% if operators|length > 0 %}
<p>{{ trans('firefly.modifiers_applies_are') }}</p>
<ul>
{% for operator in operators %}
{% if operator.prohibited %}
<li>{{ trans('firefly.search_modifier_not_'~operator.type, {value: operator.value}) }}</li>
{% endif %}
{% if not operator.prohibited %}
<li>{{ trans('firefly.search_modifier_'~operator.type, {value: operator.value}) }}</li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
</div> </div>
</div> </div>
</div> </div>