Merge branch 'master' of grimbox.be:Sulley/Ultron

templates/locations/places/create.html

@@ -27,20 +27,20 @@
                     </div>
                     <div class="form-group row {% if form.address.errors %}has-error has-feedback{% endif %}">
                         <label for="id_name" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Address*</label>
-                        <div class="col-8 col-sm-6 col-md-6 col-lg-6 col-xl-6">
+                        <div class="col-8 col-sm-6 col-md-6 col-lg-6 col-xl-8">
                             {{ form.address }}
                             {% if form.address.errors %}<span class="btn btn-sm btn-danger-outline">{% for error in form.address.errors %}{{error}}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
                     <div class="form-group row {% if form.postal.errors %}has-error has-feedback{% endif %}">
                         <label for="id_name" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">&nbsp;</label>
-                        <div class="col-8 col-sm-6 col-md-6 col-lg-6 col-xl-6">
+                        <div class="col-xl-8">
                             <div class="row">
-                                <div class="col-7 col-sm-5 col-md-5 col-lg-5 col-xl-3 pr-0">
+                                <div class="col-7 col-sm-5 col-md-5 col-lg-5 col-xl-4 pr-0">
                                     {{ form.postal }}
                                     {% if form.postal.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.postal.errors %}{{error}}{% endfor %}</span>{% endif %}
                                 </div>
-                                <div class="col-12 col-sm-7 col-md-7 col-lg-7 col-xl-9">
+                                <div class="col-12 col-sm-7 col-md-7 col-lg-7 col-xl-8">
                                     {{ form.city }}
                                     {% if form.city.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.city.errors %}{{error}}{% endfor %}</span>{% endif %}
                                 </div>

ultron/followup/forms.py

@@ -31,8 +31,8 @@ class ChronoForm(forms.ModelForm):
                     "value": date.today().strftime("%Y-%m-%d"),
                 }
             ),
-            "chrono_type": forms.Select(attrs={"class": "form-control"}),
-            "score_type": forms.Select(attrs={"class": "form-control"}),
+            "chrono_type": forms.Select(attrs={"class": "form-control selectpicker"}),
+            "score_type": forms.Select(attrs={"class": "form-control selectpicker"}),
             "score": forms.TextInput(
                 attrs={"class": "form-control", "placeholder": "xx,xxx"}
             ),
@@ -64,7 +64,7 @@ class LearnedSkillForm(forms.ModelForm):
                     "value": date.today().strftime("%Y-%m-%d"),
                 }
             ),
-            "cando": forms.Select(attrs={"class": "form-control"}),
+            "cando": forms.Select(attrs={"class": "form-control selectpicker"}),
         }
 
     gymnast_related = forms.CharField(
@@ -112,7 +112,7 @@ class ScoreForm(forms.ModelForm):
         widgets = {
             "gymnast": forms.HiddenInput(),
             "event": forms.HiddenInput(),
-            "routine_type": forms.Select(attrs={"class": "form-control"}),
+            "routine_type": forms.Select(attrs={"class": "form-control selectpicker"}),
             "point_execution": forms.NumberInput(
                 attrs={
                     "class": "form-control",
@@ -287,7 +287,7 @@ class GymnastHasRoutineForm(forms.ModelForm):
         widgets = {
             "gymnast": forms.HiddenInput(),
             "routine": forms.HiddenInput(),
-            "routine_type": forms.Select(attrs={"class": "form-control"}),
+            "routine_type": forms.Select(attrs={"class": "form-control selectpicker"}),
             "datebegin": forms.DateInput(
                 attrs={
                     "class": "form-control datepicker",
@@ -382,7 +382,7 @@ class NumberOfRoutineDoneForm(forms.ModelForm):
         widgets = {
             "gymnast": forms.HiddenInput(),
             "routine": forms.HiddenInput(),
-            "routine_type": forms.Select(attrs={"class": "form-control"}),
+            "routine_type": forms.Select(attrs={"class": "form-control selectpicker"}),
             "date": forms.DateInput(
                 attrs={
                     "class": "form-control datepicker",

ultron/location/forms.py

@@ -26,7 +26,7 @@ class PlaceForm(forms.ModelForm):
                 attrs={"class": "form-control", "placeholder": "Address"}
             ),
             "postal": forms.TextInput(
-                attrs={"class": "form-control", "placeholder": "ZIP Code"}
+                attrs={"class": "form-control", "placeholder": "ZIP"}
             ),
             "city": forms.TextInput(
                 attrs={"class": "form-control", "placeholder": "City"}

ultron/people/forms.py

@@ -27,7 +27,7 @@ class GymnastForm(forms.ModelForm):
                 attrs={"class": "form-control", "placeholder": "Firstname"}
             ),
             "birthdate": forms.DateInput(attrs={"class": "form-control datepicker"}),
-            "gender": forms.Select(attrs={"class": "form-control"}),
+            "gender": forms.Select(attrs={"class": "form-control selectpicker"}),
             "club": forms.HiddenInput(),
             "trainings_by_week": forms.TextInput(
                 attrs={"class": "form-control", "placeholder": "5"}

ultron/planning/forms.py

@@ -23,7 +23,7 @@ class EventForm(forms.ModelForm):
         )
         widgets = {
             "place": forms.HiddenInput(),
-            "eventtype": forms.Select(attrs={"class": "form-control"}),
+            "eventtype": forms.Select(attrs={"class": "form-control selectpicker"}),
             "name": forms.TextInput(
                 attrs={"class": "form-control", "placeholder": "Even's name"}
             ),

ultron/profiles/forms.py

@@ -14,8 +14,8 @@ class ProfileForm(forms.ModelForm):
             "is_sidebar_minified",
         )
         widgets = {
-            "template_color": forms.Select(attrs={"class": "form-control"}),
-            "sidebar_color": forms.Select(attrs={"class": "form-control"}),
+            "template_color": forms.Select(attrs={"class": "form-control selectpicker"}),
+            "sidebar_color": forms.Select(attrs={"class": "form-control selectpicker"}),
             "is_sidebar_minified": forms.CheckboxInput(
                 attrs={
                     "class": "bootstrap-switch mt-0",