From 9a5568e75a6c24bdd2a65af26ed1cbd23a820786 Mon Sep 17 00:00:00 2001 From: Saptak S Date: Wed, 22 Apr 2020 15:34:15 +0530 Subject: [PATCH 01/17] Query Field: Separates query field from the pagination part Separates the query search field from the pagination part and adds filters and sorting options in UI --- weblate/static/loader-bootstrap.js | 5 +- weblate/static/style-bootstrap.css | 11 ++- weblate/templates/snippets/query-field.html | 42 +++++++++ weblate/templates/snippets/search-form.html | 3 - weblate/templates/translate.html | 99 +++++++++++---------- weblate/trans/filter.py | 29 ++++++ weblate/trans/forms.py | 11 ++- weblate/trans/views/edit.py | 2 + weblate/utils/forms.py | 6 +- 9 files changed, 150 insertions(+), 58 deletions(-) create mode 100644 weblate/templates/snippets/query-field.html diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index e6678e8adc04..b692a00462f0 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1525,8 +1525,11 @@ $(function () { $('.search-group li a').click(function () { var $this = $(this); var $button = $this.closest('.input-group-btn').find('button'); - $button.data('field', $this.data('field')); + $button.attr('data-field', $this.data('field')); $button.find('span.search-label').text($this.text()); + if ($this.closest('.query-field').length) { + $('#id_q').insertAtCaret(' ' + $this.data('field') + ' '); + } }); $('.search-group input').on('keydown', function (event) { if (event.key === "Enter") { diff --git a/weblate/static/style-bootstrap.css b/weblate/static/style-bootstrap.css index 136fe22fd23e..5902bc2b0051 100644 --- a/weblate/static/style-bootstrap.css +++ b/weblate/static/style-bootstrap.css @@ -418,7 +418,7 @@ kbd { text-align: center; } .unit-navi { - min-width: 25em; + min-width: 17em; } .unit-navi li { float: left; @@ -429,6 +429,9 @@ kbd { .unit-navi .dropdown-menu { margin-top: 0; } +.unit-navi.pagination { + margin-top: 0; +} .fullmodal .modal-dialog { width: auto; } @@ -447,6 +450,12 @@ legend { .search-group { margin: 0 15px 15px 0; } +.search-group input{ + height: auto; +} +.query-field .btn.btn-primary{ + font-size: initial; +} #is-exact span { margin: 4px 4px 0 4px; } diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html new file mode 100644 index 000000000000..5687c55ac017 --- /dev/null +++ b/weblate/templates/snippets/query-field.html @@ -0,0 +1,42 @@ +{% load i18n %} +{% load translations %} +{% load icons %} +{% load crispy_forms_field %} +
+
+
+
+
+
+ +
    + {% for _, name, query in custom_filter_list %} +
  • {{ name }}
    • + {% endfor %} +
+
+ {% crispy_field field 'class' 'form-control' %} +
+ + + +
+
+
+
+
+
diff --git a/weblate/templates/snippets/search-form.html b/weblate/templates/snippets/search-form.html index 190a06b4a339..a70436dd8549 100644 --- a/weblate/templates/snippets/search-form.html +++ b/weblate/templates/snippets/search-form.html @@ -10,7 +10,4 @@
{% crispy search_form %}
-
- -
diff --git a/weblate/templates/translate.html b/weblate/templates/translate.html index 412be2f5bacd..77184e3591bb 100644 --- a/weblate/templates/translate.html +++ b/weblate/templates/translate.html @@ -35,6 +35,7 @@ {% perm 'comment.add' project as user_can_add_comment %} {% perm 'glossary.add' project as user_can_add_dictionary %} +
{% if user_can_translate %} {% icon "flash.svg" %} {% trans "Zen" %} @@ -42,58 +43,58 @@ {% icon "settings.svg" %}
- -{% with comments=unit.get_comments nearby=unit.nearby nearby_keys=unit.nearby_keys shapings=unit.shapings%} - -
- +
+
+
+
+ {% include "snippets/query-field.html" with field=search_form.q %} +
+
+
+
+
+ +
+
diff --git a/weblate/trans/filter.py b/weblate/trans/filter.py index a0e9161118b6..4984a008b09e 100644 --- a/weblate/trans/filter.py +++ b/weblate/trans/filter.py @@ -128,3 +128,32 @@ def get_filter_choice(project=None): for label in project.label_set.values_list("name", flat=True) ) return result + + +def get_search_query_choices(): + """Return all filtering choices for query field.""" + result = [ + ("nottranslated", _("Not translated strings"), "state:empty"), + ("todo", _("Strings needing action"), "state:=translated"), + ("fuzzy", _("Strings marked for edit"), "state:needs-editing"), + ("suggestions", _("Strings with suggestions"), "has:suggestion"), + ("shapings", _("Strings with shapings"), "has:shaping"), + ("labels", _("Strings with labels"), "has:label"), + ("context", _("Strings with context"), "has:context"), + ( + "nosuggestions", + _("Strings needing action without suggestions"), + "state: Date: Wed, 22 Apr 2020 20:47:30 +0530 Subject: [PATCH 02/17] Query Field: Adds sorting feature from the query field dropdown --- weblate/static/loader-bootstrap.js | 6 +++++- weblate/static/style-bootstrap.css | 3 +++ weblate/templates/snippets/query-field.html | 10 +++++----- weblate/trans/views/edit.py | 6 +++++- weblate/trans/views/search.py | 4 +++- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index b692a00462f0..fa9274e4cee1 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1528,7 +1528,11 @@ $(function () { $button.attr('data-field', $this.data('field')); $button.find('span.search-label').text($this.text()); if ($this.closest('.query-field').length) { - $('#id_q').insertAtCaret(' ' + $this.data('field') + ' '); + if ($this.data('sort')) { + $('#id_sort_by').val($this.data('sort')); + } else { + $('#id_q').insertAtCaret(' ' + $this.data('field') + ' '); + } } }); $('.search-group input').on('keydown', function (event) { diff --git a/weblate/static/style-bootstrap.css b/weblate/static/style-bootstrap.css index 5902bc2b0051..0809a5eaae04 100644 --- a/weblate/static/style-bootstrap.css +++ b/weblate/static/style-bootstrap.css @@ -453,6 +453,9 @@ legend { .search-group input{ height: auto; } +.search-label svg { + height: 16px; +} .query-field .btn.btn-primary{ font-size: initial; } diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index 5687c55ac017..ef8b6899d0f0 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -9,7 +9,7 @@
{% crispy_field field 'class' 'form-control' %}
- +
diff --git a/weblate/trans/views/edit.py b/weblate/trans/views/edit.py index bc2500aa5974..e6b28a52c7ab 100644 --- a/weblate/trans/views/edit.py +++ b/weblate/trans/views/edit.py @@ -142,7 +142,11 @@ def search(translation, request): name = form.get_name() if form_valid else "" # Grab unit IDs - unit_ids = list(allunits.order().values_list("id", flat=True)) + unit_ids = list( + allunits.order_by(request.GET.get("sort_by", "position")).values_list( + "id", flat=True + ) + ) # Check empty search results if not unit_ids: diff --git a/weblate/trans/views/search.py b/weblate/trans/views/search.py index 289e00ebb168..2e86ea55e401 100644 --- a/weblate/trans/views/search.py +++ b/weblate/trans/views/search.py @@ -190,7 +190,9 @@ def search(request, project=None, component=None, lang=None): if lang: units = units.filter(translation__language=context["language"]) - units = get_paginator(request, units.order()) + units = get_paginator( + request, units.order_by(request.GET.get("sort_by", "position")) + ) context["show_results"] = True context["page_obj"] = units From 2159c1ebd7eccaf6f091b6065925aa9121ea8a9f Mon Sep 17 00:00:00 2001 From: Saptak S Date: Thu, 23 Apr 2020 14:34:19 +0530 Subject: [PATCH 03/17] Refactors code for sorting and filtering --- weblate/trans/filter.py | 41 ++++++++++++++++--------------------- weblate/trans/forms.py | 2 +- weblate/trans/views/edit.py | 9 ++++---- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/weblate/trans/filter.py b/weblate/trans/filter.py index 4984a008b09e..0d555f4efc02 100644 --- a/weblate/trans/filter.py +++ b/weblate/trans/filter.py @@ -70,7 +70,7 @@ def search_name(self): def get_search_name(self, query): try: - return self.search_name[query] + return self.search_name[query.strip()] except KeyError: return query @@ -132,28 +132,23 @@ def get_filter_choice(project=None): def get_search_query_choices(): """Return all filtering choices for query field.""" + filter_keys = [ + "nottranslated", + "todo", + "translated", + "fuzzy", + "suggestions", + "shapings", + "labels", + "context", + "nosuggestions", + "comments", + "allchecks", + "approved", + "unapproved", + ] result = [ - ("nottranslated", _("Not translated strings"), "state:empty"), - ("todo", _("Strings needing action"), "state:=translated"), - ("fuzzy", _("Strings marked for edit"), "state:needs-editing"), - ("suggestions", _("Strings with suggestions"), "has:suggestion"), - ("shapings", _("Strings with shapings"), "has:shaping"), - ("labels", _("Strings with labels"), "has:label"), - ("context", _("Strings with context"), "has:context"), - ( - "nosuggestions", - _("Strings needing action without suggestions"), - "state: Date: Fri, 24 Apr 2020 19:35:58 +0530 Subject: [PATCH 04/17] Autosort and auto filter queries on selecting dropdown --- weblate/static/loader-bootstrap.js | 4 ++- weblate/templates/snippets/query-builder.html | 3 ++ weblate/templates/snippets/query-field.html | 2 +- weblate/templates/translate.html | 2 +- weblate/trans/filter.py | 24 --------------- weblate/trans/forms.py | 4 ++- weblate/trans/models/unit.py | 10 +++++++ weblate/trans/views/edit.py | 13 ++++---- weblate/trans/views/search.py | 2 +- weblate/utils/forms.py | 30 ++++++++++++++++++- 10 files changed, 56 insertions(+), 38 deletions(-) diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index fa9274e4cee1..ca60e8f001b7 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1530,8 +1530,10 @@ $(function () { if ($this.closest('.query-field').length) { if ($this.data('sort')) { $('#id_sort_by').val($this.data('sort')); + $this.closest('form').submit(); } else { - $('#id_q').insertAtCaret(' ' + $this.data('field') + ' '); + $('#id_q').val($this.data('field')); + $this.closest('form').submit(); } } }); diff --git a/weblate/templates/snippets/query-builder.html b/weblate/templates/snippets/query-builder.html index baea53c75cc5..696de194ed24 100644 --- a/weblate/templates/snippets/query-builder.html +++ b/weblate/templates/snippets/query-builder.html @@ -1,4 +1,6 @@ {% load i18n %} + +{% if show_builder %}
@@ -104,3 +106,4 @@
+{% endif %} diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index ef8b6899d0f0..a3c5b5f1b8eb 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -28,7 +28,7 @@ {% icon "sort-alphabetical.svg" %}{% trans "Sort By" %} - +
  • {% trans "Position" %}
  • {% trans "Descending Priority" %}
    • diff --git a/weblate/templates/translate.html b/weblate/templates/translate.html index 77184e3591bb..a3684fb5b028 100644 --- a/weblate/templates/translate.html +++ b/weblate/templates/translate.html @@ -51,7 +51,7 @@
    - {% include "snippets/query-field.html" with field=search_form.q %} + {% crispy search_form %}
    diff --git a/weblate/trans/filter.py b/weblate/trans/filter.py index 0d555f4efc02..186d90ea2793 100644 --- a/weblate/trans/filter.py +++ b/weblate/trans/filter.py @@ -128,27 +128,3 @@ def get_filter_choice(project=None): for label in project.label_set.values_list("name", flat=True) ) return result - - -def get_search_query_choices(): - """Return all filtering choices for query field.""" - filter_keys = [ - "nottranslated", - "todo", - "translated", - "fuzzy", - "suggestions", - "shapings", - "labels", - "context", - "nosuggestions", - "comments", - "allchecks", - "approved", - "unapproved", - ] - result = [ - (key, FILTERS.get_filter_name(key), FILTERS.get_filter_query(key)) - for key in filter_keys - ] - return result diff --git a/weblate/trans/forms.py b/weblate/trans/forms.py index d24254fc5c89..dc153e595293 100644 --- a/weblate/trans/forms.py +++ b/weblate/trans/forms.py @@ -642,18 +642,20 @@ class SearchForm(forms.Form): def __init__(self, user, *args, **kwargs): """Generate choices for other component in same project.""" self.user = user + show_builder = kwargs.pop("show_builder", True) super().__init__(*args, **kwargs) self.helper = FormHelper(self) self.helper.disable_csrf = True self.helper.form_tag = False self.helper.layout = Layout( - SearchField("q"), + SearchField("q", template="snippets/query-field.html"), ContextDiv( template="snippets/query-builder.html", context={ "user": self.user, "month_ago": timezone.now() - timedelta(days=31), + "show_builder": show_builder, }, ), Field("checksum"), diff --git a/weblate/trans/models/unit.py b/weblate/trans/models/unit.py index e6411dd2ad7b..02bc40527fb2 100644 --- a/weblate/trans/models/unit.py +++ b/weblate/trans/models/unit.py @@ -116,6 +116,16 @@ def same(self, unit, exclude=True): result = result.exclude(pk=unit.id) return result + def order_by_request(self, sort_list_request): + available_sort_choices = ["-priority", "position", "context"] + sort_list = [] + for choice in sort_list_request: + if choice in available_sort_choices: + sort_list.append(choice) + if len(sort_list): + sort_list = ["-priority", "position"] + return self.order_by(*sort_list) + def get_unit(self, ttunit): """Find unit matching translate-toolkit unit. diff --git a/weblate/trans/views/edit.py b/weblate/trans/views/edit.py index ac00382c4b3d..0d3adc767b9f 100644 --- a/weblate/trans/views/edit.py +++ b/weblate/trans/views/edit.py @@ -35,7 +35,6 @@ from weblate.checks.models import CHECKS from weblate.trans.autofixes import fix_target -from weblate.trans.filter import get_search_query_choices from weblate.trans.forms import ( AntispamForm, AutoForm, @@ -113,7 +112,7 @@ def cleanup_session(session): def search(translation, request): """Perform search or returns cached search results.""" # Possible new search - form = SearchForm(request.user, request.GET) + form = SearchForm(request.user, request.GET, show_builder=False) # Process form form_valid = form.is_valid() @@ -142,12 +141,11 @@ def search(translation, request): name = form.get_name() if form_valid else "" # Grab unit IDs - sort_by_list = ( - request.GET.get("sort_by").split(",") - if request.GET.get("sort_by") - else ["-priority", "position"] + unit_ids = list( + allunits.order_by_request( + request.GET.get("sort_by", "").split(",") + ).values_list("id", flat=True) ) - unit_ids = list(allunits.order_by(*sort_by_list).values_list("id", flat=True)) # Check empty search results if not unit_ids: @@ -522,7 +520,6 @@ def translate(request, project, component, lang): "scope": "global" if unit.translation.is_source else "translation" }, ), - "custom_filter_list": get_search_query_choices(), "context_form": ContextForm(instance=unit.source_info, user=request.user), "search_form": search_result["form"].reset_offset(), "secondary": secondary, diff --git a/weblate/trans/views/search.py b/weblate/trans/views/search.py index 2e86ea55e401..6dba8723432f 100644 --- a/weblate/trans/views/search.py +++ b/weblate/trans/views/search.py @@ -191,7 +191,7 @@ def search(request, project=None, component=None, lang=None): units = units.filter(translation__language=context["language"]) units = get_paginator( - request, units.order_by(request.GET.get("sort_by", "position")) + request, units.order_by_request(request.GET.get("sort_by", "").split(",")) ) context["show_results"] = True diff --git a/weblate/utils/forms.py b/weblate/utils/forms.py index 661e67fbb906..6bd9309dca27 100644 --- a/weblate/utils/forms.py +++ b/weblate/utils/forms.py @@ -24,6 +24,7 @@ from django.template.loader import render_to_string from django.utils.encoding import force_str +from weblate.trans.filter import FILTERS from weblate.trans.util import sort_unicode @@ -54,4 +55,31 @@ def render(self, form, form_style, context, template_pack=TEMPLATE_PACK, **kwarg class SearchField(Field): - template = "snippets/query-field.html" + def render(self, form, form_style, context, template_pack=TEMPLATE_PACK, **kwargs): + extra_context = {"custom_filter_list": self.get_search_query_choices()} + return super(SearchField, self).render( + form, form_style, context, template_pack, extra_context, **kwargs + ) + + def get_search_query_choices(self): + """Return all filtering choices for query field.""" + filter_keys = [ + "nottranslated", + "todo", + "translated", + "fuzzy", + "suggestions", + "shapings", + "labels", + "context", + "nosuggestions", + "comments", + "allchecks", + "approved", + "unapproved", + ] + result = [ + (key, FILTERS.get_filter_name(key), FILTERS.get_filter_query(key)) + for key in filter_keys + ] + return result From a5f1dc1a55daa89c50ba39d4208073ee8717aff3 Mon Sep 17 00:00:00 2001 From: Saptak S Date: Mon, 27 Apr 2020 21:44:09 +0530 Subject: [PATCH 05/17] Adds selenium tests and more sort options --- weblate/static/loader-bootstrap.js | 2 +- weblate/templates/snippets/query-field.html | 8 +++++--- weblate/trans/models/unit.py | 5 +++-- weblate/trans/tests/test_selenium.py | 10 ++++++++++ weblate/trans/views/edit.py | 5 +++-- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index ca60e8f001b7..ba33a0feb0cb 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1537,7 +1537,7 @@ $(function () { } } }); - $('.search-group input').on('keydown', function (event) { + $('.search-group input').not('#id_q').on('keydown', function (event) { if (event.key === "Enter") { $(this).closest('.input-group').find('.search-add').click(); event.preventDefault(); diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index a3c5b5f1b8eb..189734f2b824 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -8,7 +8,7 @@
    -
    {% crispy_field field 'class' 'form-control' %}
    -
    diff --git a/weblate/trans/models/unit.py b/weblate/trans/models/unit.py index 02bc40527fb2..41ae2959b381 100644 --- a/weblate/trans/models/unit.py +++ b/weblate/trans/models/unit.py @@ -117,13 +117,14 @@ def same(self, unit, exclude=True): return result def order_by_request(self, sort_list_request): - available_sort_choices = ["-priority", "position", "context"] + available_sort_choices = ["-priority", "position", "context", "num_words"] sort_list = [] for choice in sort_list_request: if choice in available_sort_choices: sort_list.append(choice) - if len(sort_list): + if not len(sort_list): sort_list = ["-priority", "position"] + return self.order_by(*sort_list) def get_unit(self, ttunit): diff --git a/weblate/trans/tests/test_selenium.py b/weblate/trans/tests/test_selenium.py index a93ddd67e1e5..1a1482aff2e3 100644 --- a/weblate/trans/tests/test_selenium.py +++ b/weblate/trans/tests/test_selenium.py @@ -856,6 +856,16 @@ def test_weblate(self): self.screenshot("format-highlight.png") self.click("Comments") self.screenshot("plurals.png") + # Test search dropdown + dropdown = self.driver.find_element_by_id("query-dropdown") + dropdown.click() + self.screenshot("query-dropdown.png") + self.click("Not translated strings") + # Test sort dropdown + sort = self.driver.find_element_by_id("query-sort-dropdown") + sort.click() + self.screenshot("query-sort.png") + self.click("Position") # Trigger check self.clear_field(self.driver.find_element_by_id("id_a2a808c8ccbece08_0")) diff --git a/weblate/trans/views/edit.py b/weblate/trans/views/edit.py index 0d3adc767b9f..c6484298d970 100644 --- a/weblate/trans/views/edit.py +++ b/weblate/trans/views/edit.py @@ -130,6 +130,7 @@ def search(translation, request): if ( session_key in request.session and "offset" in request.GET + and "sort_by" not in request.GET and "items" in request.session[session_key] ): search_result.update(request.session[session_key]) @@ -139,8 +140,8 @@ def search(translation, request): search_query = form.get_search_query() if form_valid else "" name = form.get_name() if form_valid else "" - - # Grab unit IDs + print(allunits) + # Grab unit IDs) unit_ids = list( allunits.order_by_request( request.GET.get("sort_by", "").split(",") From 89982e346e7642ee79284da5ae16e5a106f6840c Mon Sep 17 00:00:00 2001 From: Saptak S Date: Mon, 27 Apr 2020 22:16:49 +0530 Subject: [PATCH 06/17] Adds fixes for some accessibility issues related to input --- weblate/templates/snippets/query-field.html | 4 ++-- weblate/templates/translate.html | 4 ++-- weblate/trans/views/edit.py | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index 189734f2b824..2df4c6d8cd25 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -22,13 +22,13 @@ {% endfor %}
- {% crispy_field field 'class' 'form-control' %} + {% crispy_field field 'class' 'form-control' 'aria-label' _('Query') %}
- +
  • {% trans "Position" %}
  • {% trans "Descending priority" %}
    • diff --git a/weblate/templates/translate.html b/weblate/templates/translate.html index a3684fb5b028..015f6c6e4792 100644 --- a/weblate/templates/translate.html +++ b/weblate/templates/translate.html @@ -73,7 +73,7 @@
    {% for key, value in search_items %} - + {% endfor %}
    @@ -81,7 +81,7 @@
    - +
diff --git a/weblate/trans/views/edit.py b/weblate/trans/views/edit.py index c6484298d970..0d3adc767b9f 100644 --- a/weblate/trans/views/edit.py +++ b/weblate/trans/views/edit.py @@ -130,7 +130,6 @@ def search(translation, request): if ( session_key in request.session and "offset" in request.GET - and "sort_by" not in request.GET and "items" in request.session[session_key] ): search_result.update(request.session[session_key]) @@ -140,8 +139,8 @@ def search(translation, request): search_query = form.get_search_query() if form_valid else "" name = form.get_name() if form_valid else "" - print(allunits) - # Grab unit IDs) + + # Grab unit IDs unit_ids = list( allunits.order_by_request( request.GET.get("sort_by", "").split(",") From 5fed68504a1672c7ba1022f7031f4a2b2993ca34 Mon Sep 17 00:00:00 2001 From: Saptak S Date: Tue, 28 Apr 2020 20:55:07 +0530 Subject: [PATCH 07/17] Refactor codes to make more readable --- weblate/templates/snippets/query-field.html | 11 +++++------ weblate/trans/models/unit.py | 13 ++++++------- weblate/trans/tests/test_selenium.py | 7 +++++-- weblate/trans/views/edit.py | 6 +----- weblate/trans/views/search.py | 4 +--- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index 2df4c6d8cd25..6ff5c0619a56 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -18,7 +18,7 @@
@@ -30,12 +30,11 @@ -
diff --git a/weblate/trans/models/unit.py b/weblate/trans/models/unit.py index 41ae2959b381..35c7746a5d6f 100644 --- a/weblate/trans/models/unit.py +++ b/weblate/trans/models/unit.py @@ -116,15 +116,14 @@ def same(self, unit, exclude=True): result = result.exclude(pk=unit.id) return result - def order_by_request(self, sort_list_request): + def order_by_request(self, request): + sort_list_request = request.GET.get("sort_by", "").split(",") available_sort_choices = ["-priority", "position", "context", "num_words"] - sort_list = [] - for choice in sort_list_request: - if choice in available_sort_choices: - sort_list.append(choice) - if not len(sort_list): + sort_list = [ + choice for choice in sort_list_request if choice in available_sort_choices + ] + if not sort_list: sort_list = ["-priority", "position"] - return self.order_by(*sort_list) def get_unit(self, ttunit): diff --git a/weblate/trans/tests/test_selenium.py b/weblate/trans/tests/test_selenium.py index 1a1482aff2e3..3ac4ee8fbf2e 100644 --- a/weblate/trans/tests/test_selenium.py +++ b/weblate/trans/tests/test_selenium.py @@ -860,12 +860,15 @@ def test_weblate(self): dropdown = self.driver.find_element_by_id("query-dropdown") dropdown.click() self.screenshot("query-dropdown.png") - self.click("Not translated strings") + with self.wait_for_page_load(): + self.click("Not translated strings") + self.screenshot("query-drop-clicked.png") # Test sort dropdown sort = self.driver.find_element_by_id("query-sort-dropdown") sort.click() self.screenshot("query-sort.png") - self.click("Position") + with self.wait_for_page_load(): + self.click("Position") # Trigger check self.clear_field(self.driver.find_element_by_id("id_a2a808c8ccbece08_0")) diff --git a/weblate/trans/views/edit.py b/weblate/trans/views/edit.py index 0d3adc767b9f..7601e6559973 100644 --- a/weblate/trans/views/edit.py +++ b/weblate/trans/views/edit.py @@ -141,11 +141,7 @@ def search(translation, request): name = form.get_name() if form_valid else "" # Grab unit IDs - unit_ids = list( - allunits.order_by_request( - request.GET.get("sort_by", "").split(",") - ).values_list("id", flat=True) - ) + unit_ids = list(allunits.order_by_request(request).values_list("id", flat=True)) # Check empty search results if not unit_ids: diff --git a/weblate/trans/views/search.py b/weblate/trans/views/search.py index 6dba8723432f..42b2e26475b0 100644 --- a/weblate/trans/views/search.py +++ b/weblate/trans/views/search.py @@ -190,9 +190,7 @@ def search(request, project=None, component=None, lang=None): if lang: units = units.filter(translation__language=context["language"]) - units = get_paginator( - request, units.order_by_request(request.GET.get("sort_by", "").split(",")) - ) + units = get_paginator(request, units.order_by_request(request)) context["show_results"] = True context["page_obj"] = units From 9dc9ef1b4a013daba4a4ede8c371b06de559da88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 28 Apr 2020 20:15:09 +0200 Subject: [PATCH 08/17] Fix selenium tests - add delay before screenshots to avoid capturing transitions - revert to original search for other tests --- weblate/trans/tests/test_selenium.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/weblate/trans/tests/test_selenium.py b/weblate/trans/tests/test_selenium.py index 3ac4ee8fbf2e..671b05900b3e 100644 --- a/weblate/trans/tests/test_selenium.py +++ b/weblate/trans/tests/test_selenium.py @@ -856,20 +856,33 @@ def test_weblate(self): self.screenshot("format-highlight.png") self.click("Comments") self.screenshot("plurals.png") + # Test search dropdown dropdown = self.driver.find_element_by_id("query-dropdown") dropdown.click() + time.sleep(0.5) self.screenshot("query-dropdown.png") with self.wait_for_page_load(): self.click("Not translated strings") - self.screenshot("query-drop-clicked.png") + self.driver.find_element_by_id("id_34a4642999e44a2b_0") + # Test sort dropdown sort = self.driver.find_element_by_id("query-sort-dropdown") sort.click() + time.sleep(0.5) self.screenshot("query-sort.png") with self.wait_for_page_load(): self.click("Position") + # Return to original unit + element = self.driver.find_element_by_id("id_q") + self.clear_field(element) + element.send_keys("'%(count)s word'") + self.screenshot("query-done-1.png") + with self.wait_for_page_load(): + element.submit() + self.screenshot("query-done.png") + # Trigger check self.clear_field(self.driver.find_element_by_id("id_a2a808c8ccbece08_0")) element = self.driver.find_element_by_id("id_a2a808c8ccbece08_1") From b4df0fe0714c85ac3e553190344002cb3d354108 Mon Sep 17 00:00:00 2001 From: Saptak S Date: Thu, 30 Apr 2020 15:45:59 +0530 Subject: [PATCH 09/17] Adds sorting direction feature with suitable icons --- weblate/static/icons/sort-ascending.svg | 1 + weblate/static/icons/sort-descending.svg | 1 + weblate/static/loader-bootstrap.js | 26 ++++++++++++------ weblate/static/style-bootstrap.css | 26 ++++++++++++++++++ weblate/templates/snippets/query-field.html | 29 +++++++++++++++++---- weblate/templates/translate.html | 2 +- weblate/trans/models/unit.py | 9 ++++--- weblate/trans/views/edit.py | 21 +++++++++++++++ 8 files changed, 98 insertions(+), 17 deletions(-) create mode 100644 weblate/static/icons/sort-ascending.svg create mode 100644 weblate/static/icons/sort-descending.svg diff --git a/weblate/static/icons/sort-ascending.svg b/weblate/static/icons/sort-ascending.svg new file mode 100644 index 000000000000..bf905efe6596 --- /dev/null +++ b/weblate/static/icons/sort-ascending.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/weblate/static/icons/sort-descending.svg b/weblate/static/icons/sort-descending.svg new file mode 100644 index 000000000000..82d62f804c21 --- /dev/null +++ b/weblate/static/icons/sort-descending.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index ba33a0feb0cb..cebe4050c104 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1526,16 +1526,26 @@ $(function () { var $this = $(this); var $button = $this.closest('.input-group-btn').find('button'); $button.attr('data-field', $this.data('field')); - $button.find('span.search-label').text($this.text()); + $button.find('span.search-label').not('#query-sort-toggle span').text($this.text()); + if ($this.data('sort')) { + $('#id_sort_by').val($this.data('sort')); + $this.closest('form').submit(); + } if ($this.closest('.query-field').length) { - if ($this.data('sort')) { - $('#id_sort_by').val($this.data('sort')); - $this.closest('form').submit(); - } else { - $('#id_q').val($this.data('field')); - $this.closest('form').submit(); - } + $('#id_q').val($this.data('field')); + $this.closest('form').submit(); + } + }); + $('#query-sort-toggle').click(function () { + var $this = $(this); + var $label = $this.find('span.search-label'); + $label.toggle(); + if (!$('#id_sort_direction').val()) { + $('#id_sort_direction').val("-"); + } else { + $('#id_sort_direction').val(""); } + $this.closest('form').submit(); }); $('.search-group input').not('#id_q').on('keydown', function (event) { if (event.key === "Enter") { diff --git a/weblate/static/style-bootstrap.css b/weblate/static/style-bootstrap.css index 0809a5eaae04..b4ed95658fb7 100644 --- a/weblate/static/style-bootstrap.css +++ b/weblate/static/style-bootstrap.css @@ -431,6 +431,7 @@ kbd { } .unit-navi.pagination { margin-top: 0; + padding-left: 15px; } .fullmodal .modal-dialog { width: auto; @@ -450,15 +451,40 @@ legend { .search-group { margin: 0 15px 15px 0; } +.query-field { + margin-right: 0; +} .search-group input{ height: auto; } +.search-group li a { + cursor: pointer; +} .search-label svg { height: 16px; } .query-field .btn.btn-primary{ font-size: initial; } +.sort-field { + margin-right: 0; +} +@media (min-width: 768px) { + .sort-field { + margin-left: -15px; + } +} +#query-sort-toggle { + width: 35px; + padding-left: 0; + padding-right: 0; +} +#query-sort-toggle span:not(.active) { + display: none; +} +#query-sort-dropdown { + width: 115px; +} #is-exact span { margin: 4px 4px 0 4px; } diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index 6ff5c0619a56..b051c58c590f 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -3,7 +3,7 @@ {% load icons %} {% load crispy_forms_field %}
-
+
@@ -23,18 +23,37 @@
{% crispy_field field 'class' 'form-control' 'aria-label' _('Query') %} +
+
+
+
+
+
+
+
- + + +
diff --git a/weblate/templates/translate.html b/weblate/templates/translate.html index 015f6c6e4792..f0f6085ce51d 100644 --- a/weblate/templates/translate.html +++ b/weblate/templates/translate.html @@ -55,7 +55,7 @@
-
+
  • diff --git a/weblate/trans/models/unit.py b/weblate/trans/models/unit.py index 35c7746a5d6f..acc68f6932df 100644 --- a/weblate/trans/models/unit.py +++ b/weblate/trans/models/unit.py @@ -118,12 +118,15 @@ def same(self, unit, exclude=True): def order_by_request(self, request): sort_list_request = request.GET.get("sort_by", "").split(",") - available_sort_choices = ["-priority", "position", "context", "num_words"] + sort_direction = request.GET.get("sort_by_direction", "") + available_sort_choices = ["priority", "position", "context", "num_words"] sort_list = [ - choice for choice in sort_list_request if choice in available_sort_choices + "{}{}".format(sort_direction, choice) + for choice in sort_list_request + if choice in available_sort_choices ] if not sort_list: - sort_list = ["-priority", "position"] + return self.order() return self.order_by(*sort_list) def get_unit(self, ttunit): diff --git a/weblate/trans/views/edit.py b/weblate/trans/views/edit.py index 7601e6559973..eed817a0d32b 100644 --- a/weblate/trans/views/edit.py +++ b/weblate/trans/views/edit.py @@ -109,6 +109,22 @@ def cleanup_session(session): del session[key] +def get_sort_name(request): + """Gets sort name.""" + sort_dict = { + "position": "Position", + "priority": "Priority", + "num_words": "Word count", + "context": "Context", + } + result = { + "query": request.GET.get("sort_by", ""), + "name": sort_dict.get(request.GET.get("sort_by", ""), ""), + "direction": request.GET.get("sort_by_direction", ""), + } + return result + + def search(translation, request): """Perform search or returns cached search results.""" # Possible new search @@ -130,6 +146,7 @@ def search(translation, request): if ( session_key in request.session and "offset" in request.GET + and "sort_by" not in request.GET and "items" in request.session[session_key] ): search_result.update(request.session[session_key]) @@ -486,6 +503,7 @@ def translate(request, project, component, lang): # Prepare form form = TranslationForm(request.user, translation, unit) + sort = get_sort_name(request) return render( request, @@ -505,6 +523,9 @@ def translate(request, project, component, lang): "search_items": search_result["items"], "search_query": search_result["query"], "offset": offset, + "sort_name": sort["name"], + "sort_query": sort["query"], + "sort_direction": sort["direction"], "filter_name": search_result["name"], "filter_count": num_results, "filter_pos": offset, From fb366965557641187bb2d3b97b77fc4a896903cc Mon Sep 17 00:00:00 2001 From: Saptak S Date: Fri, 1 May 2020 22:50:11 +0530 Subject: [PATCH 10/17] Shows dropdown labels and enables autosearch in page with results --- weblate/static/loader-bootstrap.js | 18 +++++++++++++++--- weblate/static/style-bootstrap.css | 6 +++++- weblate/templates/snippets/query-field.html | 5 +++-- weblate/trans/views/edit.py | 18 +----------------- weblate/trans/views/search.py | 6 ++++++ weblate/utils/views.py | 17 +++++++++++++++++ 6 files changed, 47 insertions(+), 23 deletions(-) diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index cebe4050c104..95c3a281eb96 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1529,11 +1529,15 @@ $(function () { $button.find('span.search-label').not('#query-sort-toggle span').text($this.text()); if ($this.data('sort')) { $('#id_sort_by').val($this.data('sort')); - $this.closest('form').submit(); + if ($('.pagination').length) { + $this.closest('form').submit(); + } } if ($this.closest('.query-field').length) { $('#id_q').val($this.data('field')); - $this.closest('form').submit(); + if ($('.pagination').length) { + $this.closest('form').submit(); + } } }); $('#query-sort-toggle').click(function () { @@ -1545,7 +1549,9 @@ $(function () { } else { $('#id_sort_direction').val(""); } - $this.closest('form').submit(); + if ($('.pagination').length) { + $this.closest('form').submit(); + } }); $('.search-group input').not('#id_q').on('keydown', function (event) { if (event.key === "Enter") { @@ -1554,6 +1560,12 @@ $(function () { return false; } }); + $('#id_q').on('keydown', function (event) { + console.log("hello") + if (event.key === "Enter") { + $(this).closest('form').submit(); + } + }); $('.search-add').click(function () { var group = $(this).closest('.input-group'); var button = group.find('button'); diff --git a/weblate/static/style-bootstrap.css b/weblate/static/style-bootstrap.css index b4ed95658fb7..d7526d3d8dab 100644 --- a/weblate/static/style-bootstrap.css +++ b/weblate/static/style-bootstrap.css @@ -478,12 +478,16 @@ legend { width: 35px; padding-left: 0; padding-right: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; } #query-sort-toggle span:not(.active) { display: none; } #query-sort-dropdown { - width: 115px; + width: 160px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; } #is-exact span { margin: 4px 4px 0 4px; diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index b051c58c590f..fa1c7d77108f 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -3,7 +3,7 @@ {% load icons %} {% load crispy_forms_field %}
    -
    +
    @@ -27,7 +27,7 @@
    -
    +
    @@ -43,6 +43,7 @@
      +
    • {% trans "Position & Priority" %}
    • {% trans "Position" %}
    • {% trans "Priority" %}
    • {% trans "Word count" %}
      • diff --git a/weblate/trans/views/edit.py b/weblate/trans/views/edit.py index eed817a0d32b..cdbd0a4a45f5 100644 --- a/weblate/trans/views/edit.py +++ b/weblate/trans/views/edit.py @@ -56,7 +56,7 @@ from weblate.utils.hash import hash_to_checksum from weblate.utils.ratelimit import revert_rate_limit, session_ratelimit_post from weblate.utils.state import STATE_FUZZY -from weblate.utils.views import get_translation, show_form_errors +from weblate.utils.views import get_sort_name, get_translation, show_form_errors def get_other_units(unit): @@ -109,22 +109,6 @@ def cleanup_session(session): del session[key] -def get_sort_name(request): - """Gets sort name.""" - sort_dict = { - "position": "Position", - "priority": "Priority", - "num_words": "Word count", - "context": "Context", - } - result = { - "query": request.GET.get("sort_by", ""), - "name": sort_dict.get(request.GET.get("sort_by", ""), ""), - "direction": request.GET.get("sort_by_direction", ""), - } - return result - - def search(translation, request): """Perform search or returns cached search results.""" # Possible new search diff --git a/weblate/trans/views/search.py b/weblate/trans/views/search.py index 42b2e26475b0..2f202d67d003 100644 --- a/weblate/trans/views/search.py +++ b/weblate/trans/views/search.py @@ -44,6 +44,7 @@ get_component, get_paginator, get_project, + get_sort_name, get_translation, import_message, show_form_errors, @@ -148,6 +149,7 @@ def search(request, project=None, component=None, lang=None): """Perform site-wide search on units.""" is_ratelimited = not check_rate_limit("search", request) search_form = SearchForm(request.user, request.GET) + sort = get_sort_name(request) context = {"search_form": search_form} if component: obj = get_component(request, project, component) @@ -197,6 +199,10 @@ def search(request, project=None, component=None, lang=None): context["title"] = _("Search for %s") % (search_form.cleaned_data["q"]) context["query_string"] = search_form.urlencode() context["search_query"] = search_form.cleaned_data["q"] + context["filter_name"] = search_form.get_name() + context["sort_name"] = sort["name"] + context["sort_query"] = sort["query"] + context["sort_direction"] = sort["direction"] elif is_ratelimited: messages.error(request, _("Too many search queries, please try again later.")) elif request.GET: diff --git a/weblate/utils/views.py b/weblate/utils/views.py index ffa93e8ec0c2..0eca9317f78f 100644 --- a/weblate/utils/views.py +++ b/weblate/utils/views.py @@ -80,6 +80,23 @@ def dispatch(self, request, *args, **kwargs): return super().dispatch(request, *args, **kwargs) +def get_sort_name(request): + """Gets sort name.""" + sort_dict = { + "position": "Position", + "priority": "Priority", + "num_words": "Word count", + "context": "Context", + "position,-priority": "Position & Priority", + } + result = { + "query": request.GET.get("sort_by", "position,-priority"), + "name": sort_dict.get(request.GET.get("sort_by", ""), "Position & Priority"), + "direction": request.GET.get("sort_by_direction", ""), + } + return result + + def get_translation(request, project, component, lang, skip_acl=False): """Return translation matching parameters.""" try: From 6d6ead74d1d05bdfd6a15aacb744cb54f77d3be2 Mon Sep 17 00:00:00 2001 From: Saptak S Date: Sat, 2 May 2020 00:29:42 +0530 Subject: [PATCH 11/17] Use bootstrap button group for sorting --- weblate/static/loader-bootstrap.js | 1 - weblate/static/style-bootstrap.css | 8 ++------ weblate/templates/snippets/query-field.html | 6 ++++-- weblate/utils/views.py | 14 ++++++++------ 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index 95c3a281eb96..01b8784a5876 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1561,7 +1561,6 @@ $(function () { } }); $('#id_q').on('keydown', function (event) { - console.log("hello") if (event.key === "Enter") { $(this).closest('form').submit(); } diff --git a/weblate/static/style-bootstrap.css b/weblate/static/style-bootstrap.css index d7526d3d8dab..d1406a2eb867 100644 --- a/weblate/static/style-bootstrap.css +++ b/weblate/static/style-bootstrap.css @@ -475,19 +475,15 @@ legend { } } #query-sort-toggle { - width: 35px; + width: 40px; padding-left: 0; padding-right: 0; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; } #query-sort-toggle span:not(.active) { display: none; } #query-sort-dropdown { - width: 160px; - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; + width: 200px; } #is-exact span { margin: 4px 4px 0 4px; diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index fa1c7d77108f..f9b05937a529 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -43,19 +43,21 @@ +
    + -
    +
    diff --git a/weblate/utils/views.py b/weblate/utils/views.py index 0eca9317f78f..4e79bf4d0d45 100644 --- a/weblate/utils/views.py +++ b/weblate/utils/views.py @@ -83,15 +83,17 @@ def dispatch(self, request, *args, **kwargs): def get_sort_name(request): """Gets sort name.""" sort_dict = { - "position": "Position", - "priority": "Priority", - "num_words": "Word count", - "context": "Context", - "position,-priority": "Position & Priority", + "position": _("Position"), + "priority": _("Priority"), + "num_words": _("Word count"), + "context": _("Context"), + "position,-priority": _("Position and Priority"), } result = { "query": request.GET.get("sort_by", "position,-priority"), - "name": sort_dict.get(request.GET.get("sort_by", ""), "Position & Priority"), + "name": sort_dict.get( + request.GET.get("sort_by", ""), _("Position and Priority") + ), "direction": request.GET.get("sort_by_direction", ""), } return result From 461f0147c4205076a74dbc824e327143c3329b7c Mon Sep 17 00:00:00 2001 From: Saptak S Date: Sun, 3 May 2020 00:27:38 +0530 Subject: [PATCH 12/17] Use default autosizing width of button for sort dropdown --- weblate/static/style-bootstrap.css | 8 ++------ weblate/templates/snippets/query-field.html | 8 ++++---- weblate/utils/views.py | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/weblate/static/style-bootstrap.css b/weblate/static/style-bootstrap.css index d1406a2eb867..eddee426fb59 100644 --- a/weblate/static/style-bootstrap.css +++ b/weblate/static/style-bootstrap.css @@ -475,16 +475,12 @@ legend { } } #query-sort-toggle { - width: 40px; - padding-left: 0; - padding-right: 0; + padding-left: 1rem; + padding-right: 1rem; } #query-sort-toggle span:not(.active) { display: none; } -#query-sort-dropdown { - width: 200px; -} #is-exact span { margin: 4px 4px 0 4px; } diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index f9b05937a529..8991ac50bf98 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -30,8 +30,8 @@
    -
    -
    +
    +
    - +
    -
    -
    -
    +
    +
    +
- + - - +
    -
  • {% trans "Position and priority" %}
    • +
  • {% trans "Position and priority" %}
  • {% trans "Position" %}
  • {% trans "Priority" %}
  • {% trans "Word count" %}
    • diff --git a/weblate/trans/forms.py b/weblate/trans/forms.py index dc153e595293..242d10d93c66 100644 --- a/weblate/trans/forms.py +++ b/weblate/trans/forms.py @@ -636,6 +636,7 @@ class SearchForm(forms.Form): # pylint: disable=invalid-name q = QueryField() + sort_by = forms.CharField(required=False, widget=forms.HiddenInput) checksum = ChecksumField(required=False) offset = forms.IntegerField(min_value=-1, required=False, widget=forms.HiddenInput) diff --git a/weblate/trans/models/unit.py b/weblate/trans/models/unit.py index acc68f6932df..b8d315ca9d7f 100644 --- a/weblate/trans/models/unit.py +++ b/weblate/trans/models/unit.py @@ -116,14 +116,13 @@ def same(self, unit, exclude=True): result = result.exclude(pk=unit.id) return result - def order_by_request(self, request): - sort_list_request = request.GET.get("sort_by", "").split(",") - sort_direction = request.GET.get("sort_by_direction", "") + def order_by_request(self, form_data): + sort_list_request = form_data.get("sort_by", "").split(",") available_sort_choices = ["priority", "position", "context", "num_words"] sort_list = [ - "{}{}".format(sort_direction, choice) + choice for choice in sort_list_request - if choice in available_sort_choices + if choice.replace("-", "") in available_sort_choices ] if not sort_list: return self.order() diff --git a/weblate/trans/views/edit.py b/weblate/trans/views/edit.py index cdbd0a4a45f5..ea25bce651f7 100644 --- a/weblate/trans/views/edit.py +++ b/weblate/trans/views/edit.py @@ -142,7 +142,9 @@ def search(translation, request): name = form.get_name() if form_valid else "" # Grab unit IDs - unit_ids = list(allunits.order_by_request(request).values_list("id", flat=True)) + unit_ids = list( + allunits.order_by_request(form.cleaned_data).values_list("id", flat=True) + ) # Check empty search results if not unit_ids: @@ -509,7 +511,6 @@ def translate(request, project, component, lang): "offset": offset, "sort_name": sort["name"], "sort_query": sort["query"], - "sort_direction": sort["direction"], "filter_name": search_result["name"], "filter_count": num_results, "filter_pos": offset, diff --git a/weblate/trans/views/search.py b/weblate/trans/views/search.py index 2f202d67d003..5e28a8c86a8c 100644 --- a/weblate/trans/views/search.py +++ b/weblate/trans/views/search.py @@ -192,7 +192,7 @@ def search(request, project=None, component=None, lang=None): if lang: units = units.filter(translation__language=context["language"]) - units = get_paginator(request, units.order_by_request(request)) + units = get_paginator(request, units.order_by_request(search_form.cleaned_data)) context["show_results"] = True context["page_obj"] = units @@ -202,7 +202,6 @@ def search(request, project=None, component=None, lang=None): context["filter_name"] = search_form.get_name() context["sort_name"] = sort["name"] context["sort_query"] = sort["query"] - context["sort_direction"] = sort["direction"] elif is_ratelimited: messages.error(request, _("Too many search queries, please try again later.")) elif request.GET: diff --git a/weblate/utils/views.py b/weblate/utils/views.py index 92e5f2b65516..2e4e75c1bcc8 100644 --- a/weblate/utils/views.py +++ b/weblate/utils/views.py @@ -87,14 +87,13 @@ def get_sort_name(request): "priority": _("Priority"), "num_words": _("Word count"), "context": _("Context"), - "position,-priority": _("Position and priority"), + "priority,position": _("Position and priority"), } + sort_params = request.GET.get("sort_by", "-priority,position").replace("-", "") + sort_name = sort_dict.get(sort_params, _("Position and priority")) result = { - "query": request.GET.get("sort_by", "position,-priority"), - "name": sort_dict.get( - request.GET.get("sort_by", ""), _("Position and priority") - ), - "direction": request.GET.get("sort_by_direction", ""), + "query": request.GET.get("sort_by", "-priority,position"), + "name": sort_name, } return result From b9f8d16c4befc0a63e0adcfe0ff1491332837177 Mon Sep 17 00:00:00 2001 From: Saptak S Date: Mon, 4 May 2020 19:05:22 +0530 Subject: [PATCH 15/17] Uses a separate class to identify autosubmit --- weblate/static/loader-bootstrap.js | 6 +++--- weblate/templates/search.html | 2 +- weblate/templates/translate.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index 812ab60c2fe9..0fc76092a12e 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1529,13 +1529,13 @@ $(function () { $button.find('span.search-label').not('#query-sort-toggle span').text($this.text()); if ($this.data('sort')) { $('#id_sort_by').val($this.data('sort')); - if ($('.pagination').length) { + if ($this.closest('.result-page-form').length) { $this.closest('form').submit(); } } if ($this.closest('.query-field').length) { $('#id_q').val($this.data('field')); - if ($('.pagination').length) { + if ($this.closest('.result-page-form').length) { $this.closest('form').submit(); } } @@ -1553,7 +1553,7 @@ $(function () { } }); $('#id_sort_by').val(sort_params.join(",")); - if ($('.pagination').length) { + if ($this.closest('.result-page-form').length) { $this.closest('form').submit(); } }); diff --git a/weblate/templates/search.html b/weblate/templates/search.html index 778f333c4814..33ab086d31a8 100644 --- a/weblate/templates/search.html +++ b/weblate/templates/search.html @@ -45,7 +45,7 @@ {% endif %} {% endif %} -
    + {% include "snippets/search-form.html" %}
    diff --git a/weblate/templates/translate.html b/weblate/templates/translate.html index f0f6085ce51d..1337ecac1efa 100644 --- a/weblate/templates/translate.html +++ b/weblate/templates/translate.html @@ -50,7 +50,7 @@
    -
    + {% crispy search_form %}
    From 00446fe1c5612419cbf8856a7dedbb03bf693d4e Mon Sep 17 00:00:00 2001 From: Saptak S Date: Tue, 5 May 2020 00:24:04 +0530 Subject: [PATCH 16/17] Adds query search field in zen pages --- weblate/static/loader-bootstrap.js | 19 +++++++++++++++ weblate/static/style-bootstrap.css | 16 +++++++------ weblate/templates/snippets/query-field.html | 4 ++-- weblate/templates/translate.html | 6 +---- weblate/templates/zen.html | 26 +++++---------------- weblate/trans/views/edit.py | 3 +++ 6 files changed, 40 insertions(+), 34 deletions(-) diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index 0fc76092a12e..f8631a4722e9 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1509,6 +1509,25 @@ $(function () { $(this).parent().find('input').attr('disabled', '1'); }); + // Show the correct toggle button + var sort_name = $('#query-sort-dropdown span.search-label').text(); + var sort_dropdown_value = $(".sort-field li a").filter(function() { + return $(this).text() == sort_name; + }).data('sort'); + var sort_value = $('#id_sort_by').val(); + console.log(sort_dropdown_value); + console.log(sort_value); + if ( + sort_value.replace("-", "") === sort_dropdown_value.replace("-", "") + && sort_value !== sort_dropdown_value + ) { + $('#query-sort-toggle .asc').hide(); + $('#query-sort-toggle .desc').show(); + } else { + $('#query-sort-toggle .desc').hide(); + $('#query-sort-toggle .asc').show(); + } + /* Branch loading */ $('.branch-loader select[name=component]').change(function () { var $this = $(this); diff --git a/weblate/static/style-bootstrap.css b/weblate/static/style-bootstrap.css index edca4ef575a0..96c85e04694b 100644 --- a/weblate/static/style-bootstrap.css +++ b/weblate/static/style-bootstrap.css @@ -452,7 +452,7 @@ legend { margin: 0 15px 15px 0; } .query-field { - margin-right: 0; + margin: 0; } .search-group input{ height: auto; @@ -467,12 +467,7 @@ legend { font-size: initial; } .sort-field { - margin-right: 0; -} -@media (min-width: 768px) { - .sort-field { - margin-left: -15px; - } + margin: 0; } #query-sort-toggle { padding-left: 1rem; @@ -498,6 +493,9 @@ legend { .dir-rtl .sort-field { margin-right: -15px; } + .query-container { + max-width: calc(100% - 100px); + } } .search-toolbar { margin-bottom: -15px; @@ -1019,6 +1017,10 @@ a.format-item:hover { display: none; width: 0; } + + .query-field .input-group { + width: 100%; + } } @media (max-width: 900px) { .zero-width-900 { diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html index c2004b600b37..974b2c2585ee 100644 --- a/weblate/templates/snippets/query-field.html +++ b/weblate/templates/snippets/query-field.html @@ -51,10 +51,10 @@
    diff --git a/weblate/templates/translate.html b/weblate/templates/translate.html index 1337ecac1efa..4a1d3cf1999b 100644 --- a/weblate/templates/translate.html +++ b/weblate/templates/translate.html @@ -35,7 +35,6 @@ {% perm 'comment.add' project as user_can_add_comment %} {% perm 'glossary.add' project as user_can_add_dictionary %} -
    {% if user_can_translate %} {% icon "flash.svg" %} {% trans "Zen" %} @@ -43,17 +42,14 @@ {% icon "settings.svg" %}
    -
    {% with comments=unit.get_comments nearby=unit.nearby nearby_keys=unit.nearby_keys shapings=unit.shapings%} -
    +
    -
    {% crispy search_form %}
    -
    diff --git a/weblate/templates/zen.html b/weblate/templates/zen.html index 7e3a0607f730..9d23f86b61be 100644 --- a/weblate/templates/zen.html +++ b/weblate/templates/zen.html @@ -29,26 +29,12 @@ {% icon "settings.svg" %}
    -
    - +
    +
    +
    + {% crispy search_form %} +
    +
    diff --git a/weblate/trans/views/edit.py b/weblate/trans/views/edit.py index ea25bce651f7..251961a62dde 100644 --- a/weblate/trans/views/edit.py +++ b/weblate/trans/views/edit.py @@ -691,6 +691,7 @@ def zen(request, project, component, lang): """Generic entry point for translating, suggesting and searching.""" translation = get_translation(request, project, component, lang) search_result, unitdata = get_zen_unitdata(translation, request) + sort = get_sort_name(request) # Handle redirects if isinstance(search_result, HttpResponse): @@ -706,6 +707,8 @@ def zen(request, project, component, lang): "search_query": search_result["query"], "filter_name": search_result["name"], "filter_count": len(search_result["ids"]), + "sort_name": sort["name"], + "sort_query": sort["query"], "last_section": search_result["last_section"], "search_url": search_result["url"], "offset": search_result["offset"], From 5b4e71524172dbd1720c5fd46aafcd00f0792b92 Mon Sep 17 00:00:00 2001 From: Saptak S Date: Tue, 5 May 2020 21:55:22 +0530 Subject: [PATCH 17/17] Adds check to see if the current page has a sort field and a sort value set --- weblate/static/loader-bootstrap.js | 34 ++++++++++++++++-------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/weblate/static/loader-bootstrap.js b/weblate/static/loader-bootstrap.js index f8631a4722e9..9d38b7f2e0b7 100644 --- a/weblate/static/loader-bootstrap.js +++ b/weblate/static/loader-bootstrap.js @@ -1510,22 +1510,24 @@ $(function () { }); // Show the correct toggle button - var sort_name = $('#query-sort-dropdown span.search-label').text(); - var sort_dropdown_value = $(".sort-field li a").filter(function() { - return $(this).text() == sort_name; - }).data('sort'); - var sort_value = $('#id_sort_by').val(); - console.log(sort_dropdown_value); - console.log(sort_value); - if ( - sort_value.replace("-", "") === sort_dropdown_value.replace("-", "") - && sort_value !== sort_dropdown_value - ) { - $('#query-sort-toggle .asc').hide(); - $('#query-sort-toggle .desc').show(); - } else { - $('#query-sort-toggle .desc').hide(); - $('#query-sort-toggle .asc').show(); + if ($('.sort-field').length) { + var sort_name = $('#query-sort-dropdown span.search-label').text(); + var sort_dropdown_value = $(".sort-field li a").filter(function() { + return $(this).text() == sort_name; + }).data('sort'); + var sort_value = $('#id_sort_by').val(); + if (sort_dropdown_value) { + if ( + sort_value.replace("-", "") === sort_dropdown_value.replace("-", "") + && sort_value !== sort_dropdown_value + ) { + $('#query-sort-toggle .asc').hide(); + $('#query-sort-toggle .desc').show(); + } else { + $('#query-sort-toggle .desc').hide(); + $('#query-sort-toggle .asc').show(); + } + } } /* Branch loading */