From 2ac96942b373c7988853f5b711ce6c4c9d9574dd Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Fri, 23 Jan 2015 17:09:53 +0000
Subject: [PATCH] Summary: Port the remaining JS parts of IPR tool, still
 missing some templates though  - Legacy-Id: 8901

---
 ietf/ipr/forms.py                             |  3 ++-
 .../doc/status_change/make_last_call.html     |  4 ++--
 ietf/templates/ipr/details_view.html          |  5 ----
 ietf/templates/ipr/email.html                 |  9 ++++----
 ietf/templates/ipr/search.html                |  5 ++--
 ietf/templates/ipr/search_form.html           |  2 +-
 ietf/templates/ipr/search_result.html         |  4 ++--
 static/facelift/js/ipr-search.js              | 23 +++++++++++++++++++
 8 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 static/facelift/js/ipr-search.js

diff --git a/ietf/ipr/forms.py b/ietf/ipr/forms.py
index 06032de51..d65105437 100644
--- a/ietf/ipr/forms.py
+++ b/ietf/ipr/forms.py
@@ -12,6 +12,7 @@ from ietf.ipr.models import (IprDocRel, IprDisclosureBase, HolderIprDisclosure,
     GenericIprDisclosure, ThirdPartyIprDisclosure, NonDocSpecificIprDisclosure,
     IprLicenseTypeName, IprDisclosureStateName)
 from ietf.message.models import Message
+from ietf.utils.fields import DatepickerDateField
 
 # ----------------------------------------------------------------
 # Globals
@@ -232,7 +233,7 @@ class GenericIprDisclosureForm(IprDisclosureFormBase):
         exclude = [ 'by','docs','state','rel' ]
         
 class MessageModelForm(forms.ModelForm):
-    response_due = forms.DateField(required=False,help_text='The date which a response is due')
+    response_due = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, required=False, help_text='The date which a response is due')
     
     class Meta:
         model = Message
diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html
index 4ce606918..fc1e47648 100644
--- a/ietf/templates/doc/status_change/make_last_call.html
+++ b/ietf/templates/doc/status_change/make_last_call.html
@@ -3,7 +3,7 @@
 {% load bootstrap3 %}
 
 {% block pagehead %}
-<link rel="stylesheet" href="/facelift/css/lib/datepicker3.css"></link>
+  <link rel="stylesheet" href="/facelift/css/lib/datepicker3.css"></link>
 {% endblock %}
 
 {% block title %}Make last call for {{ doc.name }}{% endblock %}
@@ -33,7 +33,7 @@
 
 
 {% block js %}
-<script src="/facelift/js/lib/bootstrap-datepicker.js"></script>
+  <script src="/facelift/js/lib/bootstrap-datepicker.js"></script>
 {% endblock %}
 
 {% block scripts %}
diff --git a/ietf/templates/ipr/details_view.html b/ietf/templates/ipr/details_view.html
index 97af56fc5..4a010612b 100644
--- a/ietf/templates/ipr/details_view.html
+++ b/ietf/templates/ipr/details_view.html
@@ -283,8 +283,3 @@
       {% endif %}
 
 {% endblock %} <!-- tab_content -->
-
-{% block js %}
-<script type="text/javascript" src="/js/jquery-ui-1.8.11.custom.min.js"></script>
-<script type="text/javascript" src="/js/ipr-view.js"></script>
-{% endblock %}
diff --git a/ietf/templates/ipr/email.html b/ietf/templates/ipr/email.html
index 309ba3c96..6a262a3fe 100644
--- a/ietf/templates/ipr/email.html
+++ b/ietf/templates/ipr/email.html
@@ -3,8 +3,8 @@
 {% block title %}IPR Email{% endblock %}
 
 {% block pagehead %}
-<link rel="stylesheet" type="text/css" href="/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css"></link>
-<link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
+  <link rel="stylesheet" href="/facelift/css/lib/datepicker3.css"></link>
+  <link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
 {% endblock %}
 
 
@@ -38,6 +38,5 @@
 {% endblock %}
 
 {% block js %}
-<script type="text/javascript" src="/js/jquery-ui-1.8.11.custom.min.js"></script>
-<script type="text/javascript" src="/js/ipr-email.js"></script>
-{% endblock %}
\ No newline at end of file
+  <script src="/facelift/js/lib/bootstrap-datepicker.js"></script>
+{% endblock %}
diff --git a/ietf/templates/ipr/search.html b/ietf/templates/ipr/search.html
index 6dd6ffe13..8b43433ed 100644
--- a/ietf/templates/ipr/search.html
+++ b/ietf/templates/ipr/search.html
@@ -1,7 +1,7 @@
 {% extends "ietf.html" %}
 
 {% block pagehead %}
-<link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
+  <link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
 {% endblock %}
 
 {% block title %}IPR search{% endblock %}
@@ -11,6 +11,5 @@
 {% endblock %}
 
 {% block js %}
-<script type="text/javascript" src="/js/lib/jquery-1.8.2.min.js"></script>
-<script type="text/javascript" src="/js/ipr-search.js"></script>
+  <script type="text/javascript" src="/facelift/js/ipr-search.js"></script>
 {% endblock %}
diff --git a/ietf/templates/ipr/search_form.html b/ietf/templates/ipr/search_form.html
index a1b5e489f..ab03e59ac 100644
--- a/ietf/templates/ipr/search_form.html
+++ b/ietf/templates/ipr/search_form.html
@@ -2,7 +2,7 @@
 
 <h1>IPR Search</h1>
 
-<form role="form">
+<form class="ipr-search" role="form">
   {% if user|has_role:"Secretariat" %}
     <div class="col-md-12">
       <h2>State Filter</h2>
diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html
index 0b428b331..ec6c23bb4 100644
--- a/ietf/templates/ipr/search_result.html
+++ b/ietf/templates/ipr/search_result.html
@@ -5,7 +5,7 @@
 {% block title %}IPR disclosures{% endblock %}
 
 {% block pagehead %}
-<link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
+  <link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
 {% endblock %}
 
 {% block content %}
@@ -82,5 +82,5 @@
 {% endblock %}
 
 {% block js %}
-<script type="text/javascript" src="/js/ipr-search.js"></script>
+  <script type="text/javascript" src="/facelift/js/ipr-search.js"></script>
 {% endblock %}
diff --git a/static/facelift/js/ipr-search.js b/static/facelift/js/ipr-search.js
new file mode 100644
index 000000000..a3be08dc0
--- /dev/null
+++ b/static/facelift/js/ipr-search.js
@@ -0,0 +1,23 @@
+$(document).ready(function() {
+    // hack the "All States" check box
+    $("#id_state input[value!=all]").change(function(e) {
+        if (this.checked) {
+            $("#id_state input[value=all]").prop('checked',false);
+        }
+    });
+
+    $("#id_state_0").change(function(e) {
+        if (this.checked) {
+            $("#id_state input[value!=all]").prop('checked',false);
+        }
+    });
+
+    $("form.ipr-search input,select").keyup(function (e) {
+        if (e.which == 13) {
+            $(this).next('button[type=submit]').click();
+            return false;
+        } else {
+            return true;
+        }
+    });
+});