diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index 42c619630..3e6cb6e1f 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -426,7 +426,7 @@ def format_snippet(text, trunc_words=25): full = keep_spacing(collapsebr(linebreaksbr(mark_safe(sanitize_fragment(text))))) snippet = truncatewords_html(full, trunc_words) if snippet != full: - return mark_safe('
%s
' % (snippet, full)) + return mark_safe('
%s
' % (snippet, full)) return full @register.simple_tag diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 0a0137484..86974a427 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -2136,7 +2136,7 @@ class EditTests(TestCase): s_other = s2 if s == s1 else s1 self.assertEqual(len(constraints), 3) self.assertEqual(constraints.eq(0).attr("data-sessions"), str(s_other.pk)) - self.assertEqual(constraints.eq(0).find(".fa-user-o").parent().text(), "1") # 1 person in the constraint + self.assertEqual(constraints.eq(0).find(".bi-person").parent().text(), "1") # 1 person in the constraint self.assertEqual(constraints.eq(1).attr("data-sessions"), str(s_other.pk)) self.assertEqual(constraints.eq(1).find(".encircled").text(), "1" if s_other == s2 else "-1") self.assertEqual(constraints.eq(2).attr("data-sessions"), str(s_other.pk)) @@ -2472,7 +2472,7 @@ class EditTests(TestCase): # Now enable the 'chair_conflict' constraint only chair_conflict = ConstraintName.objects.get(slug='chair_conflict') - chair_conf_label = b'' # result of etree.tostring(etree.fromstring(editor_label)) + chair_conf_label = b'' # result of etree.tostring(etree.fromstring(editor_label)) meeting.group_conflict_types.add(chair_conflict) r = self.client.get(url) q = PyQuery(r.content) @@ -2732,7 +2732,7 @@ class SessionDetailsTests(TestCase): q = PyQuery(r.content) self.assertTrue(q('h2#session_%s div#session-buttons-%s' % (session.id, session.id)), 'Session detail page does not contain session tool buttons') - self.assertFalse(q('h2#session_%s div#session-buttons-%s span.fa-arrows-alt' % (session.id, session.id)), + self.assertFalse(q('h2#session_%s div#session-buttons-%s span.bi-arrows-fullscreen' % (session.id, session.id)), 'The session detail page is incorrectly showing the "Show meeting materials" button') def test_session_details_past_interim(self): diff --git a/ietf/meeting/utils.py b/ietf/meeting/utils.py index 64427a5db..5effd0acc 100644 --- a/ietf/meeting/utils.py +++ b/ietf/meeting/utils.py @@ -301,7 +301,7 @@ def preprocess_constraints_for_meeting_schedule_editor(meeting, sessions): joint_with_groups_constraint_name = ConstraintName( slug='joint_with_groups', name="Joint session with", - editor_label="", + editor_label="", order=8, ) constraint_names[joint_with_groups_constraint_name.slug] = joint_with_groups_constraint_name @@ -535,4 +535,4 @@ def preprocess_meeting_important_dates(meetings): m.important_dates = m.importantdate_set.prefetch_related("name") for d in m.important_dates: d.midnight_cutoff = "UTC 23:59" in d.name.name - + \ No newline at end of file diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json index 0b5d42f3c..ea697b057 100644 --- a/ietf/name/fixtures/names.json +++ b/ietf/name/fixtures/names.json @@ -6237,7 +6237,7 @@ { "fields": { "desc": "", - "editor_label": "{count}", + "editor_label": "{count}", "is_group_conflict": false, "name": "Person must be present", "order": 4, @@ -6250,7 +6250,7 @@ { "fields": { "desc": "Indicates other WGs the chairs also lead or will be active participants in", - "editor_label": "", + "editor_label": "", "is_group_conflict": true, "name": "Chair conflict", "order": 8, @@ -6302,7 +6302,7 @@ { "fields": { "desc": "Indicates WGs with which key participants (presenter, secretary, etc.) may overlap", - "editor_label": "", + "editor_label": "", "is_group_conflict": true, "name": "Key participant conflict", "order": 10, @@ -6315,7 +6315,7 @@ { "fields": { "desc": "Indicates WGs with a related technology or a closely related charter", - "editor_label": "", + "editor_label": "", "is_group_conflict": true, "name": "Technology overlap", "order": 9, @@ -6341,7 +6341,7 @@ { "fields": { "desc": "", - "editor_label": "", + "editor_label": "", "is_group_conflict": false, "name": "Can't meet within timerange", "order": 5, @@ -6354,7 +6354,7 @@ { "fields": { "desc": "", - "editor_label": "", + "editor_label": "", "is_group_conflict": false, "name": "Request for adjacent scheduling with another WG", "order": 7, @@ -15693,4 +15693,4 @@ "model": "utils.versioninfo", "pk": 4 } -] +] \ No newline at end of file diff --git a/ietf/name/migrations/0017_update_constraintname_order_and_label.py b/ietf/name/migrations/0017_update_constraintname_order_and_label.py index 70a76ba5c..3b552baf6 100644 --- a/ietf/name/migrations/0017_update_constraintname_order_and_label.py +++ b/ietf/name/migrations/0017_update_constraintname_order_and_label.py @@ -12,13 +12,13 @@ class Migration(migrations.Migration): ConstraintName = apps.get_model('name', 'ConstraintName') for cn in ConstraintName.objects.all(): cn.editor_label = { - 'bethere': "{count}", - 'wg_adjacent': "", + 'bethere': "{count}", + 'wg_adjacent': "", 'conflict': "1", 'conflic2': "2", 'conflic3': "3", 'time_relation': "Δ", - 'timerange': "", + 'timerange': "", }.get(cn.slug, cn.editor_label) cn.order = { diff --git a/ietf/name/migrations/0026_add_conflict_constraintnames.py b/ietf/name/migrations/0026_add_conflict_constraintnames.py index 1ee0acbc3..d404e2cf3 100644 --- a/ietf/name/migrations/0026_add_conflict_constraintnames.py +++ b/ietf/name/migrations/0026_add_conflict_constraintnames.py @@ -18,21 +18,21 @@ constraint_names_to_add = [ slug='chair_conflict', name='Chair conflict', desc='Indicates other WGs the chairs also lead or will be active participants in', - editor_label='', + editor_label='', ), ConstraintInfo( replaces='conflic2', slug='tech_overlap', name='Technology overlap', desc='Indicates WGs with a related technology or a closely related charter', - editor_label='', + editor_label='', ), ConstraintInfo( replaces='conflic3', slug='key_participant', name='Key participant conflict', desc='Indicates WGs with which key participants (presenter, secretary, etc.) may overlap', - editor_label='', + editor_label='', ) ] @@ -72,4 +72,4 @@ class Migration(migrations.Migration): operations = [ migrations.RunPython(forward, reverse), - ] + ] \ No newline at end of file diff --git a/ietf/static/ietf/js/ietf.js b/ietf/static/ietf/js/ietf.js index 6dd00b583..188c17b98 100644 --- a/ietf/static/ietf/js/ietf.js +++ b/ietf/static/ietf/js/ietf.js @@ -254,9 +254,9 @@ $(document).ready(function () { // customize the styling a bit; more is done in ietf.css $.tablesorter.themes.bootstrap = { table: "", - iconSortNone: "fa fa-sort", - iconSortAsc: "fa fa-sort-asc", - iconSortDesc: "fa fa-sort-desc", + iconSortNone: "bi bi-arrow-down-up", + iconSortAsc: "bi bi-arrow-down-up-asc", + iconSortDesc: "bi bi-arrow-down-up-desc", hover: "active" }; // disable the URL-based sorting stuff that uses the django backend diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py index 1f46e918c..3ed5b4773 100644 --- a/ietf/submit/checkers.py +++ b/ietf/submit/checkers.py @@ -52,7 +52,7 @@ class DraftIdnitsChecker(object): # start using this when we provide more in the way of warnings during # submission checking: - # symbol = '' + # symbol = '' # symbol = u'\ua17d' # Yi syllable 'nit' # symbol = u'\ub2e1' # Hangul syllable 'nit' diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html index 41a5a0bd6..26f49fc6b 100644 --- a/ietf/templates/api/index.html +++ b/ietf/templates/api/index.html @@ -178,9 +178,9 @@ document attributes are necessary for an application is available for all documents at the relative url doc.json, e.g., {% url 'ietf.doc.views_doc.document_json' name='draft-ietf-poised95-std-proc-3' %} - . + . You can also specify an RFC: {% url 'ietf.doc.views_doc.document_json' name='rfc2026' %} - . + . No API key is needed to access this.

diff --git a/ietf/templates/base.html b/ietf/templates/base.html index 275fafd10..3d221f0a5 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -112,9 +112,9 @@ {{revision_date}} | {% endif %} Report a bug: - Tracker: + Tracker: {% if bugreport_email %} - Email: + Email: {% endif %}
{% if python_version %}Python {{ python_version }}{% endif %} | diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html index 8a758e86d..c126a1c22 100644 --- a/ietf/templates/base/menu.html +++ b/ietf/templates/base/menu.html @@ -164,7 +164,7 @@
  • API Help
  • Release notes
    • {% if flavor == 'top' %}
  • {% endif %} -
  • Report a bug
    • +
  • Report a bug
    • {% if flavor == 'top' %}{% endif %} diff --git a/ietf/templates/community/manage_list.html b/ietf/templates/community/manage_list.html index 89b1a9e37..38acee3b0 100644 --- a/ietf/templates/community/manage_list.html +++ b/ietf/templates/community/manage_list.html @@ -50,7 +50,7 @@ {% if clist.group %}

    Add individual documents here:

    {% else %} -

    Conveniently track individual documents in your personal list with the track icon in search results.

    +

    Conveniently track individual documents in your personal list with the track icon in search results.

    You can also add documents here:

    {% endif %} diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html index b56852eba..459dcb916 100644 --- a/ietf/templates/doc/charter/submit.html +++ b/ietf/templates/doc/charter/submit.html @@ -60,7 +60,7 @@ {% for r in roles %} - + {{ r.person.plain_name }}
    {% endfor %} diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html index af08540ca..26e56cb4a 100644 --- a/ietf/templates/doc/document_ballot_content.html +++ b/ietf/templates/doc/document_ballot_content.html @@ -87,13 +87,13 @@
    {{ p.pos.name }} ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) {% if p.send_email %} - + {% elif p.any_email_sent == True %} - + {% elif p.any_email_sent == False %} - + {% else %} - + {% endif %}
    @@ -106,11 +106,11 @@
    Comment ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) {% if p.send_email %} - + {% elif p.any_email_sent == True %} - + {% elif p.any_email_sent == False %} - + {% else %}
    No email
    send info
    {% endif %} @@ -145,11 +145,11 @@ ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) {% endif %} {% if p.send_email %} - + {% elif p.any_email_sent == True %} - + {% elif p.any_email_sent == False %} - + {% else %}
    No email
    send info
    {% endif %} diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index d5fa22ee1..cd1c978be 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -200,7 +200,7 @@ {% if file_urls %} {% for label, url in file_urls %} - + {{ label }} {% endfor %} {% else %} @@ -249,11 +249,11 @@ {% if can_request_review %}
    - Request review + Request review {% if can_submit_unsolicited_review_for_teams|length == 1 %} - Submit unsolicited review + Submit unsolicited review {% elif can_submit_unsolicited_review_for_teams %} - Submit unsolicited review + Submit unsolicited review {% endif %}
    {% endif %} @@ -374,7 +374,7 @@ {% if presentations %} {% for pres in presentations %} - + {{ pres.session.short_name }} at {{ pres.session.meeting }} {% if pres.rev and pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %}, {% endif %} {% endfor %} @@ -478,7 +478,7 @@ {% for action_holder in doc.documentactionholder_set.all %}
    {% person_link action_holder.person title=action_holder.role_for_doc %} {{ action_holder|action_holder_badge }}
    {% endfor %} - {% if can_edit %} Send reminder email {% endif %} + {% if can_edit %} Send reminder email {% endif %} {% else %} (None) {% endif %} @@ -674,17 +674,17 @@
    - Email authors + Email authors {% if doc.group.type.slug == 'wg' or doc.group.type.slug == 'rg' %} - Email {{ doc.group.type }} + Email {{ doc.group.type }} {% endif %} - IPR {% if doc.related_ipr %} {{doc.related_ipr|length}}{% endif %} - References - Referenced by - Nits + IPR {% if doc.related_ipr %} {{doc.related_ipr|length}}{% endif %} + References + Referenced by + Nits
    {% if user.is_authenticated %} - Untrack - Track + Untrack + Track {% endif %} {% if user.review_teams %} - Remove review wishes - Add review wish + Remove review wishes + Add review wish {% endif %} {% if can_edit and iesg_state.slug != 'idexists' %} @@ -720,7 +720,7 @@ {{ content|safe }} {% if split_content %} - Show full document text + Show full document text {% endif %} {% else %} @@ -741,7 +741,7 @@

    {% for author in doc.documentauthor_set.all %} {% if author.email %} - + {% endif %} {{ author.person }} diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html index 24b688e65..658cb491e 100644 --- a/ietf/templates/doc/document_history.html +++ b/ietf/templates/doc/document_history.html @@ -95,7 +95,7 @@

    Document history

    {% if can_add_comment %}
    - Add comment + Add comment
    {% endif %} diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html index dc25b9444..27cea7e5e 100644 --- a/ietf/templates/doc/document_referenced_by.html +++ b/ietf/templates/doc/document_referenced_by.html @@ -51,8 +51,8 @@ {{ref.source.title}}
    - References - Referenced by + References + Referenced by {% ifequal ref.source.get_state.slug 'rfc' %} diff --git a/ietf/templates/doc/document_references.html b/ietf/templates/doc/document_references.html index 4773a5cef..4cff4e4b2 100644 --- a/ietf/templates/doc/document_references.html +++ b/ietf/templates/doc/document_references.html @@ -38,8 +38,8 @@ {{ name|prettystdname }} {{ref.target.document.title}}
    - References - Referenced by + References + Referenced by {% ifequal ref.target.document.get_state.slug 'rfc' %} diff --git a/ietf/templates/doc/edit_authors.html b/ietf/templates/doc/edit_authors.html index 228a36ab3..d1be20e13 100644 --- a/ietf/templates/doc/edit_authors.html +++ b/ietf/templates/doc/edit_authors.html @@ -37,7 +37,7 @@ {% for form in formset %}
    - +
    {% bootstrap_form form layout='horizontal' %}
    @@ -48,7 +48,7 @@
    - +
    {% bootstrap_form formset.empty_form layout='horizontal' %}
    diff --git a/ietf/templates/doc/review/complete_review.html b/ietf/templates/doc/review/complete_review.html index 1599f8fb1..52b896dd2 100644 --- a/ietf/templates/doc/review/complete_review.html +++ b/ietf/templates/doc/review/complete_review.html @@ -67,8 +67,8 @@

    {% endif %} @@ -180,13 +180,13 @@ {% endif %} {% if assignment.can_complete_review %} - {% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}Complete review{% else %}Correct review{% endif %} + {% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}Complete review{% else %}Correct review{% endif %} {% endif %} {% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %} {% if can_assign_reviewer %} - No response - Withdraw + No response + Withdraw {% endif %} {% endif %} @@ -235,7 +235,7 @@ {% if can_assign_reviewer %}

    - Assign reviewer + Assign reviewer

    {% endif %} diff --git a/ietf/templates/doc/review/review_request.html b/ietf/templates/doc/review/review_request.html index 936287be5..28e1c0a9c 100644 --- a/ietf/templates/doc/review/review_request.html +++ b/ietf/templates/doc/review/review_request.html @@ -12,7 +12,7 @@
    {% if can_close_request %} - Close request + Close request {% endif %}
    diff --git a/ietf/templates/doc/search/search.html b/ietf/templates/doc/search/search.html index c1bc122e8..50633a501 100644 --- a/ietf/templates/doc/search/search.html +++ b/ietf/templates/doc/search/search.html @@ -14,7 +14,7 @@

    Document Search

    -

      

    +

      

    diff --git a/ietf/templates/doc/search/search_form.html b/ietf/templates/doc/search/search_form.html index b0be9d1fc..bb12ec7aa 100644 --- a/ietf/templates/doc/search/search_form.html +++ b/ietf/templates/doc/search/search_form.html @@ -11,7 +11,7 @@ {{ form.name|add_class:"form-control"|attr:"placeholder:Document name/title/RFC number" }} @@ -139,7 +139,7 @@
    diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html index 15d56aa9e..3a9d6ebd1 100644 --- a/ietf/templates/doc/search/search_result_row.html +++ b/ietf/templates/doc/search/search_result_row.html @@ -15,19 +15,19 @@ {% if user.is_authenticated %} - + - +
    {% endif %} {% if user.review_teams %} - + - +
    {% endif %} @@ -35,8 +35,7 @@ {% for session in doc.sessions %} - {# font-size set to make the width of fa-calendar come out the same as fa-bookmark-o above: #} - + {% endfor %} @@ -137,4 +136,4 @@ {% endwith %} {% endif %} - + \ No newline at end of file diff --git a/ietf/templates/doc/search/search_results.html b/ietf/templates/doc/search/search_results.html index 15285c33d..d62df18c6 100644 --- a/ietf/templates/doc/search/search_results.html +++ b/ietf/templates/doc/search/search_results.html @@ -29,9 +29,9 @@ {{ h.title }} {% if h.sorted and meta.max %} {% if h.direction == "asc" %} - + {% else %} - + {% endif %} {% endif %} diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html index 327453e15..68d6e9727 100644 --- a/ietf/templates/doc/status_change/make_last_call.html +++ b/ietf/templates/doc/status_change/make_last_call.html @@ -40,7 +40,7 @@ format: "yyyy-mm-dd", todayBtn: "linked", todayHighlight: true - }).wrap('
    ').parent().prepend(''); + }).wrap('
    ').parent().prepend(''); {% endblock %} diff --git a/ietf/templates/doc/submit_to_iesg.html b/ietf/templates/doc/submit_to_iesg.html index 2b40832b1..3c304d11f 100644 --- a/ietf/templates/doc/submit_to_iesg.html +++ b/ietf/templates/doc/submit_to_iesg.html @@ -19,7 +19,7 @@ - + @@ -31,13 +31,13 @@ - + - + @@ -49,13 +49,13 @@ - +
    Intended status level{% if warn.intended_std_level %}{% endif %}{% if warn.intended_std_level %}{% endif %} {{doc.intended_std_level}}
    Document shepherd{% if warn.shepherd %}{% endif %}{% if warn.shepherd %}{% endif %} {% if doc.shepherd %}{{ doc.shepherd.person }}{% endif %}
    Shepherd write-up exists{% if warn.shepherd_writeup %}{% endif %}{% if warn.shepherd_writeup %}{% endif %} {%if shepherd_writeup %}Yes{%else%}No{%endif%}
    Annotation tags{% if warn.tags %}{% endif %}{% if warn.tags %}{% endif %} {% if not tags %}(None){%else%}{% for tag in tags %}{{ tag }}{% if not forloop.last%}, {%endif%}{% endfor %}{% endif %}
    {% if warn %} -

    indicates the document might not be ready for submission. Please check each instance carefully to see if changes need to be made to the document's state before submitting.

    +

    indicates the document might not be ready for submission. Please check each instance carefully to see if changes need to be made to the document's state before submitting.

    {% endif %}

    diff --git a/ietf/templates/group/active_ags.html b/ietf/templates/group/active_ags.html index 0315e668e..d056081b2 100644 --- a/ietf/templates/group/active_ags.html +++ b/ietf/templates/group/active_ags.html @@ -29,19 +29,19 @@ {% for ad in group.ads %} {{ ad.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} {% for secretary in group.secretaries %} {{ secretary.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} {% for chair in group.chairs %} {{ chair.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} diff --git a/ietf/templates/group/active_dirs.html b/ietf/templates/group/active_dirs.html index a3e14609f..a64108933 100644 --- a/ietf/templates/group/active_dirs.html +++ b/ietf/templates/group/active_dirs.html @@ -31,26 +31,26 @@ {{ group.name }} {% if group.type_id == 'review' %} - + {% endif %} {{ group.parent.acronym }} {% for ad in group.ads %} {{ ad.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} {% for secretary in group.secretaries %} {{ secretary.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} {% for chair in group.chairs %} {{ chair.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} diff --git a/ietf/templates/group/active_rags.html b/ietf/templates/group/active_rags.html index 43dfa5a2e..a4442b1e2 100644 --- a/ietf/templates/group/active_rags.html +++ b/ietf/templates/group/active_rags.html @@ -28,13 +28,13 @@ {% for secretary in group.secretaries %} {{ secretary.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} {% for chair in group.chairs %} {{ chair.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} diff --git a/ietf/templates/group/active_review_dirs.html b/ietf/templates/group/active_review_dirs.html index 4e11129ea..6bdfc52ee 100644 --- a/ietf/templates/group/active_review_dirs.html +++ b/ietf/templates/group/active_review_dirs.html @@ -32,19 +32,19 @@ {% for ad in group.ads %} {{ ad.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} {% for secretary in group.secretaries %} {{ secretary.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} {% for chair in group.chairs %} {{ chair.person.plain_name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} diff --git a/ietf/templates/group/active_rgs.html b/ietf/templates/group/active_rgs.html index 3a996cf69..cd70243c9 100644 --- a/ietf/templates/group/active_rgs.html +++ b/ietf/templates/group/active_rgs.html @@ -14,7 +14,7 @@

    IRTF chair

    - + {{ irtf.chair.person.plain_name }}

    @@ -38,7 +38,7 @@ {% for chair in group.chairs %} {{ chair.person.plain_name }} - {% if not forloop.last %} , {% endif %} + {% if not forloop.last %} , {% endif %} {% endfor %} {% endfor %} diff --git a/ietf/templates/group/active_teams.html b/ietf/templates/group/active_teams.html index e74acc629..c9c30b834 100644 --- a/ietf/templates/group/active_teams.html +++ b/ietf/templates/group/active_teams.html @@ -28,7 +28,7 @@ {% for chair in group.chairs %} {{ chair.person.plain_name }} - {% if not forloop.last %} , {% endif %} + {% if not forloop.last %} , {% endif %} {% endfor %} diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html index bfdb77129..ab810e073 100644 --- a/ietf/templates/group/active_wgs.html +++ b/ietf/templates/group/active_wgs.html @@ -30,7 +30,7 @@ {% for ad in area.ads_and_pre_ads %}
  • {{ ad.person.plain_name }} - + {% if ad.name == "pre-ad" %} (Incoming AD){% endif %}
    • {% endfor %} @@ -64,7 +64,7 @@ {% if group.ad_role %} {{ group.ad_role.person.plain_name.split.0 }} - + {% endif %} {{ group.name }} diff --git a/ietf/templates/group/history.html b/ietf/templates/group/history.html index 8d06f0f32..9fafef131 100644 --- a/ietf/templates/group/history.html +++ b/ietf/templates/group/history.html @@ -12,7 +12,7 @@ {% origin %}

    Group History

    {% if can_add_comment %} - Add comment + Add comment {% endif %} diff --git a/ietf/templates/group/meetings-row.html b/ietf/templates/group/meetings-row.html index 1cb976046..bb3c80c6b 100644 --- a/ietf/templates/group/meetings-row.html +++ b/ietf/templates/group/meetings-row.html @@ -39,9 +39,9 @@ {% if show_ical %} {% if s.meeting.type_id == 'ietf' %} {{s.time|date:"H:i"}} -   +   {% else %} -   +   {% endif %} {% endif %} diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html index 878008e44..24fb48d85 100644 --- a/ietf/templates/group/meetings.html +++ b/ietf/templates/group/meetings.html @@ -34,7 +34,7 @@
    Future Meetings - +
    {% with sessions=future show_request=True show_ical=True can_edit_materials=can_edit %} diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html index c4098a54a..b52c05994 100644 --- a/ietf/templates/group/review_requests.html +++ b/ietf/templates/group/review_requests.html @@ -14,7 +14,7 @@ {% origin %} {% if can_access_stats %} -

      

    +

      

    {% endif %} {% if unassigned_review_requests %} diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html index 691adc0c5..2c1970ab3 100644 --- a/ietf/templates/group/reviewer_overview.html +++ b/ietf/templates/group/reviewer_overview.html @@ -14,7 +14,7 @@ {% endblock %} {% if can_access_stats %} -

      

    +

      

    {% endif %}

    Reviewers

    diff --git a/ietf/templates/iesg/agenda_charter.html b/ietf/templates/iesg/agenda_charter.html index bbb2c514d..75298d242 100644 --- a/ietf/templates/iesg/agenda_charter.html +++ b/ietf/templates/iesg/agenda_charter.html @@ -10,7 +10,7 @@
    Charter
    - + {{ doc.name}}-({{doc.rev}})
    diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html index f456a5e55..d5478a4c5 100644 --- a/ietf/templates/iesg/agenda_conflict_doc.html +++ b/ietf/templates/iesg/agenda_conflict_doc.html @@ -8,7 +8,7 @@
    Conflict review
    - + {{ doc.canonical_name }}
    @@ -18,7 +18,7 @@
    {{ conflictdoc.stream }} {{ conflictdoc.intended_std_level }}
    - + {{ conflictdoc.name }}
    diff --git a/ietf/templates/iesg/agenda_doc.html b/ietf/templates/iesg/agenda_doc.html index 85a1363c7..42fe31d4d 100644 --- a/ietf/templates/iesg/agenda_doc.html +++ b/ietf/templates/iesg/agenda_doc.html @@ -17,7 +17,7 @@ {% else %} {% endif %} - + {% endwith %} {{ doc.canonical_name }} {% if doc.has_rfc_editor_note %} diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html index bfbd7812e..a8bb65efd 100644 --- a/ietf/templates/iesg/agenda_documents.html +++ b/ietf/templates/iesg/agenda_documents.html @@ -37,12 +37,12 @@

    - + Full IESG agenda - + Download documents

    diff --git a/ietf/templates/ipr/search_form.html b/ietf/templates/ipr/search_form.html index a257116cd..74fca08a8 100644 --- a/ietf/templates/ipr/search_form.html +++ b/ietf/templates/ipr/search_form.html @@ -25,7 +25,7 @@
    {% render_field form.draft class="form-control" placeholder="draft-..." %} - +
    @@ -35,7 +35,7 @@
    {% render_field form.rfc class="form-control" placeholder="123..." %} - +
    @@ -45,7 +45,7 @@
    {% render_field form.doctitle class="form-control" placeholder="protocol..." %} - +
    @@ -57,7 +57,7 @@ {% render_field form.group class="form-control" %}
    - +
    @@ -72,7 +72,7 @@
    {% render_field form.holder class="form-control" placeholder="John Doe..." %} - +
    @@ -82,7 +82,7 @@
    {% render_field form.iprtitle class="form-control" placeholder="protocol..." %} - +
    @@ -92,7 +92,7 @@
    {% render_field form.patent class="form-control" %} - +
    diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html index c1607d87b..96110449e 100644 --- a/ietf/templates/liaisons/liaison_table.html +++ b/ietf/templates/liaisons/liaison_table.html @@ -5,19 +5,19 @@
    diff --git a/ietf/templates/liaisons/search_form.html b/ietf/templates/liaisons/search_form.html index 286745549..0867b8ff3 100644 --- a/ietf/templates/liaisons/search_form.html +++ b/ietf/templates/liaisons/search_form.html @@ -9,7 +9,7 @@ {{ form.text|add_class:"form-control"|attr:"placeholder:Title, body, identifiers, etc." }} @@ -20,7 +20,7 @@

    - Additional search criteria + Additional search criteria

    @@ -72,7 +72,7 @@
    diff --git a/ietf/templates/meeting/agenda_filter.html b/ietf/templates/meeting/agenda_filter.html index 5dcb696e2..3c5e9e0f4 100644 --- a/ietf/templates/meeting/agenda_filter.html +++ b/ietf/templates/meeting/agenda_filter.html @@ -13,7 +13,7 @@ Optional parameters:

    - {% firstof customize_button_text "Customize..."%} + {% firstof customize_button_text "Customize..."%}

    diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html index a5871bf9c..fcf6455be 100644 --- a/ietf/templates/meeting/edit_meeting_schedule.html +++ b/ietf/templates/meeting/edit_meeting_schedule.html @@ -84,7 +84,7 @@
    {{ room.name }}
    - {% if room.capacity %}{{ room.capacity }} {% endif %} + {% if room.capacity %}{{ room.capacity }} {% endif %}
    {% endwith %}{% endfor %} @@ -99,7 +99,7 @@
    {{ day|date:"l" }} -
    @@ -116,7 +116,7 @@
    {{ t.time|date:"G:i" }} - {{ t.end_time|date:"G:i" }} - diff --git a/ietf/templates/meeting/edit_meeting_schedule_session.html b/ietf/templates/meeting/edit_meeting_schedule_session.html index 064279d2f..da2fe749b 100644 --- a/ietf/templates/meeting/edit_meeting_schedule_session.html +++ b/ietf/templates/meeting/edit_meeting_schedule_session.html @@ -12,7 +12,7 @@ {% endif %} {% if session.comments %} - + {% endif %} {% if session.constrained_sessions %} @@ -36,7 +36,7 @@ · {% if session.group.is_bof %}BOF{% else %}{{ session.group.type.name }}{% endif %} {% endif %} {% if session.attendees != None %} - · {{ session.attendees }} + · {{ session.attendees }} {% endif %}
    @@ -52,7 +52,7 @@ {% if session.requested_by_person %}
    - {{ session.requested_by_person.plain_name }} {% if session.requested_time %}({{ session.requested_time|date:"Y-m-d" }}){% endif %} + {{ session.requested_by_person.plain_name }} {% if session.requested_time %}({{ session.requested_time|date:"Y-m-d" }}){% endif %}
    {% endif %} @@ -82,7 +82,7 @@ {% endif %} {% for s in session.other_sessions %} -
    Other session
    +
    Other session
    {% endfor %}
    diff --git a/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html b/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html index 79eebd3c9..e331e93fb 100644 --- a/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html +++ b/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html @@ -77,7 +77,7 @@
    - +
    {% if edit_timeslot_form %} diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html index c2980c5ff..51e784843 100644 --- a/ietf/templates/meeting/group_materials.html +++ b/ietf/templates/meeting/group_materials.html @@ -30,7 +30,7 @@ {% for agenda in session.all_meeting_agendas %} {% if session.all_meeting_agendas|length == 1 %} {% if agenda.time > old %} - + {% endif %} Agenda
    {% else %} @@ -75,7 +75,7 @@ {% with session.all_meeting_slides as slides %} {% for slide in slides %} {% if slide.time > old %} - + {% endif %} {{ slide.title|clean_whitespace }}
    @@ -88,7 +88,7 @@ {% with session.all_meeting_drafts as drafts %} {% for draft in drafts %} {% if draft.time > old %} - + {% endif %} {{ draft.name }}
    {% empty %} diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html index 9a116200b..c335c9e35 100644 --- a/ietf/templates/meeting/interim_session_buttons.html +++ b/ietf/templates/meeting/interim_session_buttons.html @@ -8,91 +8,81 @@ {# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #} {% include "meeting/session_agenda_include.html" with slug=item.slug session=session timeslot=item.timeslot only %} - + - + - + {% endif %} {% if use_codimd %} {% if item.timeslot.type.slug == 'plenary' %} - + {% else %} - + {% endif %} {% endif %} {# show stream buttons up till end of session, then show archive buttons #} {% if now < item.timeslot.end_time %} - + {% if session.agenda_note|first_url|conference_url %} - + title="Online conference"> {% elif session.remote_instructions|first_url|conference_url %} - + title="Online conference"> {% elif item.timeslot.location.webex_url %} - + title="Webex session"> {% elif item.timeslot.location.video_stream_url %} - + title="Meetecho video stream"> {% else %} - - - {% endif %} - - + title="icalendar entry for {{acronym}} session on {{item.timeslot.utc_start_time|date:'Y-m-d H:i'}} UTC"> {% else %} - - - + {% with session.recordings as recordings %} {% if recordings %} {# There's no guaranteed order, so this is a bit messy: #} {% for r in recordings %}{% with href=r.get_href %} {% if 'audio' in href %} - + {% endif %} {% endwith %}{% endfor %} {% for r in recordings %}{% with href=r.get_href %} {% if 'youtu' in href %} - + {% endif %} {% endwith %}{% endfor %} {% for r in recordings %}{% with href=r.get_href %} {% if not 'audio' in href and not 'youtu' in href %} - + {% endif %} {% endwith %}{% endfor %} {% elif item.timeslot.location.video_stream_url %} + title="Meetecho session recording"> {% elif show_empty %} - + {% endif %} {% endwith %} {% endif %} diff --git a/ietf/templates/meeting/schedule_list.html b/ietf/templates/meeting/schedule_list.html index d9e8eab27..3184dc6a3 100644 --- a/ietf/templates/meeting/schedule_list.html +++ b/ietf/templates/meeting/schedule_list.html @@ -16,7 +16,7 @@ {{ label }} {% if own %}
    - New Agenda + New Agenda
    {% endif %}
    @@ -67,12 +67,12 @@
    diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html index 118ccd53f..5e7948064 100644 --- a/ietf/templates/meeting/session_buttons_include.html +++ b/ietf/templates/meeting/session_buttons_include.html @@ -11,19 +11,19 @@ {# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #} {% include "meeting/session_agenda_include.html" with slug=slug session=session timeslot=timeslot only %} - + - + - + {% endif %} {% if use_codimd %} {% if timeslot.type.slug == 'plenary' %} - + {% else %} - + {% endif %} {% endif %} @@ -32,50 +32,42 @@ + title="Chat room for {{session.jabber_room_name}}"> {% if timeslot.location.video_stream_url %} - + title="Video stream"> {% endif %} {% if timeslot.location.audio_stream_url %} - + title="Audio stream"> {% endif %} {% if session.agenda_note|first_url|conference_url %} - + title="Online conference"> {% elif session.remote_instructions|first_url|conference_url %} - + title="Online conference"> {% elif timeslot.location.webex_url %} - + title="Webex session"> {% endif %} - - + {% else %} {% if meeting.number|add:"0" >= 60 %} - - - + {% endif %} {% if meeting.number|add:"0" >= 80 %} @@ -85,19 +77,19 @@ {% for r in recordings %} {% if r.get_href and 'audio' in r.get_href %} - + {% endif %} {% endfor %} {% for r in recordings %} {% if r.get_href and 'youtu' in r.get_href %} - + {% endif %} {% endfor %} {% for r in recordings %} {% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %} - + {% endif %} {% endfor %} {% endif %} @@ -105,10 +97,10 @@ {% if timeslot.location.video_stream_url %} + title="Session recording"> {% endif %} {% endif %} {% endif %} {% endwith %} -{% endwith %}{% endwith %}{% endwith %}{% endwith %} +{% endwith %}{% endwith %}{% endwith %}{% endwith %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html index 17cd98887..003b8563a 100644 --- a/ietf/templates/meeting/session_details.html +++ b/ietf/templates/meeting/session_details.html @@ -17,7 +17,7 @@

    {{ meeting }} : {{ acronym }} {% if meeting.date >= thisweek %} - + {% endif %}

    @@ -135,4 +135,4 @@ {% endif %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html index 69f6969fb..d3d7fe973 100644 --- a/ietf/templates/meeting/session_details_panel.html +++ b/ietf/templates/meeting/session_details_panel.html @@ -40,12 +40,12 @@ {% if session.agenda_note|first_url|conference_url %} + title="Online conference"> {% elif session.remote_instructions|first_url|conference_url %} + title="Online conference"> {% endif %} {{ session.remote_instructions }} @@ -152,4 +152,4 @@ {% endwith %} - {% endfor %} + {% endfor %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_materials.html b/ietf/templates/meeting/session_materials.html index b065ffb68..59a9fe373 100644 --- a/ietf/templates/meeting/session_materials.html +++ b/ietf/templates/meeting/session_materials.html @@ -18,10 +18,10 @@ {% if item.session.slides %}

    Slides

    -
      +
        {% for slide in item.session.slides %}
      • - + {{ slide.title|clean_whitespace }}
        • {% endfor %} @@ -39,4 +39,4 @@ {% else %} No minutes submitted {% endif %} -{% endwith %} +{% endwith %} \ No newline at end of file diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html index c6e7fae5f..70ed652ba 100644 --- a/ietf/templates/meeting/upcoming.html +++ b/ietf/templates/meeting/upcoming.html @@ -46,9 +46,11 @@
        diff --git a/ietf/templates/nomcom/edit_nomcom.html b/ietf/templates/nomcom/edit_nomcom.html index d80fe97e9..1f132148a 100644 --- a/ietf/templates/nomcom/edit_nomcom.html +++ b/ietf/templates/nomcom/edit_nomcom.html @@ -40,7 +40,7 @@ format: "yyyy-mm-dd", todayBtn: "linked", todayHighlight: true - }).wrap('
        ').parent().prepend(''); + }).wrap('
        ').parent().prepend(''); {% endblock %} diff --git a/ietf/templates/nomcom/private_index.html b/ietf/templates/nomcom/private_index.html index ed37296da..d7c4cf9c7 100644 --- a/ietf/templates/nomcom/private_index.html +++ b/ietf/templates/nomcom/private_index.html @@ -120,7 +120,7 @@ id="nominee-position-table">
    - {% if is_chair and nomcom.group.state_id == 'active' %}{% endif %} + {% if is_chair and nomcom.group.state_id == 'active' %}{% endif %} diff --git a/ietf/templates/nomcom/requirements.html b/ietf/templates/nomcom/requirements.html index 19d5d5919..54e0a33a0 100644 --- a/ietf/templates/nomcom/requirements.html +++ b/ietf/templates/nomcom/requirements.html @@ -36,8 +36,8 @@ {% block js %}
    - Date {% if sort == "date" %}{% endif %} + Date {% if sort == "date" %}{% endif %} - From {% if sort == "from_groups" %}{% endif %} + From {% if sort == "from_groups" %}{% endif %} - To {% if sort == "to_groups" %}{% endif %} + To {% if sort == "to_groups" %}{% endif %} - Deadline {% if sort == "deadline" %}{% endif %} + Deadline {% if sort == "deadline" %}{% endif %} - Title {% if sort == "title" %}{% endif %} + Title {% if sort == "title" %}{% endif %}
    {% if schedule.can_edit_properties %} - + {% endif %} - +
    Nominee Position State