From 1bd091021033a8871d5dc21498212f2ac614381c Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Mon, 26 Jan 2015 12:56:39 +0000
Subject: [PATCH] Summary: Move required field asterisk handling to ietf.js,
 fix some cosmetic stuff in the facelifted IPR code  - Legacy-Id: 8917

---
 ietf/templates/ipr/add_comment.html  | 2 +-
 ietf/templates/ipr/add_email.html    | 2 +-
 ietf/templates/ipr/details_edit.html | 5 +++--
 ietf/templates/liaisons/edit.html    | 2 +-
 static/facelift/js/ietf.js           | 6 ++++++
 static/facelift/js/ipr-edit.js       | 1 -
 static/facelift/js/ipr-search.js     | 1 +
 static/facelift/js/liaisons.js       | 2 --
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ietf/templates/ipr/add_comment.html b/ietf/templates/ipr/add_comment.html
index df7f37d2a..8f3c457bc 100644
--- a/ietf/templates/ipr/add_comment.html
+++ b/ietf/templates/ipr/add_comment.html
@@ -11,7 +11,7 @@
 
   {% bootstrap_messages %}
 
-  <form class="add-comment" method="post">
+  <form role="form" class="add-comment" method="post">
     {% csrf_token %}
 
     {% bootstrap_form form %}
diff --git a/ietf/templates/ipr/add_email.html b/ietf/templates/ipr/add_email.html
index c7feb0e8c..ac2e80b54 100644
--- a/ietf/templates/ipr/add_email.html
+++ b/ietf/templates/ipr/add_email.html
@@ -15,7 +15,7 @@
 
   {% bootstrap_messages %}
 
-  <form class="add-email" method="post">
+  <form role="form" class="add-email" method="post">
     {% csrf_token %}
 
     {% bootstrap_form form %}
diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html
index a5e54052d..eb236b93a 100644
--- a/ietf/templates/ipr/details_edit.html
+++ b/ietf/templates/ipr/details_edit.html
@@ -11,7 +11,6 @@
 {% endblock %}
 
 {% block content %}
-  {% bootstrap_messages %}
 
 {% if form.instance|to_class_name == "HolderIprDisclosure" %}
   <h1>The Patent Disclosure and Licensing Declaration Template for Specific IPR Disclosures</h1>
@@ -62,7 +61,9 @@
 	will be posted, but will be marked as "non-compliant".
 </p>
 
-<form class="ipr-form form-horizontal" role="form" method="post">
+{% bootstrap_messages %}
+
+<form class="ipr-form form-horizontal show-required" role="form" method="post">
   {% csrf_token %}
 
   {% if form.errors %}
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html
index 272783be0..bfc95cfe9 100644
--- a/ietf/templates/liaisons/edit.html
+++ b/ietf/templates/liaisons/edit.html
@@ -34,7 +34,7 @@
   <p class="help-block">Fields marked with <label class="required"></label> are required. For detailed descriptions of the fields see the <a href="{% url "liaisons_field_help" %}">field help</a>.</p>
 {% endif %}
 
-<form role="form" class="liaisons form-horizontal" method="post" enctype="multipart/form-data" data-ajax-info-url="{% url "ietf.liaisons.views.ajax_get_liaison_info" %}">{% csrf_token %}
+<form role="form" class="liaisons form-horizontal show-required" method="post" enctype="multipart/form-data" data-ajax-info-url="{% url "ietf.liaisons.views.ajax_get_liaison_info" %}">{% csrf_token %}
 
   {% for fieldset in form.get_fieldsets %}
     <h2>{{ fieldset.name }}</h2>
diff --git a/static/facelift/js/ietf.js b/static/facelift/js/ietf.js
index 78e5e5b0b..d8ed0621a 100644
--- a/static/facelift/js/ietf.js
+++ b/static/facelift/js/ietf.js
@@ -246,3 +246,9 @@ $(document).ready(function () {
 
 // Use the Bootstrap3 tooltip plugin for all elements with a title attribute
 $('[title][title!=""]').tooltip();
+
+$(document).ready(function () {
+    // add a required class on labels on forms that should have
+    // explicit requirement asterisks
+    $("form.show-required input[required],select[required],textarea[required]").closest(".form-group").find("label").addClass("required");
+});
diff --git a/static/facelift/js/ipr-edit.js b/static/facelift/js/ipr-edit.js
index c6be6eb2e..c1a735e82 100644
--- a/static/facelift/js/ipr-edit.js
+++ b/static/facelift/js/ipr-edit.js
@@ -1,7 +1,6 @@
 $(document).ready(function() {
     var form = $(".ipr-form");
 
-    form.find("input[required],select[required],textarea[required]").closest(".form-group").find("label").addClass("required");
     var template = form.find('.draft-row.template');
 
     var templateData = template.clone();
diff --git a/static/facelift/js/ipr-search.js b/static/facelift/js/ipr-search.js
index a3be08dc0..40e65612c 100644
--- a/static/facelift/js/ipr-search.js
+++ b/static/facelift/js/ipr-search.js
@@ -12,6 +12,7 @@ $(document).ready(function() {
         }
     });
 
+    // make enter presses submit through the nearby button
     $("form.ipr-search input,select").keyup(function (e) {
         if (e.which == 13) {
             $(this).next('button[type=submit]').click();
diff --git a/static/facelift/js/liaisons.js b/static/facelift/js/liaisons.js
index 03efca4fc..686a5a4f8 100644
--- a/static/facelift/js/liaisons.js
+++ b/static/facelift/js/liaisons.js
@@ -309,8 +309,6 @@ $(document).ready(function () {
 
 
         // init form
-        form.find("input[required],select[required],textarea[required]").closest(".form-group").find("label").addClass("required");
-
         organization.change(function() { updateInfo(false, 'to'); });
         organization.change(checkOtherSDO);
         from.change(function() { checkFrom(false); });