diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py index 3747678aa..34e7d0004 100644 --- a/ietf/meeting/forms.py +++ b/ietf/meeting/forms.py @@ -10,6 +10,7 @@ from django.utils import six from ietf.group.models import Group from ietf.ietfauth.utils import has_role from ietf.meeting.models import Meeting, Schedule, TimeSlot, Session, SchedTimeSessAssignment, countries, timezones +from ietf.utils.fields import DatepickerDateField # need to insert empty option for use in ChoiceField countries.insert(0, ('', '-'*9 )) @@ -115,21 +116,24 @@ class GroupModelChoiceField(forms.ModelChoiceField): class InterimRequestForm(forms.Form): group = GroupModelChoiceField(queryset = Group.objects.filter(type__in=('wg','rg'),state='active').order_by('acronym')) - date = forms.DateField() + face_to_face = forms.BooleanField(required=False) + multi_day = forms.BooleanField(required=False) + series = forms.BooleanField(required=False) + date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Date', required=True) time = forms.TimeField() duration = DurationField() - face_to_face = forms.BooleanField(required=False) city = forms.CharField(max_length=255,required=False) country = forms.ChoiceField(choices=countries,required=False) timezone = forms.ChoiceField(choices=timezones) - remote_instructions = forms.CharField(max_length=1024) - agenda = forms.CharField(widget=forms.Textarea) - agenda_note = forms.CharField(widget=forms.Textarea) + remote_instructions = forms.CharField(max_length=1024,required=False) + agenda = forms.CharField(required=False,widget=forms.Textarea) + agenda_note = forms.CharField(max_length=255,required=False) def __init__(self, request, *args, **kwargs): super(InterimRequestForm, self).__init__(*args, **kwargs) self.user = request.user self.person = self.user.person + self.fields["group"].widget.attrs["class"] = "select2-field" self.set_group_options() diff --git a/ietf/static/ietf/js/meeting-interim-request.js b/ietf/static/ietf/js/meeting-interim-request.js new file mode 100644 index 000000000..f3f0126c9 --- /dev/null +++ b/ietf/static/ietf/js/meeting-interim-request.js @@ -0,0 +1,3 @@ +$(document).ready(function () { + $('.select2-field').select2(); +}); diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html index 02d53f780..9261588f8 100644 --- a/ietf/templates/meeting/interim_request.html +++ b/ietf/templates/meeting/interim_request.html @@ -1,10 +1,16 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} -{% load bootstrap3 %} +{% load staticfiles bootstrap3 widget_tweaks %} {% block title %}Interim Request{% endblock %} +{% block pagehead %} + + + +{% endblock %} + {% block content %} {% origin %}