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 = '
'; if (window.meeting_timezone !== "") { - out += ''; } - out += ''; if (current_timezone !== 'UTC') { - out += ''; } - out += ''; out += '
Session startSession 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) + '
' + format_tooltip_notice(start, end) + '
'; return out; diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js index 503cff28e..60e7e9287 100644 --- a/ietf/static/js/ietf.js +++ b/ietf/static/js/ietf.js @@ -46,6 +46,49 @@ $(document) .tooltip(); }); +// Help browser to wrap long link texts (esp. email addresses) more sensibly. +$(document) + .ready(function () { + $("#content a") + .each(function () { + // get the text of the element + var text = $(this) + .text(); + // insert some at strategic places + var newtext = text.replace(/([@._])/g, "$1"); + if (newtext === text) { + return; + } + // now replace only that text inside the element's HTML + var newhtml = $(this) + .html() + .replace(text, newtext); + $(this) + .html(newhtml); + }); + + // $("#content table.tablesorter") + // .on("tablesorter:done", function () { + // $("#content table.tablesorter .date") + // .each(function () { + // // get the text of the element + // var text = $(this) + // .text(); + // // insert some at strategic places + // var newtext = text.replace(/([-])/g, "$1"); + // if (newtext === text) { + // return; + // } + // // now replace only that text inside the element's HTML + // var newhtml = $(this) + // .html() + // .replace(text, newtext); + // $(this) + // .html(newhtml); + // }); + // }); + }); + $(document) .ready(function () { diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js index 3114054e6..67ebedcea 100644 --- a/ietf/static/js/list.js +++ b/ietf/static/js/list.js @@ -273,5 +273,7 @@ $(document) }); $(table.addClass("tablesorter-done")); n++; + $(table)[0] + .dispatchEvent(new Event("tablesorter:done")); }); }); \ No newline at end of file diff --git a/ietf/static/js/upcoming.js b/ietf/static/js/upcoming.js index 73d6ed13c..1eb2a4635 100644 --- a/ietf/static/js/upcoming.js +++ b/ietf/static/js/upcoming.js @@ -122,7 +122,7 @@ function format_session_time(session_elt, tz) { .attr('data-start-utc')); var end = moment.utc($(session_elt) .attr('data-end-utc')); - return format_moment(start, tz, 'datetime') + ' - ' + format_moment(end, tz, 'time'); + return format_moment(start, tz, 'datetime') + '-' + format_moment(end, tz, 'time'); } function format_meeting_time(meeting_elt, tz) { @@ -134,7 +134,7 @@ function format_meeting_time(meeting_elt, tz) { var end = moment.tz($(meeting_elt) .attr('data-end-date'), meeting_tz) .endOf('day'); - return format_moment(start, tz, 'date') + ' - ' + format_moment(end, tz, 'date'); + return format_moment(start, tz, 'date') + ' to ' + format_moment(end, tz, 'date'); } window.timezone_changed = function (newtz) { diff --git a/ietf/templates/doc/bofreq/bof_requests.html b/ietf/templates/doc/bofreq/bof_requests.html index 623c97bba..03d1392fb 100644 --- a/ietf/templates/doc/bofreq/bof_requests.html +++ b/ietf/templates/doc/bofreq/bof_requests.html @@ -32,7 +32,7 @@ Name - Date + Date Title Responsible Editors @@ -44,7 +44,7 @@ {{ req.name }}-{{ req.rev }} - {{ req.latest_revision_event.time|date:"Y-m-d" }} + {{ req.latest_revision_event.time|date:"Y-m-d" }} {{ req.title }} {% for person in req.responsible %} diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index bcaf24f16..474359612 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -1152,7 +1152,7 @@ - Show full document text + Show full document {% endif %} {% else %} diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html index b371a83cc..f35c4ae60 100644 --- a/ietf/templates/doc/document_history.html +++ b/ietf/templates/doc/document_history.html @@ -120,7 +120,7 @@ {% for e in events %} - +
{{ e.time|date:"Y-m-d" }}
{{ e.rev }} diff --git a/ietf/templates/doc/drafts_for_ad.html b/ietf/templates/doc/drafts_for_ad.html index 57e00b744..8280c3bd7 100644 --- a/ietf/templates/doc/drafts_for_ad.html +++ b/ietf/templates/doc/drafts_for_ad.html @@ -16,7 +16,7 @@ Document Status - Responsible AD + Responsible AD Discusses @@ -25,7 +25,7 @@ {{ doc.displayname_with_link }} {% include "doc/search/status_columns.html" %} - + {% if doc.ad %} {% person_link doc.ad %} {% else %} @@ -40,11 +40,8 @@ {% else %} {% person_link p.balloter %} {% endif %} - ( - {% if p.discuss_time %}{{ p.discuss_time|timesince_days }}{% endif %} - days ago - {% if doc.get_state_url != "rfc" and p.rev != doc.rev %}for -{{ p.rev }}{% endif %} - ) + ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }}{% endif %} + days ago{% if doc.get_state_url != "rfc" and p.rev != doc.rev %} for -{{ p.rev }}{% endif %})
{% endfor %} diff --git a/ietf/templates/doc/email_aliases.html b/ietf/templates/doc/email_aliases.html index ff0b1750d..2a6c0c4f0 100644 --- a/ietf/templates/doc/email_aliases.html +++ b/ietf/templates/doc/email_aliases.html @@ -17,7 +17,7 @@ {% cycle '' 'table-active' as alternator silent %} {% for item in alias.list %} - {{ alias.grouper }}{{ item.alias_type|default:'' }}@{{ ietf_domain }} + {{ alias.grouper }}{{ item.alias_type|default:'' }}@{{ ietf_domain }} {{ item.expansion }} {% endfor %} diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html index 757e0957c..e8418100b 100644 --- a/ietf/templates/doc/search/search_result_row.html +++ b/ietf/templates/doc/search/search_result_row.html @@ -46,7 +46,7 @@ {% endfor %} - {% if doc.pages %}{{ doc.pages }} page{{ doc.pages|pluralize }}{% endif %} + {% if doc.pages %}{{ doc.pages }} page{{ doc.pages|pluralize }}{% endif %}
{% if doc.get_state_slug == "rfc" %} @@ -106,7 +106,6 @@ {% endif %} - {% if doc.latest_revision_date|timesince_days|new_enough:request and doc.get_state_slug != "rfc" %} {% if doc.rev != "00" %} @@ -122,7 +121,6 @@ {% if doc.latest_revision_date|timesince_days|new_enough:request and doc.get_state_slug != "rfc" %} {% if doc.rev != "00" or doc.replaces %}{% endif %} {% endif %} - {% if doc.latest_revision_date|timesince_days|new_enough:request %}
@@ -135,7 +133,7 @@ {% endif %} {% include "doc/search/status_columns.html" %} - + {% if doc.related_ipr %} {{ doc.related_ipr|length }} @@ -143,7 +141,7 @@ {% endif %} {% if ad_name == None or ad_name != doc.ad.plain_name %} - + {% if doc.ad %} {% person_link doc.ad title="Area Director" %} {% endif %} diff --git a/ietf/templates/doc/search/search_results.html b/ietf/templates/doc/search/search_results.html index 25862dbae..c98211281 100644 --- a/ietf/templates/doc/search/search_results.html +++ b/ietf/templates/doc/search/search_results.html @@ -17,7 +17,10 @@ {% for h in meta.headers %} {% if h.title != "Title" %} - + {% if "sort_url" in h %} {{ h.title|cut:" " }} diff --git a/ietf/templates/doc/search/status_columns.html b/ietf/templates/doc/search/status_columns.html index 953ba07b1..184a0bfdf 100644 --- a/ietf/templates/doc/search/status_columns.html +++ b/ietf/templates/doc/search/status_columns.html @@ -64,7 +64,7 @@
Action Holder{{ doc.documentactionholder_set.all|pluralize }}: {% for action_holder in doc.documentactionholder_set.all %} - {% person_link action_holder.person title=action_holder.role_for_doc %} {{ action_holder|action_holder_badge }}{% if not forloop.last %},{% endif %} + {% person_link action_holder.person title=action_holder.role_for_doc %}{% if action_holder|action_holder_badge %} {{ action_holder|action_holder_badge }}{% endif %}{% if not forloop.last %},{% endif %} {% endfor %} {% endif %} {% else %} diff --git a/ietf/templates/doc/submit_to_iesg.html b/ietf/templates/doc/submit_to_iesg.html index 82bcce38b..61d2581c0 100644 --- a/ietf/templates/doc/submit_to_iesg.html +++ b/ietf/templates/doc/submit_to_iesg.html @@ -16,18 +16,18 @@ - + - + - + - + - + - + - + {% for e in events %} - - + + {% endfor %} diff --git a/ietf/templates/group/index.html b/ietf/templates/group/index.html index 1474d529f..fc92742b8 100644 --- a/ietf/templates/group/index.html +++ b/ietf/templates/group/index.html @@ -20,7 +20,7 @@ {% for stream in streams %} - 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 @@
{% ballot_icon doc %}
-
{{ doc.group.type }} name
+
{{ doc.group.type }} name
{{ doc.group.name }} ({{ doc.group.acronym|upper }}) @@ -15,7 +15,7 @@
-
Charter
+
Charter
-
Area
+
Area
{{ doc.group.parent.acronym|upper }} diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html index dde82c0f5..b79a2fa33 100644 --- a/ietf/templates/iesg/agenda_conflict_doc.html +++ b/ietf/templates/iesg/agenda_conflict_doc.html @@ -7,7 +7,7 @@
{% with doc.conflictdoc as conflictdoc %}
-
Conflict review
+
Conflict review
{{ doc.title }}
@@ -17,7 +17,7 @@
-
{{ conflictdoc.stream }} {{ conflictdoc.intended_std_level }}
+
{{ conflictdoc.stream }} {{ conflictdoc.intended_std_level }}
{% if conflictdoc.note %}
-
Note
+
Note
{{ conflictdoc.note|linebreaksbr }}
{% endif %}
-
Token
+
Token
{% person_link doc.ad %}
{% with doc.active_defer_event as defer %} {% if defer %}
-
Deferred by
+
Deferred by
{{ defer.by }} on {{ defer.time|date:"Y-m-d" }}
{% endif %} {% endwith %} {% if conflictdoc.ipr %}
-
IPR
+
IPR
{% for ipr in conflictdoc.ipr %} {% if ipr.disclosure.state_id == "posted" %} diff --git a/ietf/templates/iesg/agenda_doc.html b/ietf/templates/iesg/agenda_doc.html index 27cf38058..90a33a6d2 100644 --- a/ietf/templates/iesg/agenda_doc.html +++ b/ietf/templates/iesg/agenda_doc.html @@ -6,13 +6,13 @@
{% ballot_icon doc %}
- - + + diff --git a/ietf/templates/iesg/discusses.html b/ietf/templates/iesg/discusses.html index ef9fcde7c..7380477b8 100644 --- a/ietf/templates/iesg/discusses.html +++ b/ietf/templates/iesg/discusses.html @@ -42,7 +42,7 @@ - + @@ -57,13 +57,12 @@ {% endif %}"> {% include "doc/search/status_columns.html" %} - + - + - + @@ -44,15 +44,14 @@
{{ doc.title }} -
+ {% include "doc/search/status_columns.html" %} - + {% for e in events %} - + {% for ipr in iprs %} - + - + - + {% if liaison.from_contact %} - + {% endif %} - + {% if liaison.to_contacts %} - + {% endif %} {% if liaison.cc_contacts %} - + {% endif %} {% if liaison.response_contacts %} - + {% endif %} {% if liaison.technical_contacts %} - + {% endif %} {% if liaison.action_holder_contacts %} - + {% endif %} - + {% if liaison.deadline %} - + - - - {% endif %} - {% if relations_by %} - - - {% for e in events %} - + - - + + @@ -14,10 +14,10 @@ {% for liaison in liaisons %} - + - - + {% for list in lists %} - 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 %} - + {% endif %} - + + - + @@ -34,15 +34,13 @@ - - + {% 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 @@ - - + + {% for session in area.list %} {% ifchanged %} + {% if not forloop.first %}{% endif %} + {% endifchanged %} - - - + - + {% if forloop.last %}{% endif %} {% endfor %}
Intended status levelIntended status level {% if warn.intended_std_level %}{% endif %} {{ doc.intended_std_level }}
Responsible ADResponsible AD {% person_link ad %}
Document shepherdDocument shepherd {% if warn.shepherd %}{% endif %} {% if doc.shepherd %} @@ -38,7 +38,7 @@
Shepherd write-up existsShepherd write-up exists {% if warn.shepherd_writeup %}{% endif %} {% if shepherd_writeup %} @@ -49,7 +49,7 @@
Also notifyAlso notify {% if notify %} {{ notify }} @@ -59,7 +59,7 @@
Annotation tagsAnnotation 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 }} Document Date StatusIPRAD/ShepherdIPRAD/Shepherd
Document StatusResponsible ADResponsible AD Discusses
{{ doc.displayname_with_link }}{% 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 @@
DocumentTelechat DateTelechat Date StatusResponsible ADResponsible AD Discusses
{{ doc.telechat }}{{ doc.telechat }}{% 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 @@
{{ 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 DateSubmitted 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 ContactFrom 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 ContactsTo Contacts {{ liaison.to_contacts|linkify|make_one_per_line|safe|linebreaksbr }}
CcCc {{ liaison.cc_contacts|linkify|make_one_per_line|safe|linebreaksbr }}
Response ContactResponse Contact {{ liaison.response_contacts|linkify|make_one_per_line|safe|linebreaksbr }}
Technical ContactTechnical Contact {{ liaison.technical_contacts|linkify|make_one_per_line|safe|linebreaksbr }}
Action Holder ContactsAction Holder Contacts {{ liaison.action_holder_contacts|linkify|make_one_per_line|safe|linebreaksbr }}
PurposePurpose {{ liaison.purpose.name }}
DeadlineDeadline {{ 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 FromToDeadlineToDeadline 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 }}{% 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 %}{% 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 }}
Group Length SizeRequesterADRequesterAD Constraints Special requests
{{ 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 %}
{% endfor %} diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html index 136adbb58..c7d516364 100644 --- a/ietf/templates/meeting/upcoming.html +++ b/ietf/templates/meeting/upcoming.html @@ -53,7 +53,7 @@ data-start-date="{{ meeting.date }}" data-end-date="{{ meeting.end }}" data-time-zone="{{ meeting.time_zone }}"> - {{ meeting.date }} - {{ meeting.end }} + {{ meeting.date }} to {{ meeting.end }} ietf @@ -69,7 +69,7 @@ - {{ session.official_timeslotassignment.timeslot.utc_start_time | date:"Y-m-d H:i" }} - {{ session.official_timeslotassignment.timeslot.utc_end_time | date:"H:i" }} + {{ session.official_timeslotassignment.timeslot.utc_start_time | date:"Y-m-d H:i" }}-{{ session.official_timeslotassignment.timeslot.utc_end_time | date:"H:i" }} {{ group.acronym }} diff --git a/ietf/templates/person/profile.html b/ietf/templates/person/profile.html index b5843b3e4..a259199f7 100644 --- a/ietf/templates/person/profile.html +++ b/ietf/templates/person/profile.html @@ -90,15 +90,15 @@ {% for doc in person.rfcs %} - - RFC {{ doc.rfc_number }} + + RFC {{ doc.rfc_number }} {{ doc.pub_date|date:"b Y"|title|nbsp }} {{ doc.title|urlize_ietf_docs }} {% with doc.referenced_by_rfcs.count as refbycount %} {% if refbycount %} - {{ refbycount }} RFC{{ refbycount|pluralize }} diff --git a/ietf/templates/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html index 54a7b0341..d47635c2b 100644 --- a/ietf/templates/submit/tool_instructions.html +++ b/ietf/templates/submit/tool_instructions.html @@ -61,19 +61,19 @@ - .txt format + .txt format Button to select a plain-text file of an I-D from a user's local file system. - .xml format + .xml format Button to select an XML file of an I-D from a user's local file system. - .pdf format + .pdf format Button to select a PDF file of an I-D from a user's local file system. - Upload + Upload Button to upload the document(s). The tool will begin parsing the plain-text document (or creating it from the xml if only xml is provided) and validate the document. The parsed meta-data will be displayed for user confirmation along with the validation results.