diff --git a/bin/test-crawl b/bin/test-crawl index 980e405bd..43fa49de2 100755 --- a/bin/test-crawl +++ b/bin/test-crawl @@ -187,7 +187,7 @@ def check_html_valid(url, response, args): (" " * m["hiliteStart"], "^" * m["hiliteLength"])) # disregard some HTML issues that are (usually) due to invalid # database content - if not re.search('Forbidden code point|Bad value|seamless|The first child', m["message"]): + if not re.search('Forbidden code point|Bad value|seamless|The first child|Duplicate ID|The first occurrence of ID', m["message"]): warnings += 1 else: try: diff --git a/bin/vnu.jar b/bin/vnu.jar index 2f0436b9e..661366f39 100644 Binary files a/bin/vnu.jar and b/bin/vnu.jar differ diff --git a/ietf/group/migrations/0010_iab_programs.py b/ietf/group/migrations/0010_iab_programs.py index 84ebaa867..339d08827 100644 --- a/ietf/group/migrations/0010_iab_programs.py +++ b/ietf/group/migrations/0010_iab_programs.py @@ -628,9 +628,9 @@ References * “Procedures for Handling Liaison Statements to and from the IETF”, `RFC 4053`__ * “Guidelines for Acting as an IETF Liaison to Another Organization”, `RFC 4691`__ -__ http:/www.rfc-editor.org/rfc/rfc4052 -__ http:/www.rfc-editor.org/rfc/rfc4053 -__ http:/www.rfc-editor.org/rfc/rfc4691 +__ http://www.rfc-editor.org/rfc/rfc4052 +__ http://www.rfc-editor.org/rfc/rfc4053 +__ http://www.rfc-editor.org/rfc/rfc4691 Other Links ----------- diff --git a/ietf/templates/doc/search/search_form.html b/ietf/templates/doc/search/search_form.html index 9ac33521f..3b0809882 100644 --- a/ietf/templates/doc/search/search_form.html +++ b/ietf/templates/doc/search/search_form.html @@ -54,8 +54,8 @@ <div class="form-group search_field"> <div class="col-sm-4"> - <input type="radio" name="by" value="author" {% if form.by.value == "author" %}checked{% endif %} id="id_author"/> - <label for="id_author" class="control-label">Author</label> + <input type="radio" name="by" value="author" {% if form.by.value == "author" %}checked{% endif %} id="author"/> + <label for="author" class="control-label">Author</label> </div> <div class="col-sm-8"> {{ form.author|add_class:"form-control" }} @@ -64,8 +64,8 @@ <div class="form-group search_field"> <div class="col-sm-4"> - <input type="radio" name="by" value="group" {% if form.by.value == "group" %}checked{% endif %} id="id_group"/> - <label for="id_group" class="control-label">WG</label> + <input type="radio" name="by" value="group" {% if form.by.value == "group" %}checked{% endif %} id="group"/> + <label for="group" class="control-label">WG</label> </div> <div class="col-sm-8"> {{ form.group|add_class:"form-control" }} @@ -75,8 +75,8 @@ <div class="form-group search_field"> <div class="col-sm-4"> - <input type="radio" name="by" value="area" {% if form.by.value == "area" %}checked{% endif %} id="id_area"/> - <label for="id_area" class="control-label">Area</label> + <input type="radio" name="by" value="area" {% if form.by.value == "area" %}checked{% endif %} id="area"/> + <label for="area" class="control-label">Area</label> </div> <div class="col-sm-8"> {{ form.area|add_class:"form-control" }} @@ -85,8 +85,8 @@ <div class="form-group search_field"> <div class="col-sm-4"> - <input type="radio" name="by" value="ad" {% if form.by.value == "ad" %}checked{% endif %} id="id_ad"/> - <label for="id_ad" class="control-label">AD</label> + <input type="radio" name="by" value="ad" {% if form.by.value == "ad" %}checked{% endif %} id="areadir"/> + <label for="areadir" class="control-label">AD</label> </div> <div class="col-sm-8"> {{ form.ad|add_class:"form-control" }} @@ -95,8 +95,8 @@ <div class="form-group search_field"> <div class="col-sm-4"> - <input type="radio" name="by" value="state" {% if form.by.value == "state" %}checked{% endif %} id="id_state"/> - <label for="id_state" class="control-label">IESG State</label> + <input type="radio" name="by" value="state" {% if form.by.value == "state" %}checked{% endif %} id="state"/> + <label for="state" class="control-label">IESG State</label> </div> <div class="col-sm-4"> {{ form.state|add_class:"form-control col-sm-4" }} @@ -108,8 +108,8 @@ <div class="form-group search_field"> <div class="col-sm-4"> - <input type="radio" name="by" value="stream" {% if form.by.value == "stream" %}checked{% endif %} id="id_stream"/> - <label for="id_stream" class="control-label">Stream</label> + <input type="radio" name="by" value="stream" {% if form.by.value == "stream" %}checked{% endif %} id="stream"/> + <label for="stream" class="control-label">Stream</label> </div> <div class="col-sm-4"> {{ form.stream|add_class:"form-control" }} diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html index 9593ca26a..b2f9d45c5 100644 --- a/ietf/templates/meeting/session_details.html +++ b/ietf/templates/meeting/session_details.html @@ -79,7 +79,7 @@ <div class="panel panel-default"> <div class="panel-heading" data-toggle="tooltip" title="Drag and drop to reorder slides">Slides</div> <div class="panel-body"> - <table class="table table-condensed table-striped" id="slides"> + <table class="table table-condensed table-striped slides"> <tbody> {% for pres in session.filtered_slides %} <tr data-order="{{pres.order}}" data-url="{% url 'ietf.meeting.views.set_slide_order' session_id=session.pk num=session.meeting.number name=pres.document.name %}"> @@ -174,7 +174,7 @@ return $helper; }; - $("#slides tbody").sortable({ + $(".slides tbody").sortable({ helper: rowWidthHelper, stop: function(event,ui) {adjustDatabase("#slides")} }).disableSelection(); diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html index ba6cb541f..d2016ad6e 100644 --- a/ietf/templates/meeting/upcoming.html +++ b/ietf/templates/meeting/upcoming.html @@ -101,7 +101,6 @@ {% endif %} {% if meetings %} - <h3></h3> <table class="table table-condensed table-striped tablesorter"> <thead> <tr> diff --git a/ietf/templates/person/profile.html b/ietf/templates/person/profile.html index 052a102e3..d0d42af8b 100644 --- a/ietf/templates/person/profile.html +++ b/ietf/templates/person/profile.html @@ -77,13 +77,13 @@ <div class="col-md-6"> <h2 id="drafts">Active Drafts</h2> {% if person.active_drafts.exists %} - <list> + <ul> {% for doc in person.active_drafts %} <li> <a href="{{ doc.href }}">{{ doc.canonical_name }}</a> </li> {% endfor %} - </list> + </ul> {% else %} {{ person.first_name }} has no active drafts as of {{ today }}. {% endif %} @@ -91,13 +91,13 @@ <div class="col-md-6"> <h2>Expired Drafts <small>exluding replaced drafts</small></h2> {% if person.expired_drafts.exists %} - <list> + <ul> {% for doc in person.expired_drafts %} {% if not doc.replaced_by %} <li><a href="{{ doc.href }}">{{ doc.canonical_name }}</a></li> {% endif %} {% endfor %} - </list> + </ul> {% else %} {{ person.first_name }} has no expired drafts as of {{ today }}. {% endif %} diff --git a/ietf/templates/submit/manual_post.html b/ietf/templates/submit/manual_post.html index 22803a7ca..ee979341a 100644 --- a/ietf/templates/submit/manual_post.html +++ b/ietf/templates/submit/manual_post.html @@ -13,7 +13,7 @@ {% block submit_content %} {% origin %} - <h2 class="anchor-target" id="approvals">Submissions needing manual posting</h2> + <h2 class="anchor-target" id="man_post">Submissions needing manual posting</h2> {% if not manual %} <p id="no-manual">There are no submissions needing manual posting.</p> @@ -44,7 +44,7 @@ </table> {% endif %} - <h2 class="anchor-target" id="approvals">Submissions awaiting draft upload</h2> + <h2 class="anchor-target" id="id_upload">Submissions awaiting draft upload</h2> {% if not waiting_for_draft %} <p id="no-waiting-for-draft">There are no submissions awaiting draft upload.</p>