From dac11633ff3a6733b4cc6c983791b3fb56936e2f Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sun, 22 Apr 2012 15:15:38 +0000
Subject: [PATCH] Revert a URL schema change made by olau@iola.dk in [4046] for
 a reason I can't quite see.  This change breaks old URLs.  - Legacy-Id: 4299
 Note: SVN reference [4046] has been migrated to Git commit
 d6baa38fe5a7a9f0f8470676911bd979a3bd7e85

---
 ietf/meeting/urls.py               | 2 +-
 ietf/templates/meeting/agenda.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py
index 114e38b1f..88ce8aafa 100644
--- a/ietf/meeting/urls.py
+++ b/ietf/meeting/urls.py
@@ -23,7 +23,7 @@ urlpatterns = patterns('',
     (r'^(?P<num>\d+)/agenda/week-view.html$', views.week_view),
     (r'^(?P<num>\d+)/agenda/(?P<session>[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf),
     (r'^(?P<num>\d+)/agenda/(?P<session>[A-Za-z0-9-]+)-drafts.tgz$', views.session_draft_tarfile),
-    (r'^(?P<num>\d+)/agenda/(?P<session>[A-Za-z0-9-]+)-agenda/$', views.session_agenda),
+    (r'^(?P<num>\d+)/agenda/(?P<session>[A-Za-z0-9-]+)/?$', views.session_agenda),
     (r'^$', views.current_materials),
 )
 
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 69db18585..8a96e8bc6 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -306,7 +306,7 @@ You can customize the agenda below to show only selected working group sessions.
            {% else %}{{slot.session.group.acronym}}{% endif %}</td>
        <td>
          <img src="/images/color-palette-4x4.gif" alt="" onclick="pickAgendaColor('{{meeting.num}}-{{slot.time|date:"D-Hi"|lower}}-{{slot.session.group.parent.acronym|upper}}-{{slot.session.group.acronym|lower}}',this);" title="color tag this line"/ class="noprint">
-           {% if slot.session.agenda %}<a href="/meeting/{{ meeting.num }}/agenda/{{ slot.session.group.acronym }}-agenda/">{{slot.session.group.name}}</a>
+           {% if slot.session.agenda %}<a href="/meeting/{{ meeting.num }}/agenda/{{ slot.session.group.acronym }}/">{{slot.session.group.name}}</a>
            {% else %}{{slot.session.group.name}}{% endif %}
            {% if slot.session.group.state.name = "BOF" %} BOF {% endif %}
            {% if slot.session.agenda_note %}
@@ -318,7 +318,7 @@ You can customize the agenda below to show only selected working group sessions.
        <td colspan="5">
           {% if slot.session.agenda %}
           {% if slot.session.agenda.file_extension in show_inline%}
-          <iframe width="100%" height="1px" src="about:blank" xsrc="/meeting/{{ meeting.num }}/agenda/{{ slot.session.group.acronym }}-agenda/" onload="r(this)"></iframe>
+          <iframe width="100%" height="1px" src="about:blank" xsrc="/meeting/{{ meeting.num }}/agenda/{{ slot.session.group.acronym }}/" onload="r(this)"></iframe>
           {% else %}
           <b><i>Agenda submitted in {{slot.session.agenda.file_extension|upper}} format</i></b>
           {% endif %}
@@ -333,7 +333,7 @@ You can customize the agenda below to show only selected working group sessions.
      <tr>
        <td></td>
        <td colspan="5">
-         <iframe width="100%" height="1px" src="/meeting/{{ meeting.num }}/agenda/{{ slot.session.group.acronym }}-agenda/" onload="r(this)"></iframe>
+         <iframe width="100%" height="1px" src="/meeting/{{ meeting.num }}/agenda/{{ slot.session.group.acronym }}/" onload="r(this)"></iframe>
        </td>
      </tr>
    {% endif %}