diff --git a/ietf/submit/templatetags/submit_tags.py b/ietf/submit/templatetags/submit_tags.py index c3f87ec62..13e93abf7 100644 --- a/ietf/submit/templatetags/submit_tags.py +++ b/ietf/submit/templatetags/submit_tags.py @@ -30,13 +30,7 @@ def two_pages_decorated_with_errors(submission, errors): return mark_safe('
%s
' % escape(pages)) result = '
\n'
     for line in pages.split('\n'):
-        if line.find('%s-%s' % (submission.name, submission.rev)) > -1:
-            result += '
' - result += escape(line) - result += '\n' - result += '
\n' - else: - result += escape(line) - result += '\n' + result += escape(line) + result += '\n' result += '
pre>\n' return mark_safe(result) diff --git a/ietf/templates/admin/group/group/send_sdo_reminder.html b/ietf/templates/admin/group/group/send_sdo_reminder.html index b657a83af..16d58494f 100644 --- a/ietf/templates/admin/group/group/send_sdo_reminder.html +++ b/ietf/templates/admin/group/group/send_sdo_reminder.html @@ -38,7 +38,7 @@

By clicking the 'Send' button you will send a request to all the SDO Liaison Managers. In order to send the request to one SDO Liaison Manager go to the SDO edit page.

{% endif %} -
{% csrf_token %} + {% csrf_token %}
{% endif %} diff --git a/ietf/templates/bootstrap3/field_help_text_and_errors.html b/ietf/templates/bootstrap3/field_help_text_and_errors.html index 1cf54c9ba..f69d6d398 100644 --- a/ietf/templates/bootstrap3/field_help_text_and_errors.html +++ b/ietf/templates/bootstrap3/field_help_text_and_errors.html @@ -1,2 +1 @@ -
{% for item in help_text_and_errors %} {{ item }}
{% endfor %}
- +{% for item in help_text_and_errors %} {{ item }}
{% endfor %} diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html index 411065c83..9c238ec4e 100644 --- a/ietf/templates/doc/ballot/edit_position.html +++ b/ietf/templates/doc/ballot/edit_position.html @@ -26,9 +26,9 @@ {% if field.name == "discuss" %}
{% endif %} {% bootstrap_field field %} {% if field.name == "discuss" and old_pos and old_pos.discuss_time %} - Last edited {{ old_pos.discuss_time }} +
Last edited {{ old_pos.discuss_time }}
{% elif field.name == "comment" and old_pos and old_pos.comment_time %} - Last edited {{ old_pos.comment_time }} +
Last edited {{ old_pos.comment_time }}
{% endif %} {% if field.name == "discuss" %}
{% endif %} {% endfor %} @@ -60,7 +60,7 @@ $("#div_id_discuss").hide(); } } - + $("input[name=position]").click(function () { discussToggle($(this).val()); }); diff --git a/ietf/templates/doc/ballot/lastcalltext.html b/ietf/templates/doc/ballot/lastcalltext.html index dadb0cd65..9202a0800 100644 --- a/ietf/templates/doc/ballot/lastcalltext.html +++ b/ietf/templates/doc/ballot/lastcalltext.html @@ -18,9 +18,9 @@ {% bootstrap_form last_call_form %} {% if can_request_last_call and need_intended_status %} - +
You need to select intended status of {{ need_intended_status }} and regenerate last call text to request last call. - +
{% endif %} {% buttons %} diff --git a/ietf/templates/doc/ballot/send_ballot_comment.html b/ietf/templates/doc/ballot/send_ballot_comment.html index 21a3385ba..c8b4cdaee 100644 --- a/ietf/templates/doc/ballot/send_ballot_comment.html +++ b/ietf/templates/doc/ballot/send_ballot_comment.html @@ -28,7 +28,7 @@
- Separate email addresses with commas. +
Separate email addresses with commas.
{% if doc.notify %} diff --git a/ietf/templates/doc/ballot/writeupnotes.html b/ietf/templates/doc/ballot/writeupnotes.html index 5ff32cd44..6d740098e 100644 --- a/ietf/templates/doc/ballot/writeupnotes.html +++ b/ietf/templates/doc/ballot/writeupnotes.html @@ -17,9 +17,9 @@ {% csrf_token %} {% bootstrap_form ballot_writeup_form %} - +
Technical summary, Working Group summary, document quality, personnel, RFC Editor note, IRTF note, IESG note, IANA note. This text will be appended to all announcements and messages to the IRTF or RFC Editor. - +
{% buttons %} diff --git a/ietf/templates/doc/charter/ballot_writeupnotes.html b/ietf/templates/doc/charter/ballot_writeupnotes.html index 99c59d19b..e70e6e630 100644 --- a/ietf/templates/doc/charter/ballot_writeupnotes.html +++ b/ietf/templates/doc/charter/ballot_writeupnotes.html @@ -17,9 +17,9 @@ {% csrf_token %} {% bootstrap_form ballot_writeup_form %} - +
Working group summary, personnel, IAB note, IESG note, IANA note. - +
{% buttons %} diff --git a/ietf/templates/doc/charter/change_state.html b/ietf/templates/doc/charter/change_state.html index 23fb388a8..370b02bc5 100644 --- a/ietf/templates/doc/charter/change_state.html +++ b/ietf/templates/doc/charter/change_state.html @@ -50,7 +50,7 @@

Or revert to previous state

-
{% csrf_token %} + {% csrf_token %} diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html index 4d35727d1..5aeaa1148 100644 --- a/ietf/templates/doc/document_ballot_content.html +++ b/ietf/templates/doc/document_ballot_content.html @@ -6,16 +6,7 @@

{{ n.name }}

{% for p in positions|dictsort:"ad.last_name" %}
- {% if p.old_ad %}({% endif %} - {% if p.comment or p.discuss %} - - {% endif %} - {{ p.ad.plain_name }} - {% if p.comment or p.discuss %} - - {% endif %} - {% if user|has_role:"Secretariat" %}{% endif %} - {% if p.old_ad %}){% endif %} + {% if p.old_ad %}({% endif %}{% if p.comment or p.discuss %}{% endif %}{{ p.ad.plain_name }}{% if p.comment or p.discuss %}{% endif %}{% if p.old_ad %}){% endif %}
{% empty %} (None) @@ -77,9 +68,7 @@ {% for n, positions in position_groups %} {% for p in positions|dictsort:"ad.last_name" %}

- {% if p.old_ad %}({% endif %} - {{ p.ad.plain_name }} - {% if p.old_ad %}){% endif %} + {% if p.old_ad %}({% endif %}{{ p.ad.plain_name }}{% if p.old_ad %}){% endif %} {% if p.old_positions %} (was {{ p.old_positions|join:", " }}) diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html index 403439c39..3817a5a11 100644 --- a/ietf/templates/doc/document_status_change.html +++ b/ietf/templates/doc/document_status_change.html @@ -25,10 +25,7 @@ - Document - - - + Document {% if doc.get_state_slug not in approved_states %} Proposed status change @@ -50,6 +47,7 @@ + Last updated {{ doc.time|date:"Y-m-d" }} @@ -59,6 +57,7 @@ {% regroup sorted_relations by relationship.name as relation_groups %} {% for relation_group in relation_groups %} + {{relation_group.grouper}} {% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %} @@ -66,6 +65,7 @@ {% endfor %} + State {% if not snapshot and user|has_role:"Area Director,Secretariat" %} @@ -80,10 +80,7 @@ - IESG - - - + IESG Telechat date {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} @@ -105,6 +102,7 @@ + Shepherding AD {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} @@ -117,6 +115,7 @@ + Send notices to {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html index bf7a808ac..ff046e23f 100644 --- a/ietf/templates/doc/draft/change_state.html +++ b/ietf/templates/doc/draft/change_state.html @@ -21,11 +21,11 @@ {% bootstrap_form form %} {% if state and state.slug == "rfcqueue" %} - +
Note: If you pull the draft out of the {{ state.name }} state, the RFC Editor and IANA will be notified by email with this comment, so they can update their queues. - +
{% endif %} {% buttons %} diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html index 681ae6b15..4df1fe250 100644 --- a/ietf/templates/doc/status_change/make_last_call.html +++ b/ietf/templates/doc/status_change/make_last_call.html @@ -5,7 +5,7 @@ {% load bootstrap3 %} {% block pagehead %} - + {% endblock %} {% block title %}Make last call for {{ doc.name }}{% endblock %} diff --git a/ietf/templates/doc/status_change/status_changes.html b/ietf/templates/doc/status_change/status_changes.html index 495c4b324..f7dced285 100644 --- a/ietf/templates/doc/status_change/status_changes.html +++ b/ietf/templates/doc/status_change/status_changes.html @@ -27,7 +27,7 @@ {{state.grouper}} {% for doc in state.list %} - + {{ doc.displayname_with_link|safe }} {{ doc.title }} diff --git a/ietf/templates/group/customize_workflow.html b/ietf/templates/group/customize_workflow.html index 43b6fc0b8..34376e701 100644 --- a/ietf/templates/group/customize_workflow.html +++ b/ietf/templates/group/customize_workflow.html @@ -53,7 +53,7 @@

- {% csrf_token %} + {% csrf_token %}
Select the next states:
{% for checked, default, s in state.next_states_checkboxes %} @@ -91,7 +91,7 @@ - + @@ -112,4 +112,5 @@ {% endfor %}
Tag Turn on/off
+ {% endblock content %} diff --git a/ietf/templates/group/stream_edit.html b/ietf/templates/group/stream_edit.html index be25a8398..379301924 100644 --- a/ietf/templates/group/stream_edit.html +++ b/ietf/templates/group/stream_edit.html @@ -32,7 +32,7 @@ datatracker account. New accounts can be created here.

- + {% csrf_token %} {% bootstrap_form form %} diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html index 4bae29d3f..d3abba392 100644 --- a/ietf/templates/ipr/details_edit.html +++ b/ietf/templates/ipr/details_edit.html @@ -155,7 +155,7 @@ {% bootstrap_field form.other_designations layout='horizontal' %} diff --git a/ietf/templates/ipr/email.html b/ietf/templates/ipr/email.html index 79be62d9a..bd6e22489 100644 --- a/ietf/templates/ipr/email.html +++ b/ietf/templates/ipr/email.html @@ -7,7 +7,7 @@ {% block title %}Email submitter of {{ ipr.title }}{% endblock %} {% block pagehead %} - + {% endblock %} {% block content %} diff --git a/ietf/templates/ipr/search_form.html b/ietf/templates/ipr/search_form.html index a41fab0aa..a68bda13a 100644 --- a/ietf/templates/ipr/search_form.html +++ b/ietf/templates/ipr/search_form.html @@ -8,10 +8,10 @@ {% if user|has_role:"Secretariat" %}

State Filter

- +
{% bootstrap_label form.state.label label_for=form.state.id_for_label label_class="control-label" %} - + {% render_field form.state %}
@@ -95,7 +95,7 @@
- This search string must contain at least three characters, including at least one digit, and include punctuation marks. For best results, please enter the entire string, or as much of it as possible. +
This search string must contain at least three characters, including at least one digit, and include punctuation marks. For best results, please enter the entire string, or as much of it as possible.
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html index 2bedbc0a7..2c32786c0 100644 --- a/ietf/templates/liaisons/edit.html +++ b/ietf/templates/liaisons/edit.html @@ -7,7 +7,7 @@ {% block title %}{% if liaison %}Edit liaison: {{ liaison }}{% else %}Send Liaison Statement{% endif %}{% endblock %} {% block pagehead %} - + {% endblock %} diff --git a/ietf/templates/nomcom/delete_nomcom.html b/ietf/templates/nomcom/delete_nomcom.html index c797d77ad..1e896d1ee 100644 --- a/ietf/templates/nomcom/delete_nomcom.html +++ b/ietf/templates/nomcom/delete_nomcom.html @@ -8,7 +8,7 @@ {% origin %}

Are you sure you want to delete all data about {{ nomcom.group.name }}?

- + {% csrf_token %} diff --git a/ietf/templates/nomcom/edit_nomcom.html b/ietf/templates/nomcom/edit_nomcom.html index 00abef367..10b4b776a 100644 --- a/ietf/templates/nomcom/edit_nomcom.html +++ b/ietf/templates/nomcom/edit_nomcom.html @@ -5,7 +5,7 @@ {% load bootstrap3 %} {% block pagehead %} - + {% endblock %} {% block subtitle %} - Settings{% endblock %} diff --git a/ietf/templates/registration/edit_profile.html b/ietf/templates/registration/edit_profile.html index 0f8957666..c4bb4a9dd 100644 --- a/ietf/templates/registration/edit_profile.html +++ b/ietf/templates/registration/edit_profile.html @@ -39,7 +39,7 @@
- Email to use for {{ role.name|lower }} role in {{ role.group.acronym|upper }} ({{ role.group.type }}). +
Email to use for {{ role.name|lower }} role in {{ role.group.acronym|upper }} ({{ role.group.type }}).
{% endfor %} @@ -61,7 +61,7 @@ {% endfor %}
- Note: Email addresses cannot be deleted, only deactivated. +
Note: Email addresses cannot be deleted, only deactivated.
@@ -81,7 +81,7 @@ {{person_form.name|add_class:"form-control"}}
- The preferred form of your name. +
The preferred form of your name.
@@ -95,7 +95,7 @@ {{person_form.ascii|add_class:"form-control"}}
- Your name as rendered in ASCII (Latin, unaccented) characters. +
Your name as rendered in ASCII (Latin, unaccented) characters.
@@ -109,11 +109,11 @@ {{person_form.ascii_short|add_class:"form-control"}}
- +
Example: A. Nonymous. Fill in this with initials and surname only if taking the initials and surname of your ASCII name above produces an incorrect initials-only form. (Blank is ok). - +
@@ -127,7 +127,7 @@ {{person_form.affiliation|add_class:"form-control"}}
- Employer, university, sponsor, etc. +
Employer, university, sponsor, etc.
@@ -141,7 +141,7 @@ {{person_form.address|add_class:"form-control"}}
- Postal mailing address. +
Postal mailing address.
diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html index 51cbc0727..379a9827f 100644 --- a/ietf/templates/submit/submission_status.html +++ b/ietf/templates/submit/submission_status.html @@ -203,13 +203,12 @@ {% if can_edit %} -

- - {% csrf_token %} - - - -

+

+
+ {% csrf_token %} + + +

Leads to manual post by the secretariat.

{% if passes_idnits and not errors %} @@ -247,35 +246,29 @@ {% if can_cancel %}

Cancel submission

-

-

- {% csrf_token %} - - -
-

-

Deletes the uploaded file{{ submission.file_types|split:","|pluralize }} permanently.

+
+ {% csrf_token %} + + +
{% endif %} {% if can_group_approve %}

Approve submission

-

{% csrf_token %}
-

{% endif %} {% if can_force_post %} -

-

- {% csrf_token %} - - -
-

+

+
+ {% csrf_token %} + + +
{% endif %} {% if show_send_full_url %} @@ -292,12 +285,11 @@ button. An email will then be sent to the authors and submitter (if submitter email was entered): {{ confirmation_list|join:", " }}.

-

-

{% csrf_token %} - - -
-

+

+
{% csrf_token %} + + +
{% endif %} diff --git a/static/css/ietf.css b/static/css/ietf.css index 93a0ce149..a2e02148c 100644 --- a/static/css/ietf.css +++ b/static/css/ietf.css @@ -93,13 +93,13 @@ body { padding-top: 70px; } } .navbar-brand { - margin-top: -2px; + margin-top: -2px; } /* Hack to make anchor-targets take up a bit more space vertically to work around the position fixed navbar which otherwise covers them */ h2.anchor-target:before, -h3.anchor-target:before, +h3.anchor-target:before, h4.anchor-target:before, div.anchor-target:before { content: ''; @@ -392,11 +392,8 @@ footer { */ -tbody.plain tr th { border-top: 0; text-align: right; max-width: 12em;} -tbody.plain tr:first-child th { border-top: 0; text-align: left; width: 6em; } -tbody.plain tr td { border-top: 0; } - +table tbody td.plain, table tbody th.plain { border-top: 0; } td.ad div { border-bottom: solid #ccc 1px; } -.milestone { font-style: italic; } +.milestone { font-style: italic; }