Skip to content

Commit 8c0a4ca

Browse files
fennerfenner
committed
From AMS: use the django-generated .txt version, fix the .txt formatting.
From me: use {% url %} to link from HTML to TXT version. - Legacy-Id: 1171
1 parent 2e77cf7 commit 8c0a4ca

3 files changed

Lines changed: 12 additions & 21 deletions

File tree

‎ietf/meeting/views.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,14 @@ def current_materials(request):
4040
return HttpResponseRedirect( reverse(show_html_materials, args=[meeting.meeting_num]) )
4141

4242
def show_html_agenda(request, meeting_num=None, html_or_txt=None):
43-
if html_or_txt == 'txt':
44-
return HttpResponsePermanentRedirect('http://www.ietf.org/meetings/agenda_%d.txt' % int(meeting_num))
4543
queryset_list=MeetingTime.objects.filter(meeting=meeting_num,day_id__gt='0').order_by("day_id","time_desc")
4644
queryset_list_pre_session=MeetingTime.objects.filter(meeting=meeting_num,day_id__lte='0').order_by("day_id","time_desc")
4745
meeting_info=get_object_or_404(Meeting, meeting_num=meeting_num)
4846
nonsession_info=NonSession.objects.filter(meeting=meeting_num,day_id__gte='0').order_by("day_id")
4947
meetingvenue_info=get_object_or_404(MeetingVenue, meeting_num=meeting_num)
5048
last_update_info=get_object_or_404(Switches,id=1)
5149
try:
52-
plenaryt_agenda_file = "/home/master-site/proceedings/%s" % WgMeetingSession.objects.get(meeting=meeting_num,group_acronym_id=-2).agenda_file()
50+
plenaryt_agenda_file = "/a/www/ietf/proceedings/%s" % WgMeetingSession.objects.get(meeting=meeting_num,group_acronym_id=-2).agenda_file()
5351
try:
5452
f = open(plenaryt_agenda_file)
5553
plenaryt_agenda = f.read()
@@ -65,7 +63,7 @@ def show_html_agenda(request, meeting_num=None, html_or_txt=None):
6563
else:
6664
raise Http404
6765
try:
68-
plenaryw_agenda_file = "/home/master-site/proceedings/%s" % WgMeetingSession.objects.get(meeting=meeting_num,group_acronym_id=-1).agenda_file()
66+
plenaryw_agenda_file = "/a/www/ietf/proceedings/%s" % WgMeetingSession.objects.get(meeting=meeting_num,group_acronym_id=-1).agenda_file()
6967
try:
7068
f = open(plenaryw_agenda_file)
7169
plenaryw_agenda = f.read()

‎ietf/templates/meeting/agenda.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Updated as of {{ last_update_info.updated|date:"F j, Y P (T)" }}
1212
</center>
1313

14-
(<a href="http://www3.ietf.org//meetings/agenda_{{meeting_num}}.txt"> Text Format of the Agenda </a>) <br />
14+
(<a href="{% url ietf.meeting.views.show_html_agenda meeting_num,"txt" %}"> Text Format of the Agenda </a>) <br />
1515
<P>
1616
*** Click on an acronym of the group to get a charter page *** <br />
1717
*** Click on a name of the group to get a meeting agenda *** <br />

‎ietf/templates/meeting/agenda.txt‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,17 @@ xml:lang="en-US"><head><title>Agenda of the {{ meeting_num|ordinal }} IETF Meeti
1111
{% filter center:72 %}{{ meeting_info.start_date|date:"F j" }}-{% ifnotequal meeting_info.start_date.month meeting_info.end_date.month %}{{ meeting_info.end_date|date:"F " }}{% endifnotequal %}{{ meeting_info.end_date|date:"j, Y" }}{% endfilter %}
1212

1313
Updated as of {{ last_update_info.updated|date:"F j, Y P (T)" }}
14-
15-
<!-- Update to include Saturday Session -->
1614
{% regroup queryset_list_pre_session by day_id as pre_days %}
1715
{% for pre_day in pre_days %}
18-
<b>{{ pre_day.list.0.meeting_date|date:"l"|upper }}, {{
19-
pre_day.list.0.meeting_date|date:"F j, Y" }} </b><br>
20-
{% ifequal pre_day.list.0.day_id 0 %}
21-
{{ nonsession_info.0.time_desc }} {{ nonsession_info.0.non_session_ref }}
22-
- {{ meetingvenue_info.reg_area_name }}
23-
<br>
24-
{% endifequal %}
25-
{% for item in pre_day.list %}
26-
{% for session in item.sessions %}
27-
{{ item.time_desc }} {{ session.acronym_name }} - {{
28-
session.sched_room_id1.room_name }}<br>
29-
{% endfor %}
30-
{% endfor %}
31-
<br>
16+
{{ pre_day.list.0.meeting_date|date:"l"|upper }}, {{ pre_day.list.0.meeting_date|date:"F j, Y" }}
17+
{% ifequal pre_day.list.0.day_id 0 %}
18+
{{ nonsession_info.0.time_desc }} {{ nonsession_info.0.non_session_ref }} - {{ meetingvenue_info.reg_area_name }}
19+
{% endifequal %}
20+
{% for item in pre_day.list %}
21+
{% for session in item.sessions %}
22+
{{ item.time_desc }} {{ session.acronym_name }} - {{ session.sched_room_id1.room_name }}
23+
{% endfor %}
24+
{% endfor %}
3225
{% endfor %}
3326
<!-- End Update -->
3427
{% regroup object_list by day_id as days %}{% for day in days %}

0 commit comments

Comments
 (0)