Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBX-6649: Added support for spell checking #923

Merged
merged 2 commits into from
Dec 5, 2023
Merged

IBX-6649: Added support for spell checking #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cde14b9
IBX-6649: Added support for spell checking
adamwojs Sep 28, 2023
c4dd925
fixup! IBX-6649: Added support for spell checking
adamwojs Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/bundle/Resources/public/scss/_search-criteria-tags.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.ibexa-search-criteria-tags {
border-bottom: calculateRem(1px) solid $ibexa-color-dark-200;
padding-bottom: calculateRem(8px);

&__tag {
Expand Down
20 changes: 20 additions & 0 deletions src/bundle/Resources/public/scss/_search-form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
margin-top: 0;
font-size: $ibexa-text-font-size-extra-large;
}

.ibexa-table-sub-header {
border-bottom: calculateRem(1px) solid $ibexa-color-dark-200;
padding-bottom: calculateRem(8px);
}
}

&__results-language {
Expand Down Expand Up @@ -109,6 +114,21 @@
display: flex;
}

&__spellcheck-suggestion {
font-style: italic;

a {
font-style: normal;
font-weight: bold;
}
}

&__no-results {
.ibexa-search-form__spellcheck-suggestion {
color: $ibexa-color-dark-400;
}
}

.ibexa-btn--secondary.ibexa-btn {
max-width: 100%;
overflow: hidden;
Expand Down
5 changes: 5 additions & 0 deletions src/bundle/Resources/translations/ibexa_search.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@
<target state="new">Section</target>
<note>key: search.section</note>
</trans-unit>
<trans-unit id="923ca53f6602fe7eabe79838efdca27c2756b0fd" resname="search.spellcheck.suggestion">
<source>Did you mean %s?</source>
<target state="new">Did you mean %s?</target>
<note>key: search.spellcheck.suggestion</note>
</trans-unit>
<trans-unit id="b484be9d33f5cd9961f4ddd89c628f2cbca2a6a1" resname="search.subtree">
<source>Subtree</source>
<target state="new">Subtree</target>
Expand Down
10 changes: 10 additions & 0 deletions src/bundle/Resources/views/themes/admin/ui/search/criteria_tags.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{% trans_default_domain 'ibexa_search' %}

<div class="ibexa-search-criteria-tags">
{% if form.children.search_language.vars.value != '' %}
<div class="ibexa-tag ibexa-search-criteria-tags__tag">
<div class="ibexa-tag__content">
{{ 'search.in_language'|trans({
'%search_language%': form.children.search_language.vars.data.name,
})|desc('in %search_language%')}}
</div>
</div>
{% endif %}

{% if form.content_types.vars.data is not empty %}
{% for content_type in form.content_types.vars.data %}
{{ include('@ibexadesign/ui/search_tag.html.twig', {
Expand Down
17 changes: 8 additions & 9 deletions src/bundle/Resources/views/themes/admin/ui/search/results.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
<h2 class="ibexa-search-form__no-results-title">
{{ 'search.no_results.title'|trans({'%query%': form.query.vars.value})|desc('No results found for "%query%"') }}
</h2>

{% include '@ibexadesign/ui/search/spellcheck.html.twig' %}

<div class="ibexa-search-form__no-results-subtitle">
{% for hint in no_results_hints %}
<div class="ibexa-search-form__no-results-hint">
<div class="ibexa-search-form__no-results-hint-icon-wrapper">
<div class="ibexa-search-form__no-results-hint-icon-wrapper">
<svg class="ibexa-icon ibexa-icon--small-medium">
<use xlink:href="{{ ibexa_icon_path('approved') }}"></use>
</svg>
Expand Down Expand Up @@ -182,14 +185,10 @@
} %}
{% trans_default_domain 'ibexa_search' %}
{% block between_header_and_table %}
<span class="ibexa-search-form__results-language">
{% if form.children.search_language.vars.value != '' %}
{{ 'search.in_language'|trans({
'%search_language%': form.children.search_language.vars.data.name,
})|desc('in %search_language%')}}
{% endif %}
</span>
{% include '@ibexadesign/ui/search/criteria_tags.html.twig' %}
<div class="ibexa-table-sub-header">
{% include '@ibexadesign/ui/search/criteria_tags.html.twig' %}
{% include '@ibexadesign/ui/search/spellcheck.html.twig' %}
</div>
{% endblock %}
{% endembed %}

Expand Down
13 changes: 13 additions & 0 deletions src/bundle/Resources/views/themes/admin/ui/search/spellcheck.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{% trans_default_domain 'ibexa_search' %}

{% if spellcheck is not null and spellcheck.incorrect %}
<div class="ibexa-search-form__spellcheck-suggestion">
{% set suggestion_link %}
<a href="{{ path('ibexa.search', app.request.query|merge({'search[query]': spellcheck.query})) }}">
{{ spellcheck.query }}
</a>
{% endset %}

{{ 'search.spellcheck.suggestion'|trans|desc('Did you mean %s?')|e('html')|format(suggestion_link)|raw }}
</div>
{% endif %}
Loading