Merged in [18821] from rjsparks@nostrum.com:

    Add proper folding for static content in the DESCRIPTION in the important-dates ics feed. Remove important-dates from the upcoming meetings ics.
 - Legacy-Id: 18824
Note: SVN reference [18821] has been migrated to Git commit 7620642

Author: rjsparks

ietf/meeting/tests_views.py

@@ -2297,14 +2297,14 @@ def test_upcoming_ical(self):
         r = self.client.get(url)
 
         self.assertEqual(r.status_code, 200)
-        # Expect events for important dates plus 3 - one for each WG and one for the IETF meeting
+        # Expect events 3 sessions - one for each WG and one for the IETF meeting
         assert_ical_response_is_valid(self, r,
                                       expected_event_summaries=[
                                           'ames - Asteroid Mining Equipment Standardization Group',
                                           'mars - Martian Special Interest Group',
                                           'IETF 72',
                                       ],
-                                      expected_event_count=3 + meeting.importantdate_set.count())
+                                      expected_event_count=3)
 
     def test_upcoming_ical_filter(self):
         # Just a quick check of functionality - details tested by test_js.InterimTests

ietf/templates/meeting/important_dates_for_meeting.ics

@@ -4,19 +4,20 @@ SUMMARY:IETF {{ meeting.number }}: {{ d.name.name }}
 CLASS:PUBLIC
 DTSTART{% if not d.midnight_cutoff %};VALUE=DATE{% endif %}:{{ d.date|date:"Ymd" }}{% if d.midnight_cutoff %}235900Z{% endif %}
 DTSTAMP:{{ meeting.cached_updated|date:"Ymd" }}T{{ meeting.cached_updated|date:"His" }}Z
-DESCRIPTION:{{ d.name.desc }} {% if first and d.name.slug == 'openreg' or first and d.name.slug == 'earlybird' %}
-Register here: https://www.ietf.org/how/meetings/register/{% endif %}{% if d.name.slug == 'opensched' %}
-To request a Working Group session, use the IETF Meeting Session Request Tool:
-{{ request.scheme }}://{{ request.get_host}}{% url 'ietf.secr.sreq.views.main' %}
-If you are working on a BoF request, it is highly recommended to tell the IESG
-now by sending an email to iesg@ietf.org to get advance help with the request.{% endif %}{% if d.name.slug == 'cutoffwgreq' %}
-To request a Working Group session, use the IETF Meeting Session Request Tool:
-{{ request.scheme }}://{{ request.get_host }}{% url 'ietf.secr.sreq.views.main' %}{% endif %}{% if d.name.slug == 'cutoffbofreq' %}
-To request a BOF, please see instructions on Requesting a BOF:
-https://www.ietf.org/how/bofs/bof-procedures/{% endif %}{% if d.name.slug == 'idcutoff' %}
-Upload using the ID Submission Tool:
-{{ request.scheme }}://{{ request.get_host }}{% url 'ietf.submit.views.upload_submission' %}{% endif %}{% if d.name.slug == 'draftwgagenda' or d.name.slug == 'revwgagenda' or d.name.slug == 'procsub' or d.name.slug == 'revslug' %}
-Upload using the Meeting Materials Management Tool:
-{{ request.scheme }}://{{ request.get_host }}{% url 'ietf.meeting.views.materials' num=meeting.number %}{% endif %}
+TRANSP:TRANSPARENT
+DESCRIPTION:{{ d.name.desc }}{% if first and d.name.slug == 'openreg' or first and d.name.slug == 'earlybird' %}\n
+ Register here: https://www.ietf.org/how/meetings/register/{% endif %}{% if d.name.slug == 'opensched' %}\n
+ To request a Working Group session, use the IETF Meeting Session Request Tool:\n
+ {{ request.scheme }}://{{ request.get_host}}{% url 'ietf.secr.sreq.views.main' %}\n
+ If you are working on a BoF request, it is highly recommended to tell the IESG\n
+ now by sending an email to iesg@ietf.org to get advance help with the request.{% endif %}{% if d.name.slug == 'cutoffwgreq' %}\n
+ To request a Working Group session, use the IETF Meeting Session Request Tool:\n
+ {{ request.scheme }}://{{ request.get_host }}{% url 'ietf.secr.sreq.views.main' %}{% endif %}{% if d.name.slug == 'cutoffbofreq' %}\n
+ To request a BOF, please see instructions on Requesting a BOF:\n
+ https://www.ietf.org/how/bofs/bof-procedures/{% endif %}{% if d.name.slug == 'idcutoff' %}\n
+ Upload using the ID Submission Tool:\n
+ {{ request.scheme }}://{{ request.get_host }}{% url 'ietf.submit.views.upload_submission' %}{% endif %}{% if d.name.slug == 'draftwgagenda' or d.name.slug == 'revwgagenda' or d.name.slug == 'procsub' or d.name.slug == 'revslug' %}\n
+ Upload using the Meeting Materials Management Tool:\n
+ {{ request.scheme }}://{{ request.get_host }}{% url 'ietf.meeting.views.materials' num=meeting.number %}{% endif %}
 END:VEVENT
 {% endfor %}

ietf/templates/meeting/upcoming.html

@@ -30,6 +30,7 @@ <h1>Upcoming Meetings
       </h1>
 
       <p>For more on regular IETF meetings see <a href="https://www.ietf.org/meeting/upcoming.html">here</a></p>
+      <p>Meeting important dates are not included in upcoming meeting calendars. They have <a href="{% url 'ietf.meeting.views.important_dates' %}">their own calendar</a></p>
 
         {% include 'meeting/agenda_filter.html' with filter_categories=filter_categories customize_button_text="Customize the meeting list..." only%}
 

ietf/templates/meeting/upcoming.ics

@@ -28,4 +28,4 @@ DTEND;VALUE=DATE{% if meeting.time_zone %};TZID={{ meeting.time_zone|ics_esc }}{
 DTSTAMP:{{ meeting.cached_updated|date:"Ymd" }}T{{ meeting.cached_updated|date:"His" }}Z
 URL:{{ request.scheme }}://{{ request.get_host }}{% url 'ietf.meeting.views.agenda' num=meeting.number %}
 END:VEVENT
-{% include "meeting/important_dates_for_meeting.ics" %}{% endfor %}END:VCALENDAR{% endautoescape %}
+{% endfor %}END:VCALENDAR{% endautoescape %}

ready-for-merge

@@ -7,6 +7,8 @@
 
 # --- Add entries at the top ---
 
+/personal/rjs/7.25.1.dev0@18821
+
 /personal/rcross/7.19.1.dev0@18729
 
 /personal/housley/7.22.1.dev0@18719