diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index e5adf0836..56bc8a2c8 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -562,7 +562,7 @@ Man Expires September 22, 2015 [Page 3] self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") if settings.USER_PREFERENCE_DEFAULTS['full_draft'] == 'off': - self.assertContains(r, "Show full document text") + self.assertContains(r, "Show full document") self.assertNotContains(r, "Deimos street") self.assertContains(r, replaced.canonical_name()) self.assertContains(r, replaced.title) @@ -579,7 +579,7 @@ Man Expires September 22, 2015 [Page 3] r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=0") self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") - self.assertContains(r, "Show full document text") + self.assertContains(r, "Show full document") self.assertNotContains(r, "Deimos street") self.assertContains(r, replaced.canonical_name()) self.assertContains(r, replaced.title) @@ -596,7 +596,7 @@ Man Expires September 22, 2015 [Page 3] r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=foo") self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") - self.assertNotContains(r, "Show full document text") + self.assertNotContains(r, "Show full document") self.assertContains(r, "Deimos street") self.assertContains(r, replaced.canonical_name()) self.assertContains(r, replaced.title) @@ -613,7 +613,7 @@ Man Expires September 22, 2015 [Page 3] r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=1") self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") - self.assertNotContains(r, "Show full document text") + self.assertNotContains(r, "Show full document") self.assertContains(r, "Deimos street") self.assertContains(r, replaced.canonical_name()) self.assertContains(r, replaced.title) @@ -631,7 +631,7 @@ Man Expires September 22, 2015 [Page 3] r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") - self.assertNotContains(r, "Show full document text") + self.assertNotContains(r, "Show full document") self.assertContains(r, "Deimos street") self.assertContains(r, replaced.canonical_name()) self.assertContains(r, replaced.title) @@ -649,7 +649,7 @@ Man Expires September 22, 2015 [Page 3] r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") - self.assertContains(r, "Show full document text") + self.assertContains(r, "Show full document") self.assertNotContains(r, "Deimos street") self.assertContains(r, replaced.canonical_name()) self.assertContains(r, replaced.title) @@ -668,7 +668,7 @@ Man Expires September 22, 2015 [Page 3] self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") if settings.USER_PREFERENCE_DEFAULTS['full_draft'] == 'off': - self.assertContains(r, "Show full document text") + self.assertContains(r, "Show full document") self.assertNotContains(r, "Deimos street") self.assertContains(r, replaced.canonical_name()) self.assertContains(r, replaced.title) @@ -2807,4 +2807,4 @@ class PdfizedTests(TestCase): self.should_succeed(dict(name=rfc.name,rev=f'{r:02d}')) for ext in ('pdf','txt','html','anythingatall'): self.should_succeed(dict(name=rfc.name,rev=f'{r:02d}',ext=ext)) - self.should_404(dict(name=rfc.name,rev='02')) + self.should_404(dict(name=rfc.name,rev='02')) \ No newline at end of file diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index 739e3e970..f64149ffd 100644 --- a/ietf/doc/views_doc.py +++ b/ietf/doc/views_doc.py @@ -360,9 +360,9 @@ def document_main(request, name, rev=None): if can_adopt_draft(request.user, doc) and not doc.get_state_slug() in ["rfc"] and not snapshot: if doc.group and doc.group.acronym != 'none': # individual submission # already adopted in one group - button_text = "Change Document Adoption to other Group (now in %s)" % doc.group.acronym + button_text = "Switch adoption" else: - button_text = "Manage Document Adoption in Group" + button_text = "Adopt" actions.append((button_text, urlreverse('ietf.doc.views_draft.adopt_draft', kwargs=dict(name=doc.name)))) if can_unadopt_draft(request.user, doc) and not doc.get_state_slug() in ["rfc"] and not snapshot: diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py index 7491dec17..e272ae24e 100644 --- a/ietf/meeting/tests_js.py +++ b/ietf/meeting/tests_js.py @@ -2320,7 +2320,7 @@ class InterimTests(IetfSeleniumTestCase): end = ts.utc_end_time().astimezone(zone).strftime('%H:%M') meeting_link = self.driver.find_element(By.LINK_TEXT, session.meeting.number) time_td = meeting_link.find_element(By.XPATH, '../../td[contains(@class, "session-time")]') - self.assertIn('%s - %s' % (start, end), time_td.text) + self.assertIn('%s-%s' % (start, end), time_td.text) def _assert_ietf_tz_correct(meetings, tz): zone = pytz.timezone(tz) @@ -2339,7 +2339,7 @@ class InterimTests(IetfSeleniumTestCase): end = end_dt.astimezone(zone).strftime('%Y-%m-%d') meeting_link = self.driver.find_element(By.LINK_TEXT, "IETF " + meeting.number) time_td = meeting_link.find_element(By.XPATH, '../../td[contains(@class, "meeting-time")]') - self.assertIn('%s - %s' % (start, end), time_td.text) + self.assertIn('%s to %s' % (start, end), time_td.text) sessions = [m.session_set.first() for m in self.displayed_interims()] self.assertGreater(len(sessions), 0) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 0bdc3c34f..49a1bfe16 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -4307,7 +4307,7 @@ class InterimTests(TestCase): q = PyQuery(r.content) #id="-%s" % interim.group.acronym #self.assertIn('Cancelled', q('[id*="'+id+'"]').text()) - self.assertIn('Cancelled', q('tr>td>a>span').text()) + self.assertIn('Cancelled', q('tr>td>a+span').text()) def do_upcoming_test(self, querystring=None, create_meeting=True): if create_meeting: diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss index b8e422929..571a5c78c 100644 --- a/ietf/static/css/ietf.scss +++ b/ietf/static/css/ietf.scss @@ -92,13 +92,26 @@ table tbody.meta { th:first-child, td:first-child { - width: 9em; + width: 4em; } th:nth-child(2), td:nth-child(2) { - // text-align: right; - width: 14em; + width: 7em; + } + + // See https://getbootstrap.com/docs/5.0/layout/breakpoints/#media-queries + @include media-breakpoint-up(md) { + + th:first-child, + td:first-child { + width: 9em; + } + + th:nth-child(2), + td:nth-child(2) { + width: 14em; + } } td.edit { diff --git a/ietf/static/js/agenda_timezone.js b/ietf/static/js/agenda_timezone.js index ac15db8b4..0174d1b96 100644 --- a/ietf/static/js/agenda_timezone.js +++ b/ietf/static/js/agenda_timezone.js @@ -126,20 +126,20 @@ function format_tooltip_table(start, end) { var current_timezone = get_current_tz_cb(); var out = '
Session start | Session end | |
---|---|---|
Meeting timezone | ' + - format_time(start, window.meeting_timezone, 0) + ' | ' + + out += ' |
Meeting timezone | ' + + format_time(start, window.meeting_timezone, 0) + ' | ' + format_time(end, window.meeting_timezone, 0) + ' |
Local timezone | ' + - format_time(start, local_timezone, 0) + ' | ' + + out += ' |
Local timezone | ' + + format_time(start, local_timezone, 0) + ' | ' + format_time(end, local_timezone, 0) + ' |
Selected Timezone | ' + - format_time(start, current_timezone, 0) + ' | ' + + out += ' |
Selected Timezone | ' + + format_time(start, current_timezone, 0) + ' | ' + format_time(end, current_timezone, 0) + ' |
UTC | ' + - format_time(start, 'UTC', 0) + ' | ' + + out += ' |
UTC | ' + + format_time(start, 'UTC', 0) + ' | ' + format_time(end, 'UTC', 0) + ' |
Intended status level | +Intended status level | {% if warn.intended_std_level %}{% endif %} {{ doc.intended_std_level }} | ||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Responsible AD | +Responsible AD | {% person_link ad %} | ||||||||||||||||||||||
Document shepherd | +Document shepherd | {% if warn.shepherd %}{% endif %} {% if doc.shepherd %} @@ -38,7 +38,7 @@ | ||||||||||||||||||||||
Shepherd write-up exists | +Shepherd write-up exists | {% if warn.shepherd_writeup %}{% endif %} {% if shepherd_writeup %} @@ -49,7 +49,7 @@ | ||||||||||||||||||||||
Also notify | +Also notify | {% if notify %} {{ notify }} @@ -59,7 +59,7 @@ | ||||||||||||||||||||||
Annotation tags | +Annotation tags | {% if warn.tags %}{% endif %} {% if not tags %} diff --git a/ietf/templates/group/chartering_groups.html b/ietf/templates/group/chartering_groups.html index 3a26111ef..d8b3b97e6 100644 --- a/ietf/templates/group/chartering_groups.html +++ b/ietf/templates/group/chartering_groups.html @@ -50,7 +50,7 @@ | {{ g.name }} | -{{ g.charter.time|date:"Y-m-d" }} | +{{ g.charter.time|date:"Y-m-d" }} |
{% ballot_icon g.charter %}
{{ g.charter.get_state.name }}
diff --git a/ietf/templates/group/history.html b/ietf/templates/group/history.html
index b5360788f..13c2dd469 100644
--- a/ietf/templates/group/history.html
+++ b/ietf/templates/group/history.html
@@ -28,8 +28,8 @@
| ||||||||||||||||||
{{ e.time|date:"Y-m-d" }} | -{% person_link e.by %} | +{{ e.time|date:"Y-m-d" }} | +{% person_link e.by %} | {{ e.desc|format_history_text }} | ||||||||||||||||||||
+ | {{ stream.acronym }} | {{ stream.name }} | diff --git a/ietf/templates/iesg/agenda_charter.html b/ietf/templates/iesg/agenda_charter.html index 9c7d7627f..03b17ff14 100644 --- a/ietf/templates/iesg/agenda_charter.html +++ b/ietf/templates/iesg/agenda_charter.html @@ -7,7 +7,7 @@||||||||||||||||||||||
Document | Status | -Responsible AD | +Responsible AD | Discusses | {{ doc.displayname_with_link }} | {% include "doc/search/status_columns.html" %} -{% person_link doc.ad %} | +{% person_link doc.ad %} |
{% for p in doc.blocking_positions %}
{% if p.is_old_pos %}{% endif %}
{% person_link p.balloter %}
- ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}
- {% if doc.get_state_url != "rfc" and p.rev != doc.rev %}for -{{ p.rev }}{% endif %})
+ ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}{% if doc.get_state_url != "rfc" and p.rev != doc.rev %}for -{{ p.rev }}{% endif %})
{% if p.is_old_pos %}{% endif %} {% endfor %} diff --git a/ietf/templates/iesg/past_documents.html b/ietf/templates/iesg/past_documents.html index 043e47eba..d3583c1d1 100644 --- a/ietf/templates/iesg/past_documents.html +++ b/ietf/templates/iesg/past_documents.html @@ -23,9 +23,9 @@ Document |
- Telechat Date |
+ Telechat Date |
Status |
- Responsible AD |
+ Responsible AD |
Discusses |
{{ doc.title }} |
- {{ doc.telechat }} | +{{ doc.telechat }} | {% include "doc/search/status_columns.html" %} -{% person_link doc.ad %} | +{% person_link doc.ad %} |
{% for p in doc.blocking_positions %}
{% if p.is_old_pos %}{% endif %}
{% person_link p.balloter %}
- ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}
- {% if doc.get_state_url != "rfc" and p.rev != doc.rev %}for -{{ p.rev }}{% endif %})
+ ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}{% if doc.get_state_url != "rfc" and p.rev != doc.rev %}for -{{ p.rev }}{% endif %})
{% if p.is_old_pos %}{% endif %} {% endfor %} diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html index 0cb318d4e..f035bf8f5 100644 --- a/ietf/templates/ipr/details_history.html +++ b/ietf/templates/ipr/details_history.html @@ -41,7 +41,7 @@ |
{% for e in events %}
||||
{{ e.time|date:"Y-m-d" }} | +{{ e.time|date:"Y-m-d" }} | {{ e.type }} {% if e.response_due and e.response_past_due %} diff --git a/ietf/templates/ipr/ipr_table.html b/ietf/templates/ipr/ipr_table.html index 7347f17c1..5fe4d3497 100644 --- a/ietf/templates/ipr/ipr_table.html +++ b/ietf/templates/ipr/ipr_table.html @@ -18,7 +18,7 @@ | ||||||||||||||||||||||
{{ ipr.time|date:"Y-m-d" }} | +{{ ipr.time|date:"Y-m-d" }} | {{ ipr.id }} | {% if ipr.state_id == 'posted' or administrative_list %} diff --git a/ietf/templates/liaisons/detail.html b/ietf/templates/liaisons/detail.html index 520761586..95981d81c 100644 --- a/ietf/templates/liaisons/detail.html +++ b/ietf/templates/liaisons/detail.html @@ -20,60 +20,60 @@ | {{ liaison.state }} | ||||||||||||||||||||
Submitted Date | +Submitted Date | {{ liaison.submitted|date:"Y-m-d" }} | ||||||||||||||||||||||
From Group{{ liaison.from_groups.all|pluralize }} | +From Group{{ liaison.from_groups.all|pluralize }} | {{ liaison.from_groups_display }} | ||||||||||||||||||||||
From Contact | +From Contact | {% person_link liaison.from_contact.person %} | ||||||||||||||||||||||
To Group{{ liaison.to_groups.all|pluralize }} | +To Group{{ liaison.to_groups.all|pluralize }} | {{ liaison.to_groups_display }} | ||||||||||||||||||||||
To Contacts | +To Contacts | {{ liaison.to_contacts|linkify|make_one_per_line|safe|linebreaksbr }} | ||||||||||||||||||||||
Cc | +Cc | {{ liaison.cc_contacts|linkify|make_one_per_line|safe|linebreaksbr }} | ||||||||||||||||||||||
Response Contact | +Response Contact | {{ liaison.response_contacts|linkify|make_one_per_line|safe|linebreaksbr }} | ||||||||||||||||||||||
Technical Contact | +Technical Contact | {{ liaison.technical_contacts|linkify|make_one_per_line|safe|linebreaksbr }} | ||||||||||||||||||||||
Action Holder Contacts | +Action Holder Contacts | {{ liaison.action_holder_contacts|linkify|make_one_per_line|safe|linebreaksbr }} | ||||||||||||||||||||||
Purpose | +Purpose | {{ liaison.purpose.name }} | ||||||||||||||||||||||
Deadline | +Deadline | {{ liaison.deadline }} {% if liaison.action_taken %} @@ -95,7 +95,7 @@ {% endif %} {% if relations %} | ||||||||||||||||||||||
+ | Liaisons referring to this | @@ -115,7 +115,7 @@ {% if liaison.related_to %} {% if liaison.related_to.approved or is_approving %} | ||||||||||||||||||||||
+ | Referenced liaison | @@ -132,7 +132,7 @@ {% endif %} {% if liaison.other_identifiers %} | ||||||||||||||||||||||
+ | Other Identifiers | @@ -141,7 +141,7 @@ | ||||||||||||||||||||||
+ | Attachments | @@ -157,7 +157,7 @@ | ||||||||||||||||||||||
+ | Liaisons referred by this one | @@ -176,7 +176,7 @@ {% endif %} {% if relations_to %} | ||||||||||||||||||||||
+ | Liaisons referring to this one | @@ -195,7 +195,7 @@ {% endif %} {% if liaison.from_contact and liaison.body %} | ||||||||||||||||||||||
+ | Body | diff --git a/ietf/templates/liaisons/detail_history.html b/ietf/templates/liaisons/detail_history.html index 65b858ad1..15415d6e7 100644 --- a/ietf/templates/liaisons/detail_history.html +++ b/ietf/templates/liaisons/detail_history.html @@ -33,7 +33,7 @@ | ||||||||||||||||||||||
{{ e.time|date:"Y-m-d" }} | +{{ e.time|date:"Y-m-d" }} | {{ e.type }} {% if e.response_due and e.response_past_due %} diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html index ffabe6c9f..8f40f56f6 100644 --- a/ietf/templates/liaisons/liaison_table.html +++ b/ietf/templates/liaisons/liaison_table.html @@ -5,8 +5,8 @@ | ||||||||||||||||||||||
Date | From | -To | -Deadline | +To | +Deadline | Title | ||||||||||||||||||
{{ liaison.sort_date|date:"Y-m-d" }} | +{{ liaison.sort_date|date:"Y-m-d" }} | {{ liaison.from_groups_display }} | -{{ liaison.to_groups_display }} | -+ | {{ liaison.to_groups_display }} | +
{{ liaison.deadline|default:"-"|date:"Y-m-d" }}
{% if liaison.deadline and not liaison.action_taken %}
diff --git a/ietf/templates/mailinglists/nonwg.html b/ietf/templates/mailinglists/nonwg.html index f1a4d5f41..3a38eacf4 100644 --- a/ietf/templates/mailinglists/nonwg.html +++ b/ietf/templates/mailinglists/nonwg.html @@ -20,7 +20,7 @@ | ||||||||||||||||||
+ | {{ list.name.lower }} | {{ list.description|urlize_ietf_docs }} | diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 9fd272240..e1e572936 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -134,7 +134,7 @@ {% endif %} {% endif %} -{% include "meeting/timeslot_start_end.html" %} | +{% include "meeting/timeslot_start_end.html" %} | {% if item.timeslot.show_location and item.timeslot.location %} {% location_anchor item.timeslot %} @@ -184,7 +184,7 @@ data-slot-start-ts="{{ item.start_timestamp }}" data-slot-end-ts="{{ item.end_timestamp }}"> {% if personalize %} | {% endif %} - | {% include "meeting/timeslot_start_end.html" %} | +{% include "meeting/timeslot_start_end.html" %} | {{ item.timeslot.time|date:"l" }} {{ item.timeslot.name|capfirst_allcaps }} @@ -212,7 +212,7 @@ {% endif %} {% if item.slot_type.slug == 'plenary' %} - | {% include "meeting/timeslot_start_end.html" %} | +{% include "meeting/timeslot_start_end.html" %} | {% if item.timeslot.show_location and item.timeslot.location %} {% location_anchor item.timeslot %} diff --git a/ietf/templates/meeting/past.html b/ietf/templates/meeting/past.html index eaa386a6e..0d43e0e56 100644 --- a/ietf/templates/meeting/past.html +++ b/ietf/templates/meeting/past.html @@ -16,7 +16,7 @@ | Date | Group | Name | -+ | {% if meeting.type_id == "interim" %} - - {{ meeting.number }} - {% if meeting.interim_meeting_cancelled %}Cancelled{% endif %} - + {{ meeting.number }} + {% if meeting.interim_meeting_cancelled %}Cancelled{% endif %} {% else %} IETF-{{ meeting.number }} {% endif %} | -+ | {% if meeting.type_id == "interim" %} {% else %} {% if meeting.get_number > 97 %} diff --git a/ietf/templates/meeting/proceedings_progress_report.html b/ietf/templates/meeting/proceedings_progress_report.html index 0b3a044e5..528392226 100644 --- a/ietf/templates/meeting/proceedings_progress_report.html +++ b/ietf/templates/meeting/proceedings_progress_report.html @@ -60,7 +60,7 @@ | {{ rfc.doc.group.acronym }} | -{{ rfc.time|date:"F Y" }} | +{{ rfc.time|date:"F Y" }} | {{ rfc.doc.title }} | {% endfor %} diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html index e29f32f57..b135b5df3 100644 --- a/ietf/templates/meeting/requests.html +++ b/ietf/templates/meeting/requests.html @@ -32,21 +32,22 @@Group | Length | Size | -Requester | -AD | +Requester | +AD | Constraints | Special requests | {% for session in area.list %} {% ifchanged %} + {% if not forloop.first %}{% endif %}
{{ session.current_status_name|capfirst }} | ||||||||||||||||||||||||
@@ -58,8 +59,8 @@ {% if session.requested_duration %}{{ session.requested_duration|stringformat:"s"|slice:"0:4" }}{% endif %} | {{ session.attendees|default:"" }} | -{% person_link session.requested_by_person %} | -+ | {% person_link session.requested_by_person %} | +{% if session.group.ad_role %} {% person_link session.group.ad_role.person %} {% endif %} @@ -79,16 +80,12 @@ {% with constraint.source.parent.id as constraint_source_parent_id %} {% with constraint.person as constraint_person %} {% if constraint_target_parent_id == constraint_source_parent_id and not constraint_person %}{% endif %} - {% if constraint.name.slug == "bethere" %} - {% person_link constraint_person %} + {% if constraint.name.slug == "bethere" %}{% person_link constraint_person %} {% else %} {% with constraint.name.slug as constraint_name_slug %} - + {% endwith %} - {{ constraint.brief_display }} - - {% endif %}{% if not forloop.last %},{% endif %} - {% if constraint_target_parent_id == constraint_source_parent_id and not constraint_person %}{% endif %} + {{ constraint.brief_display.strip }}{% endif %}{% if constraint_target_parent_id == constraint_source_parent_id and not constraint_person %}{% endif %}{% if not forloop.last %}, {% endif %} {% endwith %} {% endwith %} {% endwith %} @@ -100,7 +97,7 @@ {% if session.comments %}{{ session.comments|linebreaksbr }}{% endif %} |