Use bootstrap button group for sorting

WeblateOrg · May 1, 2020 · 6d6ead7 · 6d6ead7
1 parent fb36696
commit 6d6ead7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git 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
@@ -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
@@ -43,19 +43,21 @@
             <input type="hidden" id="id_sort_by" name="sort_by" value="{{ sort_query|default:'position,-priority' }}" aria-label="{% trans "Sort By" %}" />
             <input type="hidden" id="id_sort_direction" name="sort_by_direction" value="{{ sort_direction|default:'' }}" aria-label="{% trans "Sort By" %}" />
             <ul class="dropdown-menu">
-              <li><a data-sort="position,-priority">{% trans "Position & Priority" %}</a></li>
+              <li><a data-sort="position,-priority">{% trans "Position and Priority" %}</a></li>
               <li><a data-sort="position">{% trans "Position" %}</a></li>
               <li><a data-sort="priority">{% trans "Priority" %}</a></li>
               <li><a data-sort="num_words">{% trans "Word count" %}</a></li>
               <li><a data-sort="context">{% trans "Context" %}</a></li>
             </ul>
+          </div>
+          <span class="input-group-btn">
             <button type="button" id="query-sort-toggle" class="btn btn-default search-field">
               <span class="search-label asc {% if not sort_direction %}active{% endif %}">
                 {% icon "sort-ascending.svg" %}
               </span>
               <span class="search-label desc {% if sort_direction %}active{% endif %}">{% icon "sort-descending.svg" %}</span>
             </button>
-          </div>
+          </span>
         </div><!-- /input-group -->
       </div>
     </div>

diff --git 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