Merge remote-tracking branch 'upstream/dev' into fix531a

savoirfairelinux · Dec 12, 2016 · e516edd · e516edd
2 parents 1fc2c08 + f25d11b
commit e516edd
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/src/frontend/js/global.js b/src/frontend/js/global.js
@@ -14,7 +14,10 @@ $(function() {
     });
 
     $('.ui.accordion').accordion();
-    $('.ui.dropdown').dropdown({transition: 'drop'});
+    $('.ui.dropdown').dropdown({
+        transition: 'drop',
+        fullTextSearch: 'exact'
+    });
 
     $('.ui.calendar').calendar({
         type: 'date',

diff --git a/src/member/templates/client/partials/filters.html b/src/member/templates/client/partials/filters.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-
+{% load member_extras %}
 <form action="" method="get" class="ui form">
 
     <div class="inline fields">
@@ -15,19 +15,19 @@
         <div class="field">
             <label>{% trans 'Route' %}</label>
             <div class="field">
-                {{ filter.form.route }}
+                {{ filter.form.route|alter_field_class:'ui dropdown' }}
             </div>
         </div>
         <div class="field">
             <label>{% trans 'Status' %}</label>
             <div class="field">
-                {{ filter.form.status }}
+                {{ filter.form.status|alter_field_class:'ui dropdown' }}
             </div>
         </div>
         <div class="field">
             <label>{% trans 'Delivery' %}</label>
             <div class="field">
-                {{ filter.form.delivery_type }}
+                {{ filter.form.delivery_type|alter_field_class:'ui dropdown' }}
             </div>
         </div>
         <input id="id_display" name="display" type="text" value="{{display}}" style="display:none">

diff --git a/src/member/templatetags/member_extras.py b/src/member/templatetags/member_extras.py
@@ -46,3 +46,8 @@ def readable_prefs(value):
 @register.filter
 def get_item(o, key):
     return o[key]
+
+
+@register.filter(name='alter_field_class')
+def alter_field_class(field, css):
+    return field.as_widget(attrs={"class": css})
diff --git a/src/note/templates/notes_list.html b/src/note/templates/notes_list.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 <!-- Load internationalisation utils-->
 {% load i18n %}
-
+{% load member_extras %}
 {% block title %}{% trans "Staff Notes" %}{% endblock %}
 
 {% block content %}
@@ -42,13 +42,13 @@ <h1 class="ui header">{% trans "Staff Notes" %}</h1>
           <div class="field">
             <label>{% trans "Priority" %}</label>
             <div class="field">
-              {{ filter.form.priority }}
+              {{ filter.form.priority|alter_field_class:'ui dropdown' }}
             </div>
           </div>
           <div class="field">
             <label>{% trans "Is read" %}</label>
             <div class="field">
-              {{ filter.form.is_read }}
+              {{ filter.form.is_read|alter_field_class:'ui dropdown' }}
             </div>
           </div>
         </div>

diff --git a/src/order/templates/order/partials/filters.html b/src/order/templates/order/partials/filters.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load member_extras %}
 
 <form action="" method="get" class="ui form">
 
@@ -15,7 +16,7 @@
         <div class="field">
             <label>{% trans 'Status' %}</label>
             <div class="field">
-                {{ filter.form.status }}
+                {{ filter.form.status|alter_field_class:'ui dropdown' }}
             </div>
         </div>
         <div class="field">