From 2cdd073a6cfa6a15cf54c69dcdbd5855bea21eff Mon Sep 17 00:00:00 2001
From: Ryan Cross <rcross@amsl.com>
Date: Fri, 4 Mar 2016 23:28:28 +0000
Subject: [PATCH] tweaks to request form ui  - Legacy-Id: 10898

---
 ietf/meeting/views.py                         |  4 +--
 ietf/static/ietf/css/ietf.css                 | 14 ++++++++
 .../static/ietf/js/meeting-interim-request.js | 25 ++++++++++++-
 ietf/templates/meeting/interim_request.html   | 36 +++++++++++--------
 4 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 3de82458c..cbe31cc32 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -892,7 +892,7 @@ def session_details(request, num, acronym ):
 @role_required('Area Director','Secretariat','IRTF Chair','WG Chair')
 def interim_request(request):
     '''View for requesting an interim meeting'''
-    form = InterimRequestForm(request=request)
+    #form = InterimRequestForm(request=request)
 
     if request.method == 'POST':
         form = InterimRequestForm(request, data=request.POST)
@@ -900,7 +900,7 @@ def interim_request(request):
             form.save()
             return redirect(upcoming)
     else:
-        form = InterimRequestForm(request=request)
+        form = InterimRequestForm(request=request,initial={'meeting_type':'single'})
 
     return render(request, "meeting/interim_request.html", {"form":form})
 
diff --git a/ietf/static/ietf/css/ietf.css b/ietf/static/ietf/css/ietf.css
index 21ebd7f27..1b8693e4a 100644
--- a/ietf/static/ietf/css/ietf.css
+++ b/ietf/static/ietf/css/ietf.css
@@ -448,3 +448,17 @@ form.navbar-form input.form-control.input-sm { width: 141px; }
     padding: inherit;
     outline: inherit;
 }
+
+/* Interim Meetings
+   ========================================================================== */
+#meeting-type-options {
+    display: inline-block;
+    margin-left: 4em;
+}
+
+.fieldset {
+    box-shadow: 0 2px 4px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12) !important;
+    background-color: #f1f1f1;
+    padding: 16px 16px;
+    margin-bottom: 20px;
+}
diff --git a/ietf/static/ietf/js/meeting-interim-request.js b/ietf/static/ietf/js/meeting-interim-request.js
index f3f0126c9..25fa0f3e0 100644
--- a/ietf/static/ietf/js/meeting-interim-request.js
+++ b/ietf/static/ietf/js/meeting-interim-request.js
@@ -1,3 +1,26 @@
+
+var interimRequest = {
+    // functions for Interim Meeting Request 
+    init : function() {
+        interimRequest.form = $(this);
+        $('.select2-field').select2();
+        $('#id_face_to_face').change(interimRequest.toggleLocation);
+        $('#id_face_to_face').each(interimRequest.toggleLocation)
+    },
+
+    toggleLocation : function() {
+        if(this.checked){
+            $("#id_city").prop('disabled', false);
+            $("#id_country").prop('disabled', false);
+            $("#id_timezone").prop('disabled', false);
+        } else {
+            $("#id_city").prop('disabled', true);
+            $("#id_country").prop('disabled', true);
+            $("#id_timezone").prop('disabled', true);
+        }
+    }
+}
+
 $(document).ready(function () {
-    $('.select2-field').select2();
+    $('#interim-request-form').each(interimRequest.init);
 });
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
index 9261588f8..1e3c3c004 100644
--- a/ietf/templates/meeting/interim_request.html
+++ b/ietf/templates/meeting/interim_request.html
@@ -15,35 +15,42 @@
   {% origin %}
   <h1>Interim Meeting Request</h1>
 
-  <form method="post" class="form-horizontal">
+  <form id="interim-request-form" role="form" method="post" class="form-horizontal">
     {% csrf_token %}
 
     {% bootstrap_field form.group layout='horizontal' %}
 
-    <div class="form-group">
-        <div class="checkbox">
-            <label class="checkbox-inline">{% render_field form.face_to_face class="form-control" %}Face to Face</label>
+    <div class="form-group form-inline">
+        <div class="col-md-offset-2">
+        
+        <div class="col-md-3">
+        <!-- <div class="checkbox"> -->
+            <label class="checkbox-inline">{% render_field form.face_to_face %}<strong>Face to Face</strong></label>
+        <!-- </div> -->
         </div>
-        
+
+
+        <!-- <div id="meeting-type-options"> -->
+        <div class="col-md-2 radio-inline"><strong>Meeting Type:</strong></div>
         <label class="radio-inline">
-            <input type="radio" name="optradio">Option 1
+            <input type="radio" value="single" name="meeting_type">Single
         </label>
         <label class="radio-inline">
-            <input type="radio" name="optradio">Option 2
+            <input type="radio" value="multi-day" name="meeting_type">Multi-Day
         </label>
         <label class="radio-inline">
-            <input type="radio" name="optradio">Option 3
+            <input type="radio" value="series" name="meeting_type">Series
         </label>
+        <!-- </div> -->
         
-            {% render_field form.multi_day class="form-control" %}
-            {% render_field form.series class="form-control" %}
-        
+        </div>
+
     </div>
 
-    
+    <div class="fieldset">    
     <div class="form-group">
         <label for="face-to_face" class="col-md-2 control-label">Location</label>
-        <div class="form-inline">
+        <div class="col-md-10 form-inline">
             {% render_field form.city class="form-control" placeholder="City" %}
             {% render_field form.country class="form-control" %}
             {% render_field form.timezone class="form-control" %}
@@ -68,13 +75,14 @@
 
     <div class="form-group">
         <label for="agenda" class="col-md-2 control-label">Agenda</label>
-        <div class="col-md-10">{% render_field form.agenda class="form-control" placeholder="Meeting agenda" %}</div>
+        <div class="col-md-10">{% render_field form.agenda class="form-control" rows="6" placeholder="paste agenda here" %}</div>
     </div>
         
     <div class="form-group">
         <label for="agenda_note" class="col-md-2 control-label">Agenda Note</label>
         <div class="col-md-10">{% render_field form.agenda_note class="form-control" placeholder="Note" %}</div>
     </div>
+    </div>  <!-- fieldset -->
 
     {% buttons %}
       <button type="submit" class="btn btn-primary">Submit</button>