diff --git a/bin/vnu.jar b/bin/vnu.jar index dde1acf66..776d5836b 100644 Binary files a/bin/vnu.jar and b/bin/vnu.jar differ diff --git a/ietf/secr/templates/groups/people.html b/ietf/secr/templates/groups/people.html index ac51beafc..3c207d3db 100644 --- a/ietf/secr/templates/groups/people.html +++ b/ietf/secr/templates/groups/people.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load staticfiles widget_tweaks %} {% block title %}Groups - People{% endblock %} @@ -51,9 +51,9 @@ - - - + + + diff --git a/ietf/templates/doc/search/search_form.html b/ietf/templates/doc/search/search_form.html index 241a90bf4..1f40e5a52 100644 --- a/ietf/templates/doc/search/search_form.html +++ b/ietf/templates/doc/search/search_form.html @@ -7,15 +7,13 @@ class="form-horizontal" action="{% url 'ietf.doc.views_search.search' %}"> {% csrf_token %} +
- - {{ form.name|add_class:"form-control"|attr:"placeholder:Document name/title/RFC number" }} - - - + {{ form.name|add_class:"form-control"|attr:"placeholder:Document name/title/RFC number"|attr:"aria-label:Document name/title/RFC number" }} +
{{ form.sort }}
@@ -42,15 +40,15 @@
{{ form.rfcs|add_class:"form-check-input" }} - +
{{ form.activedrafts|add_class:"form-check-input" }} - +
{{ form.olddrafts|add_class:"form-check-input advdoctype" }} - +
{% for value, label in form.fields.doctypes.choices %}
@@ -74,10 +72,10 @@ value="author" {% if form.by.value == "author" %}checked{% endif %} id="author"> - +
-
+
{{ form.author|add_class:"form-control" }}
@@ -88,10 +86,10 @@ value="group" {% if form.by.value == "group" %}checked{% endif %} id="group"> - +
-
+
{{ form.group|add_class:"form-control" }}
@@ -102,10 +100,10 @@ value="area" {% if form.by.value == "area" %}checked{% endif %} id="area"> - +
-
+
{{ form.area|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}
@@ -116,10 +114,10 @@ value="ad" {% if form.by.value == "ad" %}checked{% endif %} id="areadir"> - +
-
+
{{ form.ad|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}
@@ -130,11 +128,11 @@ value="state" {% if form.by.value == "state" %}checked{% endif %} id="state"> - +
-
-
+
{{ form.state|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}
+
{{ form.substate|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}
@@ -145,10 +143,10 @@ value="irtfstate" {% if form.by.value == "irtfstate" %}checked{% endif %} id="irtfstate"> - +
-
+
{{ form.irtfstate|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}
@@ -159,10 +157,10 @@ value="stream" {% if form.by.value == "stream" %}checked{% endif %} id="stream"> - +
-
+
{{ form.stream|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}
@@ -180,8 +178,7 @@
-

- Search page for www.ietf.org website - | - Search page for IETF mail list archives +

+ Search page for www.ietf.org website + Search page for IETF mail list archives

\ No newline at end of file diff --git a/ietf/templates/doc/status_change/edit_related_rows.html b/ietf/templates/doc/status_change/edit_related_rows.html index 26c0413fd..837018db2 100644 --- a/ietf/templates/doc/status_change/edit_related_rows.html +++ b/ietf/templates/doc/status_change/edit_related_rows.html @@ -1,9 +1,9 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% origin %} + {% for rfc,choice_slug in form.relations.items %}
- - - @@ -32,9 +35,9 @@
{% endfor %}
- - - diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html index 089269562..03c9b36b7 100644 --- a/ietf/templates/liaisons/liaison_table.html +++ b/ietf/templates/liaisons/liaison_table.html @@ -21,7 +21,8 @@ {{ liaison.deadline|default:"-"|date:"Y-m-d" }} {% if liaison.deadline and not liaison.action_taken %}
-
- + + {{ form.text|add_class:"form-control"|attr:"placeholder:Title, body, identifiers, etc."|attr:"aria-label:Liaison search" }}
+ {% for np in nominee_positions %} {% if is_chair and nomcom.group.state_id == 'active' %} + {% for nominee in nominees %} {% endif %} + {% for choice in form.type.field.choices %} @@ -181,4 +182,4 @@

{% endif %} {% endblock %} -{% block js %}{{ formset.media.js }}{% endblock %} +{% block js %}{{ formset.media.js }}{% endblock %} \ No newline at end of file diff --git a/ietf/templates/registration/edit_profile.html b/ietf/templates/registration/edit_profile.html index d6d83dba3..bebf8a924 100644 --- a/ietf/templates/registration/edit_profile.html +++ b/ietf/templates/registration/edit_profile.html @@ -132,25 +132,24 @@ + {% for email in emails %}
{{ form.name.errors }}{{ form.name }}{{ form.person.errors }}{{ form.person }}{% if form.person.help_text %}
{{ form.person.help_text }}{% endif %}
{{ form.email.errors }}{{ form.email }}{% if form.email.help_text %}
{{ form.email.help_text }}{% endif %}
{{ form.name.errors }}{{ form.name|attr:"aria-label:Name" }}{{ form.person.errors }}{{ form.person|attr:"aria-label:Person" }}{% if form.person.help_text %}
{{ form.person.help_text }}{% endif %}
{{ form.email.errors }}{{ form.email|attr:"aria-label:Email" }}{% if form.email.help_text %}
{{ form.email.help_text }}{% endif %}
- @@ -246,4 +247,4 @@ {% endblock %} {% block js %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/nomcom/send_reminder_mail.html b/ietf/templates/nomcom/send_reminder_mail.html index 1064f037e..b72ba4cb4 100644 --- a/ietf/templates/nomcom/send_reminder_mail.html +++ b/ietf/templates/nomcom/send_reminder_mail.html @@ -39,13 +39,14 @@
- diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html index f13b576ad..72b4beb06 100644 --- a/ietf/templates/nomcom/view_feedback_pending.html +++ b/ietf/templates/nomcom/view_feedback_pending.html @@ -104,15 +104,16 @@
{{ form.instance.time|date:"r" }}{{ form.id }} -
- - {% if email.origin == person.user.username or email.origin == '' %} diff --git a/ietf/templates/stats/review_stats.html b/ietf/templates/stats/review_stats.html index 795bc1d31..8cf43a9f2 100644 --- a/ietf/templates/stats/review_stats.html +++ b/ietf/templates/stats/review_stats.html @@ -51,10 +51,11 @@
- + -